p36850791
/
python_sonar
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Reformat some minor whitespace and further shrink our alpine-debian diff

This commit is contained in:
Tianon Gravi 2016-07-06 10:25:12 -07:00
parent 8a66fdc325
commit ac647c4b59
18 changed files with 69 additions and 38 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
2.7/Dockerfile
View File

@ -27,7 +27,9 @@ RUN set -ex \
&& rm python.tar.xz \ && rm python.tar.xz \
\ \
&& cd /usr/src/python \ && cd /usr/src/python \
&& ./configure --enable-shared --enable-unicode=ucs4 \ && ./configure \
--enable-shared \
--enable-unicode=ucs4 \
&& make -j$(nproc) \ && make -j$(nproc) \
&& make install \ && make install \
&& ldconfig \ && ldconfig \

11
2.7/alpine/Dockerfile
View File

@ -13,16 +13,15 @@ ENV PYTHON_VERSION 2.7.12
ENV PYTHON_PIP_VERSION 8.1.2 ENV PYTHON_PIP_VERSION 8.1.2
RUN set -ex \ RUN set -ex \
&& apk add --no-cache --virtual .fetch-deps curl gnupg \ && apk add --no-cache --virtual .fetch-deps curl gnupg tar xz \
&& curl -fSL "https://www.python.org/ftp/python/${PYTHON_VERSION%%[a-z]*}/Python-$PYTHON_VERSION.tar.xz" -o python.tar.xz \ && curl -fSL "https://www.python.org/ftp/python/${PYTHON_VERSION%%[a-z]*}/Python-$PYTHON_VERSION.tar.xz" -o python.tar.xz \
&& curl -fSL "https://www.python.org/ftp/python/${PYTHON_VERSION%%[a-z]*}/Python-$PYTHON_VERSION.tar.xz.asc" -o python.tar.xz.asc \ && curl -fSL "https://www.python.org/ftp/python/${PYTHON_VERSION%%[a-z]*}/Python-$PYTHON_VERSION.tar.xz.asc" -o python.tar.xz.asc \
&& export GNUPGHOME="$(mktemp -d)" \ && export GNUPGHOME="$(mktemp -d)" \
&& gpg --keyserver ha.pool.sks-keyservers.net --recv-keys "$GPG_KEY" \ && gpg --keyserver ha.pool.sks-keyservers.net --recv-keys "$GPG_KEY" \
&& gpg --batch --verify python.tar.xz.asc python.tar.xz \ && gpg --batch --verify python.tar.xz.asc python.tar.xz \
&& rm -r "$GNUPGHOME" python.tar.xz.asc \ && rm -r "$GNUPGHOME" python.tar.xz.asc \
&& mkdir -p /usr/src \ && mkdir -p /usr/src/python \
&& tar -xJC /usr/src -f python.tar.xz \ && tar -xJC /usr/src/python --strip-components=1 -f python.tar.xz \
&& mv "/usr/src/Python-$PYTHON_VERSION" /usr/src/python \
&& rm python.tar.xz \ && rm python.tar.xz \
\ \
&& apk add --no-cache --virtual .build-deps \ && apk add --no-cache --virtual .build-deps \
@ -38,7 +37,9 @@ RUN set -ex \
sqlite-dev \ sqlite-dev \
zlib-dev \ zlib-dev \
&& cd /usr/src/python \ && cd /usr/src/python \
&& ./configure --enable-shared --enable-unicode=ucs4 \ && ./configure \
--enable-shared \
--enable-unicode=ucs4 \
&& make -j$(getconf _NPROCESSORS_ONLN) \ && make -j$(getconf _NPROCESSORS_ONLN) \
&& make install \ && make install \
&& curl -fSL 'https://bootstrap.pypa.io/get-pip.py' | python2 \ && curl -fSL 'https://bootstrap.pypa.io/get-pip.py' | python2 \

4
2.7/slim/Dockerfile
View File

@ -47,7 +47,9 @@ RUN set -ex \
&& rm python.tar.xz \ && rm python.tar.xz \
\ \
&& cd /usr/src/python \ && cd /usr/src/python \
&& ./configure --enable-shared --enable-unicode=ucs4 \ && ./configure \
--enable-shared \
--enable-unicode=ucs4 \
&& make -j$(nproc) \ && make -j$(nproc) \
&& make install \ && make install \
&& ldconfig \ && ldconfig \

4
2.7/wheezy/Dockerfile
View File

@ -27,7 +27,9 @@ RUN set -ex \
&& rm python.tar.xz \ && rm python.tar.xz \
\ \
&& cd /usr/src/python \ && cd /usr/src/python \
&& ./configure --enable-shared --enable-unicode=ucs4 \ && ./configure \
--enable-shared \
--enable-unicode=ucs4 \
&& make -j$(nproc) \ && make -j$(nproc) \
&& make install \ && make install \
&& ldconfig \ && ldconfig \

4
3.3/Dockerfile
View File

@ -27,7 +27,9 @@ RUN set -ex \
&& rm python.tar.xz \ && rm python.tar.xz \
\ \
&& cd /usr/src/python \ && cd /usr/src/python \
&& ./configure --enable-shared --enable-unicode=ucs4 \ && ./configure \
--enable-shared \
--enable-unicode=ucs4 \
&& make -j$(nproc) \ && make -j$(nproc) \
&& make install \ && make install \
&& ldconfig \ && ldconfig \

11
3.3/alpine/Dockerfile
View File

@ -13,16 +13,15 @@ ENV PYTHON_VERSION 3.3.6
ENV PYTHON_PIP_VERSION 8.1.2 ENV PYTHON_PIP_VERSION 8.1.2
RUN set -ex \ RUN set -ex \
&& apk add --no-cache --virtual .fetch-deps curl gnupg \ && apk add --no-cache --virtual .fetch-deps curl gnupg tar xz \
&& curl -fSL "https://www.python.org/ftp/python/${PYTHON_VERSION%%[a-z]*}/Python-$PYTHON_VERSION.tar.xz" -o python.tar.xz \ && curl -fSL "https://www.python.org/ftp/python/${PYTHON_VERSION%%[a-z]*}/Python-$PYTHON_VERSION.tar.xz" -o python.tar.xz \
&& curl -fSL "https://www.python.org/ftp/python/${PYTHON_VERSION%%[a-z]*}/Python-$PYTHON_VERSION.tar.xz.asc" -o python.tar.xz.asc \ && curl -fSL "https://www.python.org/ftp/python/${PYTHON_VERSION%%[a-z]*}/Python-$PYTHON_VERSION.tar.xz.asc" -o python.tar.xz.asc \
&& export GNUPGHOME="$(mktemp -d)" \ && export GNUPGHOME="$(mktemp -d)" \
&& gpg --keyserver ha.pool.sks-keyservers.net --recv-keys "$GPG_KEY" \ && gpg --keyserver ha.pool.sks-keyservers.net --recv-keys "$GPG_KEY" \
&& gpg --batch --verify python.tar.xz.asc python.tar.xz \ && gpg --batch --verify python.tar.xz.asc python.tar.xz \
&& rm -r "$GNUPGHOME" python.tar.xz.asc \ && rm -r "$GNUPGHOME" python.tar.xz.asc \
&& mkdir -p /usr/src \ && mkdir -p /usr/src/python \
&& tar -xJC /usr/src -f python.tar.xz \ && tar -xJC /usr/src/python --strip-components=1 -f python.tar.xz \
&& mv "/usr/src/Python-$PYTHON_VERSION" /usr/src/python \
&& rm python.tar.xz \ && rm python.tar.xz \
\ \
&& apk add --no-cache --virtual .build-deps \ && apk add --no-cache --virtual .build-deps \
@ -39,7 +38,9 @@ RUN set -ex \
xz-dev \ xz-dev \
zlib-dev \ zlib-dev \
&& cd /usr/src/python \ && cd /usr/src/python \
&& ./configure --enable-shared --enable-unicode=ucs4 \ && ./configure \
--enable-shared \
--enable-unicode=ucs4 \
&& make -j$(getconf _NPROCESSORS_ONLN) \ && make -j$(getconf _NPROCESSORS_ONLN) \
&& make install \ && make install \
&& curl -fSL 'https://bootstrap.pypa.io/get-pip.py' | python3 \ && curl -fSL 'https://bootstrap.pypa.io/get-pip.py' | python3 \

4
3.3/slim/Dockerfile
View File

@ -48,7 +48,9 @@ RUN set -ex \
&& rm python.tar.xz \ && rm python.tar.xz \
\ \
&& cd /usr/src/python \ && cd /usr/src/python \
&& ./configure --enable-shared --enable-unicode=ucs4 \ && ./configure \
--enable-shared \
--enable-unicode=ucs4 \
&& make -j$(nproc) \ && make -j$(nproc) \
&& make install \ && make install \
&& ldconfig \ && ldconfig \

4
3.3/wheezy/Dockerfile
View File

@ -27,7 +27,9 @@ RUN set -ex \
&& rm python.tar.xz \ && rm python.tar.xz \
\ \
&& cd /usr/src/python \ && cd /usr/src/python \
&& ./configure --enable-shared --enable-unicode=ucs4 \ && ./configure \
--enable-shared \
--enable-unicode=ucs4 \
&& make -j$(nproc) \ && make -j$(nproc) \
&& make install \ && make install \
&& ldconfig \ && ldconfig \

4
3.4/Dockerfile
View File

@ -27,7 +27,9 @@ RUN set -ex \
&& rm python.tar.xz \ && rm python.tar.xz \
\ \
&& cd /usr/src/python \ && cd /usr/src/python \
&& ./configure --enable-shared --enable-unicode=ucs4 \ && ./configure \
--enable-shared \
--enable-unicode=ucs4 \
&& make -j$(nproc) \ && make -j$(nproc) \
&& make install \ && make install \
&& ldconfig \ && ldconfig \

11
3.4/alpine/Dockerfile
View File

@ -13,16 +13,15 @@ ENV PYTHON_VERSION 3.4.5
ENV PYTHON_PIP_VERSION 8.1.2 ENV PYTHON_PIP_VERSION 8.1.2
RUN set -ex \ RUN set -ex \
&& apk add --no-cache --virtual .fetch-deps curl gnupg \ && apk add --no-cache --virtual .fetch-deps curl gnupg tar xz \
&& curl -fSL "https://www.python.org/ftp/python/${PYTHON_VERSION%%[a-z]*}/Python-$PYTHON_VERSION.tar.xz" -o python.tar.xz \ && curl -fSL "https://www.python.org/ftp/python/${PYTHON_VERSION%%[a-z]*}/Python-$PYTHON_VERSION.tar.xz" -o python.tar.xz \
&& curl -fSL "https://www.python.org/ftp/python/${PYTHON_VERSION%%[a-z]*}/Python-$PYTHON_VERSION.tar.xz.asc" -o python.tar.xz.asc \ && curl -fSL "https://www.python.org/ftp/python/${PYTHON_VERSION%%[a-z]*}/Python-$PYTHON_VERSION.tar.xz.asc" -o python.tar.xz.asc \
&& export GNUPGHOME="$(mktemp -d)" \ && export GNUPGHOME="$(mktemp -d)" \
&& gpg --keyserver ha.pool.sks-keyservers.net --recv-keys "$GPG_KEY" \ && gpg --keyserver ha.pool.sks-keyservers.net --recv-keys "$GPG_KEY" \
&& gpg --batch --verify python.tar.xz.asc python.tar.xz \ && gpg --batch --verify python.tar.xz.asc python.tar.xz \
&& rm -r "$GNUPGHOME" python.tar.xz.asc \ && rm -r "$GNUPGHOME" python.tar.xz.asc \
&& mkdir -p /usr/src \ && mkdir -p /usr/src/python \
&& tar -xJC /usr/src -f python.tar.xz \ && tar -xJC /usr/src/python --strip-components=1 -f python.tar.xz \
&& mv "/usr/src/Python-$PYTHON_VERSION" /usr/src/python \
&& rm python.tar.xz \ && rm python.tar.xz \
&& apk del .fetch-deps \ && apk del .fetch-deps \
\ \
@ -40,7 +39,9 @@ RUN set -ex \
xz-dev \ xz-dev \
zlib-dev \ zlib-dev \
&& cd /usr/src/python \ && cd /usr/src/python \
&& ./configure --enable-shared --enable-unicode=ucs4 \ && ./configure \
--enable-shared \
--enable-unicode=ucs4 \
&& make -j$(getconf _NPROCESSORS_ONLN) \ && make -j$(getconf _NPROCESSORS_ONLN) \
&& make install \ && make install \
&& pip3 install --no-cache-dir --upgrade pip==$PYTHON_PIP_VERSION \ && pip3 install --no-cache-dir --upgrade pip==$PYTHON_PIP_VERSION \

4
3.4/slim/Dockerfile
View File

@ -48,7 +48,9 @@ RUN set -ex \
&& rm python.tar.xz \ && rm python.tar.xz \
\ \
&& cd /usr/src/python \ && cd /usr/src/python \
&& ./configure --enable-shared --enable-unicode=ucs4 \ && ./configure \
--enable-shared \
--enable-unicode=ucs4 \
&& make -j$(nproc) \ && make -j$(nproc) \
&& make install \ && make install \
&& ldconfig \ && ldconfig \

4
3.4/wheezy/Dockerfile
View File

@ -27,7 +27,9 @@ RUN set -ex \
&& rm python.tar.xz \ && rm python.tar.xz \
\ \
&& cd /usr/src/python \ && cd /usr/src/python \
&& ./configure --enable-shared --enable-unicode=ucs4 \ && ./configure \
--enable-shared \
--enable-unicode=ucs4 \
&& make -j$(nproc) \ && make -j$(nproc) \
&& make install \ && make install \
&& ldconfig \ && ldconfig \

4
3.5/Dockerfile
View File

@ -27,7 +27,9 @@ RUN set -ex \
&& rm python.tar.xz \ && rm python.tar.xz \
\ \
&& cd /usr/src/python \ && cd /usr/src/python \
&& ./configure --enable-shared --enable-unicode=ucs4 \ && ./configure \
--enable-shared \
--enable-unicode=ucs4 \
&& make -j$(nproc) \ && make -j$(nproc) \
&& make install \ && make install \
&& ldconfig \ && ldconfig \

11
3.5/alpine/Dockerfile
View File

@ -13,16 +13,15 @@ ENV PYTHON_VERSION 3.5.2
ENV PYTHON_PIP_VERSION 8.1.2 ENV PYTHON_PIP_VERSION 8.1.2
RUN set -ex \ RUN set -ex \
&& apk add --no-cache --virtual .fetch-deps curl gnupg \ && apk add --no-cache --virtual .fetch-deps curl gnupg tar xz \
&& curl -fSL "https://www.python.org/ftp/python/${PYTHON_VERSION%%[a-z]*}/Python-$PYTHON_VERSION.tar.xz" -o python.tar.xz \ && curl -fSL "https://www.python.org/ftp/python/${PYTHON_VERSION%%[a-z]*}/Python-$PYTHON_VERSION.tar.xz" -o python.tar.xz \
&& curl -fSL "https://www.python.org/ftp/python/${PYTHON_VERSION%%[a-z]*}/Python-$PYTHON_VERSION.tar.xz.asc" -o python.tar.xz.asc \ && curl -fSL "https://www.python.org/ftp/python/${PYTHON_VERSION%%[a-z]*}/Python-$PYTHON_VERSION.tar.xz.asc" -o python.tar.xz.asc \
&& export GNUPGHOME="$(mktemp -d)" \ && export GNUPGHOME="$(mktemp -d)" \
&& gpg --keyserver ha.pool.sks-keyservers.net --recv-keys "$GPG_KEY" \ && gpg --keyserver ha.pool.sks-keyservers.net --recv-keys "$GPG_KEY" \
&& gpg --batch --verify python.tar.xz.asc python.tar.xz \ && gpg --batch --verify python.tar.xz.asc python.tar.xz \
&& rm -r "$GNUPGHOME" python.tar.xz.asc \ && rm -r "$GNUPGHOME" python.tar.xz.asc \
&& mkdir -p /usr/src \ && mkdir -p /usr/src/python \
&& tar -xJC /usr/src -f python.tar.xz \ && tar -xJC /usr/src/python --strip-components=1 -f python.tar.xz \
&& mv "/usr/src/Python-$PYTHON_VERSION" /usr/src/python \
&& rm python.tar.xz \ && rm python.tar.xz \
&& apk del .fetch-deps \ && apk del .fetch-deps \
\ \
@ -40,7 +39,9 @@ RUN set -ex \
xz-dev \ xz-dev \
zlib-dev \ zlib-dev \
&& cd /usr/src/python \ && cd /usr/src/python \
&& ./configure --enable-shared --enable-unicode=ucs4 \ && ./configure \
--enable-shared \
--enable-unicode=ucs4 \
&& make -j$(getconf _NPROCESSORS_ONLN) \ && make -j$(getconf _NPROCESSORS_ONLN) \
&& make install \ && make install \
&& pip3 install --no-cache-dir --upgrade pip==$PYTHON_PIP_VERSION \ && pip3 install --no-cache-dir --upgrade pip==$PYTHON_PIP_VERSION \

4
3.5/slim/Dockerfile
View File

@ -48,7 +48,9 @@ RUN set -ex \
&& rm python.tar.xz \ && rm python.tar.xz \
\ \
&& cd /usr/src/python \ && cd /usr/src/python \
&& ./configure --enable-shared --enable-unicode=ucs4 \ && ./configure \
--enable-shared \
--enable-unicode=ucs4 \
&& make -j$(nproc) \ && make -j$(nproc) \
&& make install \ && make install \
&& ldconfig \ && ldconfig \

4
3.6/Dockerfile
View File

@ -27,7 +27,9 @@ RUN set -ex \
&& rm python.tar.xz \ && rm python.tar.xz \
\ \
&& cd /usr/src/python \ && cd /usr/src/python \
&& ./configure --enable-shared --enable-unicode=ucs4 \ && ./configure \
--enable-shared \
--enable-unicode=ucs4 \
&& make -j$(nproc) \ && make -j$(nproc) \
&& make install \ && make install \
&& ldconfig \ && ldconfig \

11
3.6/alpine/Dockerfile
View File

@ -13,16 +13,15 @@ ENV PYTHON_VERSION 3.6.0a2
ENV PYTHON_PIP_VERSION 8.1.2 ENV PYTHON_PIP_VERSION 8.1.2
RUN set -ex \ RUN set -ex \
&& apk add --no-cache --virtual .fetch-deps curl gnupg \ && apk add --no-cache --virtual .fetch-deps curl gnupg tar xz \
&& curl -fSL "https://www.python.org/ftp/python/${PYTHON_VERSION%%[a-z]*}/Python-$PYTHON_VERSION.tar.xz" -o python.tar.xz \ && curl -fSL "https://www.python.org/ftp/python/${PYTHON_VERSION%%[a-z]*}/Python-$PYTHON_VERSION.tar.xz" -o python.tar.xz \
&& curl -fSL "https://www.python.org/ftp/python/${PYTHON_VERSION%%[a-z]*}/Python-$PYTHON_VERSION.tar.xz.asc" -o python.tar.xz.asc \ && curl -fSL "https://www.python.org/ftp/python/${PYTHON_VERSION%%[a-z]*}/Python-$PYTHON_VERSION.tar.xz.asc" -o python.tar.xz.asc \
&& export GNUPGHOME="$(mktemp -d)" \ && export GNUPGHOME="$(mktemp -d)" \
&& gpg --keyserver ha.pool.sks-keyservers.net --recv-keys "$GPG_KEY" \ && gpg --keyserver ha.pool.sks-keyservers.net --recv-keys "$GPG_KEY" \
&& gpg --batch --verify python.tar.xz.asc python.tar.xz \ && gpg --batch --verify python.tar.xz.asc python.tar.xz \
&& rm -r "$GNUPGHOME" python.tar.xz.asc \ && rm -r "$GNUPGHOME" python.tar.xz.asc \
&& mkdir -p /usr/src \ && mkdir -p /usr/src/python \
&& tar -xJC /usr/src -f python.tar.xz \ && tar -xJC /usr/src/python --strip-components=1 -f python.tar.xz \
&& mv "/usr/src/Python-$PYTHON_VERSION" /usr/src/python \
&& rm python.tar.xz \ && rm python.tar.xz \
&& apk del .fetch-deps \ && apk del .fetch-deps \
\ \
@ -40,7 +39,9 @@ RUN set -ex \
xz-dev \ xz-dev \
zlib-dev \ zlib-dev \
&& cd /usr/src/python \ && cd /usr/src/python \
&& ./configure --enable-shared --enable-unicode=ucs4 \ && ./configure \
--enable-shared \
--enable-unicode=ucs4 \
&& make -j$(getconf _NPROCESSORS_ONLN) \ && make -j$(getconf _NPROCESSORS_ONLN) \
&& make install \ && make install \
&& pip3 install --no-cache-dir --upgrade pip==$PYTHON_PIP_VERSION \ && pip3 install --no-cache-dir --upgrade pip==$PYTHON_PIP_VERSION \

4
3.6/slim/Dockerfile
View File

@ -48,7 +48,9 @@ RUN set -ex \
&& rm python.tar.xz \ && rm python.tar.xz \
\ \
&& cd /usr/src/python \ && cd /usr/src/python \
&& ./configure --enable-shared --enable-unicode=ucs4 \ && ./configure \
--enable-shared \
--enable-unicode=ucs4 \
&& make -j$(nproc) \ && make -j$(nproc) \
&& make install \ && make install \
&& ldconfig \ && ldconfig \