Skip to content

Commit f281133

Browse files
yosifkityosifkit
authored
Merge pull request docker-library#198 from infosiftr/multiarch
Add explicit "--build" to our "./configure" invocations
2 parents c3ff1c2 + a33fcb6 commit f281133

22 files changed

+80
-7
lines changed

‎2.7/Dockerfile

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,7 @@ ENV PYTHON_VERSION 2.7.13
1818

1919
RUN set -ex \
2020
&& buildDeps=' \
21+
dpkg-dev \
2122
tcl-dev \
2223
tk-dev \
2324
' \
@@ -34,7 +35,9 @@ RUN set -ex \
3435
&& rm python.tar.xz \
3536
\
3637
&& cd /usr/src/python \
38+
&& gnuArch="$(dpkg-architecture --query DEB_BUILD_GNU_TYPE)" \
3739
&& ./configure \
40+
--build="$gnuArch" \
3841
--enable-shared \
3942
--enable-unicode=ucs4 \
4043
&& make -j "$(nproc)" \

‎2.7/alpine/Dockerfile

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,6 +33,8 @@ RUN set -ex \
3333
\
3434
&& apk add --no-cache --virtual .build-deps \
3535
bzip2-dev \
36+
coreutils \
37+
dpkg-dev dpkg \
3638
gcc \
3739
gdbm-dev \
3840
libc-dev \
@@ -52,10 +54,12 @@ RUN set -ex \
5254
&& apk del .fetch-deps \
5355
\
5456
&& cd /usr/src/python \
57+
&& gnuArch="$(dpkg-architecture --query DEB_BUILD_GNU_TYPE)" \
5558
&& ./configure \
59+
--build="$gnuArch" \
5660
--enable-shared \
5761
--enable-unicode=ucs4 \
58-
&& make -j "$(getconf _NPROCESSORS_ONLN)" \
62+
&& make -j "$(nproc)" \
5963
&& make install \
6064
\
6165
&& runDeps="$( \

‎2.7/slim/Dockerfile

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,7 @@ ENV PYTHON_VERSION 2.7.13
2020

2121
RUN set -ex \
2222
&& buildDeps=' \
23+
dpkg-dev \
2324
gcc \
2425
libbz2-dev \
2526
libc6-dev \
@@ -49,7 +50,9 @@ RUN set -ex \
4950
&& rm python.tar.xz \
5051
\
5152
&& cd /usr/src/python \
53+
&& gnuArch="$(dpkg-architecture --query DEB_BUILD_GNU_TYPE)" \
5254
&& ./configure \
55+
--build="$gnuArch" \
5356
--enable-shared \
5457
--enable-unicode=ucs4 \
5558
&& make -j "$(nproc)" \

‎2.7/wheezy/Dockerfile

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,7 @@ ENV PYTHON_VERSION 2.7.13
1818

1919
RUN set -ex \
2020
&& buildDeps=' \
21+
dpkg-dev \
2122
tcl-dev \
2223
tk-dev \
2324
' \
@@ -34,7 +35,9 @@ RUN set -ex \
3435
&& rm python.tar.xz \
3536
\
3637
&& cd /usr/src/python \
38+
&& gnuArch="$(dpkg-architecture -qDEB_BUILD_GNU_TYPE)" \
3739
&& ./configure \
40+
--build="$gnuArch" \
3841
--enable-shared \
3942
--enable-unicode=ucs4 \
4043
&& make -j "$(nproc)" \

‎3.3/Dockerfile

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,7 @@ ENV PYTHON_VERSION 3.3.6
2424

2525
RUN set -ex \
2626
&& buildDeps=' \
27+
dpkg-dev \
2728
tcl-dev \
2829
tk-dev \
2930
' \
@@ -40,7 +41,9 @@ RUN set -ex \
4041
&& rm python.tar.xz \
4142
\
4243
&& cd /usr/src/python \
44+
&& gnuArch="$(dpkg-architecture --query DEB_BUILD_GNU_TYPE)" \
4345
&& ./configure \
46+
--build="$gnuArch" \
4447
--enable-loadable-sqlite-extensions \
4548
--enable-shared \
4649
--without-ensurepip \

‎3.3/alpine/Dockerfile

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -39,6 +39,8 @@ RUN set -ex \
3939
\
4040
&& apk add --no-cache --virtual .build-deps \
4141
bzip2-dev \
42+
coreutils \
43+
dpkg-dev dpkg \
4244
gcc \
4345
gdbm-dev \
4446
libc-dev \
@@ -59,11 +61,13 @@ RUN set -ex \
5961
&& apk del .fetch-deps \
6062
\
6163
&& cd /usr/src/python \
64+
&& gnuArch="$(dpkg-architecture --query DEB_BUILD_GNU_TYPE)" \
6265
&& ./configure \
66+
--build="$gnuArch" \
6367
--enable-loadable-sqlite-extensions \
6468
--enable-shared \
6569
--without-ensurepip \
66-
&& make -j "$(getconf _NPROCESSORS_ONLN)" \
70+
&& make -j "$(nproc)" \
6771
&& make install \
6872
\
6973
&& runDeps="$( \

‎3.3/slim/Dockerfile

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -26,6 +26,7 @@ ENV PYTHON_VERSION 3.3.6
2626

2727
RUN set -ex \
2828
&& buildDeps=' \
29+
dpkg-dev \
2930
gcc \
3031
libbz2-dev \
3132
libc6-dev \
@@ -55,7 +56,9 @@ RUN set -ex \
5556
&& rm python.tar.xz \
5657
\
5758
&& cd /usr/src/python \
59+
&& gnuArch="$(dpkg-architecture --query DEB_BUILD_GNU_TYPE)" \
5860
&& ./configure \
61+
--build="$gnuArch" \
5962
--enable-loadable-sqlite-extensions \
6063
--enable-shared \
6164
--without-ensurepip \

‎3.3/wheezy/Dockerfile

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,7 @@ ENV PYTHON_VERSION 3.3.6
2424

2525
RUN set -ex \
2626
&& buildDeps=' \
27+
dpkg-dev \
2728
tcl-dev \
2829
tk-dev \
2930
' \
@@ -40,7 +41,9 @@ RUN set -ex \
4041
&& rm python.tar.xz \
4142
\
4243
&& cd /usr/src/python \
44+
&& gnuArch="$(dpkg-architecture -qDEB_BUILD_GNU_TYPE)" \
4345
&& ./configure \
46+
--build="$gnuArch" \
4447
--enable-loadable-sqlite-extensions \
4548
--enable-shared \
4649
--without-ensurepip \

‎3.4/Dockerfile

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,7 @@ ENV PYTHON_VERSION 3.4.6
2424

2525
RUN set -ex \
2626
&& buildDeps=' \
27+
dpkg-dev \
2728
tcl-dev \
2829
tk-dev \
2930
' \
@@ -40,7 +41,9 @@ RUN set -ex \
4041
&& rm python.tar.xz \
4142
\
4243
&& cd /usr/src/python \
44+
&& gnuArch="$(dpkg-architecture --query DEB_BUILD_GNU_TYPE)" \
4345
&& ./configure \
46+
--build="$gnuArch" \
4447
--enable-loadable-sqlite-extensions \
4548
--enable-shared \
4649
--without-ensurepip \

‎3.4/alpine/Dockerfile

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -39,6 +39,8 @@ RUN set -ex \
3939
\
4040
&& apk add --no-cache --virtual .build-deps \
4141
bzip2-dev \
42+
coreutils \
43+
dpkg-dev dpkg \
4244
gcc \
4345
gdbm-dev \
4446
libc-dev \
@@ -59,11 +61,13 @@ RUN set -ex \
5961
&& apk del .fetch-deps \
6062
\
6163
&& cd /usr/src/python \
64+
&& gnuArch="$(dpkg-architecture --query DEB_BUILD_GNU_TYPE)" \
6265
&& ./configure \
66+
--build="$gnuArch" \
6367
--enable-loadable-sqlite-extensions \
6468
--enable-shared \
6569
--without-ensurepip \
66-
&& make -j "$(getconf _NPROCESSORS_ONLN)" \
70+
&& make -j "$(nproc)" \
6771
&& make install \
6872
\
6973
&& runDeps="$( \

0 commit comments

Comments
 (0)
pFad - Phonifier reborn

Pfad - The Proxy pFad of © 2024 Garber Painting. All rights reserved.

Note: This service is not intended for secure transactions such as banking, social media, email, or purchasing. Use at your own risk. We assume no liability whatsoever for broken pages.


Alternative Proxies:

Alternative Proxy

pFad Proxy

pFad v3 Proxy

pFad v4 Proxy