From cd1f11aa745a05ddf6329678d5b12a097084681b Mon Sep 17 00:00:00 2001 From: Tianon Gravi Date: Tue, 9 May 2017 10:40:55 -0700 Subject: [PATCH 1/2] Add explicit "--build" to our "./configure" invocations --- 2.7/Dockerfile | 3 +++ 2.7/alpine/Dockerfile | 6 +++++- 2.7/slim/Dockerfile | 3 +++ 2.7/wheezy/Dockerfile | 3 +++ 3.3/Dockerfile | 3 +++ 3.3/alpine/Dockerfile | 6 +++++- 3.3/slim/Dockerfile | 3 +++ 3.3/wheezy/Dockerfile | 3 +++ 3.4/Dockerfile | 3 +++ 3.4/alpine/Dockerfile | 6 +++++- 3.4/slim/Dockerfile | 3 +++ 3.4/wheezy/Dockerfile | 3 +++ 3.5/Dockerfile | 3 +++ 3.5/alpine/Dockerfile | 6 +++++- 3.5/slim/Dockerfile | 3 +++ 3.6/Dockerfile | 3 +++ 3.6/alpine/Dockerfile | 6 +++++- 3.6/slim/Dockerfile | 3 +++ Dockerfile-alpine.template | 6 +++++- Dockerfile-debian.template | 3 +++ Dockerfile-slim.template | 3 +++ 21 files changed, 75 insertions(+), 6 deletions(-) diff --git a/2.7/Dockerfile b/2.7/Dockerfile index 756ed88bd..78d3e5d3c 100644 --- a/2.7/Dockerfile +++ b/2.7/Dockerfile @@ -18,6 +18,7 @@ ENV PYTHON_VERSION 2.7.13 RUN set -ex \ && buildDeps=' \ + dpkg-dev \ tcl-dev \ tk-dev \ ' \ @@ -34,7 +35,9 @@ RUN set -ex \ && rm python.tar.xz \ \ && cd /usr/src/python \ + && gnuArch="$(dpkg-architecture --query DEB_BUILD_GNU_TYPE)" \ && ./configure \ + --build="$gnuArch" \ --enable-shared \ --enable-unicode=ucs4 \ && make -j "$(nproc)" \ diff --git a/2.7/alpine/Dockerfile b/2.7/alpine/Dockerfile index 96d91c58b..8132ade20 100644 --- a/2.7/alpine/Dockerfile +++ b/2.7/alpine/Dockerfile @@ -33,6 +33,8 @@ RUN set -ex \ \ && apk add --no-cache --virtual .build-deps \ bzip2-dev \ + coreutils \ + dpkg-dev dpkg \ gcc \ gdbm-dev \ libc-dev \ @@ -52,10 +54,12 @@ RUN set -ex \ && apk del .fetch-deps \ \ && cd /usr/src/python \ + && gnuArch="$(dpkg-architecture --query DEB_BUILD_GNU_TYPE)" \ && ./configure \ + --build="$gnuArch" \ --enable-shared \ --enable-unicode=ucs4 \ - && make -j "$(getconf _NPROCESSORS_ONLN)" \ + && make -j "$(nproc)" \ && make install \ \ && runDeps="$( \ diff --git a/2.7/slim/Dockerfile b/2.7/slim/Dockerfile index 59f3c8f54..63a9886be 100644 --- a/2.7/slim/Dockerfile +++ b/2.7/slim/Dockerfile @@ -20,6 +20,7 @@ ENV PYTHON_VERSION 2.7.13 RUN set -ex \ && buildDeps=' \ + dpkg-dev \ gcc \ libbz2-dev \ libc6-dev \ @@ -49,7 +50,9 @@ RUN set -ex \ && rm python.tar.xz \ \ && cd /usr/src/python \ + && gnuArch="$(dpkg-architecture --query DEB_BUILD_GNU_TYPE)" \ && ./configure \ + --build="$gnuArch" \ --enable-shared \ --enable-unicode=ucs4 \ && make -j "$(nproc)" \ diff --git a/2.7/wheezy/Dockerfile b/2.7/wheezy/Dockerfile index 4520e8888..d9a3d3d2d 100644 --- a/2.7/wheezy/Dockerfile +++ b/2.7/wheezy/Dockerfile @@ -18,6 +18,7 @@ ENV PYTHON_VERSION 2.7.13 RUN set -ex \ && buildDeps=' \ + dpkg-dev \ tcl-dev \ tk-dev \ ' \ @@ -34,7 +35,9 @@ RUN set -ex \ && rm python.tar.xz \ \ && cd /usr/src/python \ + && gnuArch="$(dpkg-architecture --query DEB_BUILD_GNU_TYPE)" \ && ./configure \ + --build="$gnuArch" \ --enable-shared \ --enable-unicode=ucs4 \ && make -j "$(nproc)" \ diff --git a/3.3/Dockerfile b/3.3/Dockerfile index 950ce9f70..e9f9d5c0f 100644 --- a/3.3/Dockerfile +++ b/3.3/Dockerfile @@ -24,6 +24,7 @@ ENV PYTHON_VERSION 3.3.6 RUN set -ex \ && buildDeps=' \ + dpkg-dev \ tcl-dev \ tk-dev \ ' \ @@ -40,7 +41,9 @@ RUN set -ex \ && rm python.tar.xz \ \ && cd /usr/src/python \ + && gnuArch="$(dpkg-architecture --query DEB_BUILD_GNU_TYPE)" \ && ./configure \ + --build="$gnuArch" \ --enable-loadable-sqlite-extensions \ --enable-shared \ --without-ensurepip \ diff --git a/3.3/alpine/Dockerfile b/3.3/alpine/Dockerfile index 0c9515c20..fcb7d4194 100644 --- a/3.3/alpine/Dockerfile +++ b/3.3/alpine/Dockerfile @@ -39,6 +39,8 @@ RUN set -ex \ \ && apk add --no-cache --virtual .build-deps \ bzip2-dev \ + coreutils \ + dpkg-dev dpkg \ gcc \ gdbm-dev \ libc-dev \ @@ -59,11 +61,13 @@ RUN set -ex \ && apk del .fetch-deps \ \ && cd /usr/src/python \ + && gnuArch="$(dpkg-architecture --query DEB_BUILD_GNU_TYPE)" \ && ./configure \ + --build="$gnuArch" \ --enable-loadable-sqlite-extensions \ --enable-shared \ --without-ensurepip \ - && make -j "$(getconf _NPROCESSORS_ONLN)" \ + && make -j "$(nproc)" \ && make install \ \ && runDeps="$( \ diff --git a/3.3/slim/Dockerfile b/3.3/slim/Dockerfile index 29e7e01a0..9047ef38c 100644 --- a/3.3/slim/Dockerfile +++ b/3.3/slim/Dockerfile @@ -26,6 +26,7 @@ ENV PYTHON_VERSION 3.3.6 RUN set -ex \ && buildDeps=' \ + dpkg-dev \ gcc \ libbz2-dev \ libc6-dev \ @@ -55,7 +56,9 @@ RUN set -ex \ && rm python.tar.xz \ \ && cd /usr/src/python \ + && gnuArch="$(dpkg-architecture --query DEB_BUILD_GNU_TYPE)" \ && ./configure \ + --build="$gnuArch" \ --enable-loadable-sqlite-extensions \ --enable-shared \ --without-ensurepip \ diff --git a/3.3/wheezy/Dockerfile b/3.3/wheezy/Dockerfile index 8c6774e50..cb19ed63d 100644 --- a/3.3/wheezy/Dockerfile +++ b/3.3/wheezy/Dockerfile @@ -24,6 +24,7 @@ ENV PYTHON_VERSION 3.3.6 RUN set -ex \ && buildDeps=' \ + dpkg-dev \ tcl-dev \ tk-dev \ ' \ @@ -40,7 +41,9 @@ RUN set -ex \ && rm python.tar.xz \ \ && cd /usr/src/python \ + && gnuArch="$(dpkg-architecture --query DEB_BUILD_GNU_TYPE)" \ && ./configure \ + --build="$gnuArch" \ --enable-loadable-sqlite-extensions \ --enable-shared \ --without-ensurepip \ diff --git a/3.4/Dockerfile b/3.4/Dockerfile index 400d1d137..f3f302ec5 100644 --- a/3.4/Dockerfile +++ b/3.4/Dockerfile @@ -24,6 +24,7 @@ ENV PYTHON_VERSION 3.4.6 RUN set -ex \ && buildDeps=' \ + dpkg-dev \ tcl-dev \ tk-dev \ ' \ @@ -40,7 +41,9 @@ RUN set -ex \ && rm python.tar.xz \ \ && cd /usr/src/python \ + && gnuArch="$(dpkg-architecture --query DEB_BUILD_GNU_TYPE)" \ && ./configure \ + --build="$gnuArch" \ --enable-loadable-sqlite-extensions \ --enable-shared \ --without-ensurepip \ diff --git a/3.4/alpine/Dockerfile b/3.4/alpine/Dockerfile index d73877938..5e43d6bb6 100644 --- a/3.4/alpine/Dockerfile +++ b/3.4/alpine/Dockerfile @@ -39,6 +39,8 @@ RUN set -ex \ \ && apk add --no-cache --virtual .build-deps \ bzip2-dev \ + coreutils \ + dpkg-dev dpkg \ gcc \ gdbm-dev \ libc-dev \ @@ -59,11 +61,13 @@ RUN set -ex \ && apk del .fetch-deps \ \ && cd /usr/src/python \ + && gnuArch="$(dpkg-architecture --query DEB_BUILD_GNU_TYPE)" \ && ./configure \ + --build="$gnuArch" \ --enable-loadable-sqlite-extensions \ --enable-shared \ --without-ensurepip \ - && make -j "$(getconf _NPROCESSORS_ONLN)" \ + && make -j "$(nproc)" \ && make install \ \ && runDeps="$( \ diff --git a/3.4/slim/Dockerfile b/3.4/slim/Dockerfile index db322af23..2fe3557fe 100644 --- a/3.4/slim/Dockerfile +++ b/3.4/slim/Dockerfile @@ -26,6 +26,7 @@ ENV PYTHON_VERSION 3.4.6 RUN set -ex \ && buildDeps=' \ + dpkg-dev \ gcc \ libbz2-dev \ libc6-dev \ @@ -55,7 +56,9 @@ RUN set -ex \ && rm python.tar.xz \ \ && cd /usr/src/python \ + && gnuArch="$(dpkg-architecture --query DEB_BUILD_GNU_TYPE)" \ && ./configure \ + --build="$gnuArch" \ --enable-loadable-sqlite-extensions \ --enable-shared \ --without-ensurepip \ diff --git a/3.4/wheezy/Dockerfile b/3.4/wheezy/Dockerfile index dad0c2fae..1957ec093 100644 --- a/3.4/wheezy/Dockerfile +++ b/3.4/wheezy/Dockerfile @@ -24,6 +24,7 @@ ENV PYTHON_VERSION 3.4.6 RUN set -ex \ && buildDeps=' \ + dpkg-dev \ tcl-dev \ tk-dev \ ' \ @@ -40,7 +41,9 @@ RUN set -ex \ && rm python.tar.xz \ \ && cd /usr/src/python \ + && gnuArch="$(dpkg-architecture --query DEB_BUILD_GNU_TYPE)" \ && ./configure \ + --build="$gnuArch" \ --enable-loadable-sqlite-extensions \ --enable-shared \ --without-ensurepip \ diff --git a/3.5/Dockerfile b/3.5/Dockerfile index 03d2fe8a4..5d8b60372 100644 --- a/3.5/Dockerfile +++ b/3.5/Dockerfile @@ -24,6 +24,7 @@ ENV PYTHON_VERSION 3.5.3 RUN set -ex \ && buildDeps=' \ + dpkg-dev \ tcl-dev \ tk-dev \ ' \ @@ -40,7 +41,9 @@ RUN set -ex \ && rm python.tar.xz \ \ && cd /usr/src/python \ + && gnuArch="$(dpkg-architecture --query DEB_BUILD_GNU_TYPE)" \ && ./configure \ + --build="$gnuArch" \ --enable-loadable-sqlite-extensions \ --enable-shared \ --without-ensurepip \ diff --git a/3.5/alpine/Dockerfile b/3.5/alpine/Dockerfile index 97e19259f..7f34ba9c9 100644 --- a/3.5/alpine/Dockerfile +++ b/3.5/alpine/Dockerfile @@ -39,6 +39,8 @@ RUN set -ex \ \ && apk add --no-cache --virtual .build-deps \ bzip2-dev \ + coreutils \ + dpkg-dev dpkg \ gcc \ gdbm-dev \ libc-dev \ @@ -59,11 +61,13 @@ RUN set -ex \ && apk del .fetch-deps \ \ && cd /usr/src/python \ + && gnuArch="$(dpkg-architecture --query DEB_BUILD_GNU_TYPE)" \ && ./configure \ + --build="$gnuArch" \ --enable-loadable-sqlite-extensions \ --enable-shared \ --without-ensurepip \ - && make -j "$(getconf _NPROCESSORS_ONLN)" \ + && make -j "$(nproc)" \ && make install \ \ && runDeps="$( \ diff --git a/3.5/slim/Dockerfile b/3.5/slim/Dockerfile index 7fde2e6b2..82c842586 100644 --- a/3.5/slim/Dockerfile +++ b/3.5/slim/Dockerfile @@ -26,6 +26,7 @@ ENV PYTHON_VERSION 3.5.3 RUN set -ex \ && buildDeps=' \ + dpkg-dev \ gcc \ libbz2-dev \ libc6-dev \ @@ -55,7 +56,9 @@ RUN set -ex \ && rm python.tar.xz \ \ && cd /usr/src/python \ + && gnuArch="$(dpkg-architecture --query DEB_BUILD_GNU_TYPE)" \ && ./configure \ + --build="$gnuArch" \ --enable-loadable-sqlite-extensions \ --enable-shared \ --without-ensurepip \ diff --git a/3.6/Dockerfile b/3.6/Dockerfile index 27c8652b8..51d8e8340 100644 --- a/3.6/Dockerfile +++ b/3.6/Dockerfile @@ -24,6 +24,7 @@ ENV PYTHON_VERSION 3.6.1 RUN set -ex \ && buildDeps=' \ + dpkg-dev \ tcl-dev \ tk-dev \ ' \ @@ -40,7 +41,9 @@ RUN set -ex \ && rm python.tar.xz \ \ && cd /usr/src/python \ + && gnuArch="$(dpkg-architecture --query DEB_BUILD_GNU_TYPE)" \ && ./configure \ + --build="$gnuArch" \ --enable-loadable-sqlite-extensions \ --enable-shared \ --without-ensurepip \ diff --git a/3.6/alpine/Dockerfile b/3.6/alpine/Dockerfile index 62c92d2a1..7f3c4743c 100644 --- a/3.6/alpine/Dockerfile +++ b/3.6/alpine/Dockerfile @@ -39,6 +39,8 @@ RUN set -ex \ \ && apk add --no-cache --virtual .build-deps \ bzip2-dev \ + coreutils \ + dpkg-dev dpkg \ gcc \ gdbm-dev \ libc-dev \ @@ -59,11 +61,13 @@ RUN set -ex \ && apk del .fetch-deps \ \ && cd /usr/src/python \ + && gnuArch="$(dpkg-architecture --query DEB_BUILD_GNU_TYPE)" \ && ./configure \ + --build="$gnuArch" \ --enable-loadable-sqlite-extensions \ --enable-shared \ --without-ensurepip \ - && make -j "$(getconf _NPROCESSORS_ONLN)" \ + && make -j "$(nproc)" \ && make install \ \ && runDeps="$( \ diff --git a/3.6/slim/Dockerfile b/3.6/slim/Dockerfile index 0ed333bb5..445bf1d8f 100644 --- a/3.6/slim/Dockerfile +++ b/3.6/slim/Dockerfile @@ -26,6 +26,7 @@ ENV PYTHON_VERSION 3.6.1 RUN set -ex \ && buildDeps=' \ + dpkg-dev \ gcc \ libbz2-dev \ libc6-dev \ @@ -55,7 +56,9 @@ RUN set -ex \ && rm python.tar.xz \ \ && cd /usr/src/python \ + && gnuArch="$(dpkg-architecture --query DEB_BUILD_GNU_TYPE)" \ && ./configure \ + --build="$gnuArch" \ --enable-loadable-sqlite-extensions \ --enable-shared \ --without-ensurepip \ diff --git a/Dockerfile-alpine.template b/Dockerfile-alpine.template index 3b0723d92..b634e0384 100644 --- a/Dockerfile-alpine.template +++ b/Dockerfile-alpine.template @@ -33,6 +33,8 @@ RUN set -ex \ \ && apk add --no-cache --virtual .build-deps \ bzip2-dev \ + coreutils \ + dpkg-dev dpkg \ gcc \ gdbm-dev \ libc-dev \ @@ -53,11 +55,13 @@ RUN set -ex \ && apk del .fetch-deps \ \ && cd /usr/src/python \ + && gnuArch="$(dpkg-architecture --query DEB_BUILD_GNU_TYPE)" \ && ./configure \ + --build="$gnuArch" \ --enable-loadable-sqlite-extensions \ --enable-shared \ --without-ensurepip \ - && make -j "$(getconf _NPROCESSORS_ONLN)" \ + && make -j "$(nproc)" \ && make install \ \ && runDeps="$( \ diff --git a/Dockerfile-debian.template b/Dockerfile-debian.template index 592cf2563..fefb102a6 100644 --- a/Dockerfile-debian.template +++ b/Dockerfile-debian.template @@ -18,6 +18,7 @@ ENV PYTHON_VERSION %%PLACEHOLDER%% RUN set -ex \ && buildDeps=' \ + dpkg-dev \ tcl-dev \ tk-dev \ ' \ @@ -34,7 +35,9 @@ RUN set -ex \ && rm python.tar.xz \ \ && cd /usr/src/python \ + && gnuArch="$(dpkg-architecture --query DEB_BUILD_GNU_TYPE)" \ && ./configure \ + --build="$gnuArch" \ --enable-loadable-sqlite-extensions \ --enable-shared \ --without-ensurepip \ diff --git a/Dockerfile-slim.template b/Dockerfile-slim.template index ee663b94d..21e6dffd3 100644 --- a/Dockerfile-slim.template +++ b/Dockerfile-slim.template @@ -20,6 +20,7 @@ ENV PYTHON_VERSION %%PLACEHOLDER%% RUN set -ex \ && buildDeps=' \ + dpkg-dev \ gcc \ libbz2-dev \ libc6-dev \ @@ -49,7 +50,9 @@ RUN set -ex \ && rm python.tar.xz \ \ && cd /usr/src/python \ + && gnuArch="$(dpkg-architecture --query DEB_BUILD_GNU_TYPE)" \ && ./configure \ + --build="$gnuArch" \ --enable-loadable-sqlite-extensions \ --enable-shared \ --without-ensurepip \ From a33fcb6adc834c2fdddd894fd0bbfc2609488e69 Mon Sep 17 00:00:00 2001 From: Tianon Gravi Date: Wed, 10 May 2017 09:31:26 -0700 Subject: [PATCH 2/2] Fix wheezy variants (older "dpkg-architecture", no "--query") --- 2.7/wheezy/Dockerfile | 2 +- 3.3/wheezy/Dockerfile | 2 +- 3.4/wheezy/Dockerfile | 2 +- update.sh | 6 +++++- 4 files changed, 8 insertions(+), 4 deletions(-) diff --git a/2.7/wheezy/Dockerfile b/2.7/wheezy/Dockerfile index d9a3d3d2d..90d98feaf 100644 --- a/2.7/wheezy/Dockerfile +++ b/2.7/wheezy/Dockerfile @@ -35,7 +35,7 @@ RUN set -ex \ && rm python.tar.xz \ \ && cd /usr/src/python \ - && gnuArch="$(dpkg-architecture --query DEB_BUILD_GNU_TYPE)" \ + && gnuArch="$(dpkg-architecture -qDEB_BUILD_GNU_TYPE)" \ && ./configure \ --build="$gnuArch" \ --enable-shared \ diff --git a/3.3/wheezy/Dockerfile b/3.3/wheezy/Dockerfile index cb19ed63d..0e3e5e9d9 100644 --- a/3.3/wheezy/Dockerfile +++ b/3.3/wheezy/Dockerfile @@ -41,7 +41,7 @@ RUN set -ex \ && rm python.tar.xz \ \ && cd /usr/src/python \ - && gnuArch="$(dpkg-architecture --query DEB_BUILD_GNU_TYPE)" \ + && gnuArch="$(dpkg-architecture -qDEB_BUILD_GNU_TYPE)" \ && ./configure \ --build="$gnuArch" \ --enable-loadable-sqlite-extensions \ diff --git a/3.4/wheezy/Dockerfile b/3.4/wheezy/Dockerfile index 1957ec093..7ba7323df 100644 --- a/3.4/wheezy/Dockerfile +++ b/3.4/wheezy/Dockerfile @@ -41,7 +41,7 @@ RUN set -ex \ && rm python.tar.xz \ \ && cd /usr/src/python \ - && gnuArch="$(dpkg-architecture --query DEB_BUILD_GNU_TYPE)" \ + && gnuArch="$(dpkg-architecture -qDEB_BUILD_GNU_TYPE)" \ && ./configure \ --build="$gnuArch" \ --enable-loadable-sqlite-extensions \ diff --git a/update.sh b/update.sh index ceda42717..b6976d9f3 100755 --- a/update.sh +++ b/update.sh @@ -94,7 +94,11 @@ for version in "${versions[@]}"; do done if [ -d "$version/wheezy" ]; then cp "$version/Dockerfile" "$version/wheezy/Dockerfile" - sed -ri 's/:jessie/:wheezy/g' "$version/wheezy/Dockerfile" + # wheezy-only: dpkg-architecture: unknown option `--query' + sed -ri \ + -e 's/:jessie/:wheezy/g' \ + -e 's/dpkg-architecture --query /dpkg-architecture -q/g' \ + "$version/wheezy/Dockerfile" fi fi (