Move compile CPython 3.6 to a separate include file

pull/20181/head
Lidi Zheng 5 years ago
parent 40d495a31b
commit f6445add1f
  1. 15
      templates/tools/dockerfile/compile_python_36.include
  2. 16
      templates/tools/dockerfile/test/python_stretch_3.6_x64/Dockerfile.template
  3. 11
      templates/tools/dockerfile/test/python_stretch_default_x64/Dockerfile.template
  4. 17
      tools/dockerfile/test/python_stretch_3.6_x64/Dockerfile
  5. 15
      tools/dockerfile/test/python_stretch_default_x64/Dockerfile

@ -0,0 +1,15 @@
#=================
# Compile CPython 3.6.9 from source
RUN apt-get update && apt-get install -y zlib1g-dev libssl-dev
RUN apt-get update && apt-get install -y jq build-essential libffi-dev
RUN cd /tmp && ${'\\'}
wget -q https://www.python.org/ftp/python/3.6.9/Python-3.6.9.tgz && ${'\\'}
tar xzvf Python-3.6.9.tgz && ${'\\'}
cd Python-3.6.9 && ${'\\'}
./configure && ${'\\'}
make install
RUN python3.6 -m ensurepip && ${'\\'}
python3.6 -m pip install coverage

@ -15,18 +15,4 @@
# limitations under the License.
<%include file="../../python_stretch.include"/>
RUN apt-get install -y jq zlib1g-dev libssl-dev
RUN apt-get install -y jq build-essential libffi-dev
RUN cd /tmp && ${'\\'}
wget -q https://github.com/python/cpython/archive/v3.6.9.tar.gz && ${'\\'}
tar xzvf v3.6.9.tar.gz && ${'\\'}
cd cpython-3.6.9 && ${'\\'}
./configure && ${'\\'}
make install
RUN python3.6 -m ensurepip && ${'\\'}
python3.6 -m pip install coverage
<%include file="../../compile_python_36.include"/>

@ -15,17 +15,8 @@
# limitations under the License.
<%include file="../../python_stretch.include"/>
<%include file="../../compile_python_36.include"/>
RUN apt-get update && apt-get install -y zlib1g-dev libssl-dev
RUN apt-get update && apt-get install -y jq build-essential libffi-dev
RUN cd /tmp && ${'\\'}
wget -q https://www.python.org/ftp/python/3.6.9/Python-3.6.9.tgz && ${'\\'}
tar xzvf Python-3.6.9.tgz && ${'\\'}
cd Python-3.6.9 && ${'\\'}
./configure && ${'\\'}
make install
RUN cd /tmp && ${'\\'}
echo "ff7cdaef4846c89c1ec0d7b709bbd54d Python-3.6.9.tgz" > checksum.md5 && ${'\\'}
md5sum -c checksum.md5

@ -64,17 +64,18 @@ RUN echo 'APT::Default-Release "stretch";' | tee -a /etc/apt/apt.conf.d/00local
RUN mkdir /var/local/jenkins
#=================
# Compile CPython 3.6.9 from source
RUN apt-get install -y jq zlib1g-dev libssl-dev
RUN apt-get install -y jq build-essential libffi-dev
RUN apt-get update && apt-get install -y zlib1g-dev libssl-dev
RUN apt-get update && apt-get install -y jq build-essential libffi-dev
RUN cd /tmp && \
wget -q https://github.com/python/cpython/archive/v3.6.9.tar.gz && \
tar xzvf v3.6.9.tar.gz && \
cd cpython-3.6.9 && \
./configure && \
make install
wget -q https://www.python.org/ftp/python/3.6.9/Python-3.6.9.tgz && \
tar xzvf Python-3.6.9.tgz && \
cd Python-3.6.9 && \
./configure && \
make install
RUN python3.6 -m ensurepip && \
python3.6 -m pip install coverage

@ -64,16 +64,21 @@ RUN echo 'APT::Default-Release "stretch";' | tee -a /etc/apt/apt.conf.d/00local
RUN mkdir /var/local/jenkins
#=================
# Compile CPython 3.6.9 from source
RUN apt-get update && apt-get install -y zlib1g-dev libssl-dev
RUN apt-get update && apt-get install -y jq build-essential libffi-dev
RUN cd /tmp && \
wget -q https://www.python.org/ftp/python/3.6.9/Python-3.6.9.tgz && \
tar xzvf Python-3.6.9.tgz && \
cd Python-3.6.9 && \
./configure && \
make install
wget -q https://www.python.org/ftp/python/3.6.9/Python-3.6.9.tgz && \
tar xzvf Python-3.6.9.tgz && \
cd Python-3.6.9 && \
./configure && \
make install
RUN python3.6 -m ensurepip && \
python3.6 -m pip install coverage
RUN cd /tmp && \
echo "ff7cdaef4846c89c1ec0d7b709bbd54d Python-3.6.9.tgz" > checksum.md5 && \

Loading…
Cancel
Save