Update python #14245
Merged
Update python #14245
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Changes: - docker-library/python@5a3fb03: Merge pull request docker-library/python#811 from infosiftr/dpkg-buildflags - docker-library/python@8a8d6ba: Add compiler hardening flags via `dpkg-buildflags`
Diff for 4521027:diff --git a/_bashbrew-cat b/_bashbrew-cat
index 1179cf2..59b3ec3 100644
--- a/_bashbrew-cat
+++ b/_bashbrew-cat
@@ -3,126 +3,126 @@ GitRepo: https://github.com/docker-library/python.git
Tags: 3.7.16-alpine3.16, 3.7-alpine3.16
Architectures: amd64, arm32v6, arm32v7, arm64v8, i386, ppc64le, s390x
-GitCommit: bdbceda203ff70da4e00693d822c8cc1b77ae040
+GitCommit: 8a8d6baac38dcd208f699ae2eb10f0893a764035
Directory: 3.7/alpine3.16
Tags: 3.7.16-alpine3.17, 3.7-alpine3.17, 3.7.16-alpine, 3.7-alpine
Architectures: amd64, arm32v6, arm32v7, arm64v8, i386, ppc64le, s390x
-GitCommit: bdbceda203ff70da4e00693d822c8cc1b77ae040
+GitCommit: 8a8d6baac38dcd208f699ae2eb10f0893a764035
Directory: 3.7/alpine3.17
Tags: 3.7.16-bullseye, 3.7-bullseye
SharedTags: 3.7.16, 3.7
Architectures: amd64, arm32v5, arm32v7, arm64v8, i386, mips64le, ppc64le, s390x
-GitCommit: bdbceda203ff70da4e00693d822c8cc1b77ae040
+GitCommit: 8a8d6baac38dcd208f699ae2eb10f0893a764035
Directory: 3.7/bullseye
Tags: 3.7.16-buster, 3.7-buster
Architectures: amd64, arm32v7, arm64v8, i386
-GitCommit: bdbceda203ff70da4e00693d822c8cc1b77ae040
+GitCommit: 8a8d6baac38dcd208f699ae2eb10f0893a764035
Directory: 3.7/buster
Tags: 3.7.16-slim-bullseye, 3.7-slim-bullseye, 3.7.16-slim, 3.7-slim
Architectures: amd64, arm32v5, arm32v7, arm64v8, i386, mips64le, ppc64le, s390x
-GitCommit: bdbceda203ff70da4e00693d822c8cc1b77ae040
+GitCommit: 8a8d6baac38dcd208f699ae2eb10f0893a764035
Directory: 3.7/slim-bullseye
Tags: 3.7.16-slim-buster, 3.7-slim-buster
Architectures: amd64, arm32v7, arm64v8, i386
-GitCommit: bdbceda203ff70da4e00693d822c8cc1b77ae040
+GitCommit: 8a8d6baac38dcd208f699ae2eb10f0893a764035
Directory: 3.7/slim-buster
Tags: 3.8.16-alpine3.16, 3.8-alpine3.16
Architectures: amd64, arm32v6, arm32v7, arm64v8, i386, ppc64le, s390x
-GitCommit: a541c1b89df7d92c1027aa380454b066ffe9a315
+GitCommit: 8a8d6baac38dcd208f699ae2eb10f0893a764035
Directory: 3.8/alpine3.16
Tags: 3.8.16-alpine3.17, 3.8-alpine3.17, 3.8.16-alpine, 3.8-alpine
Architectures: amd64, arm32v6, arm32v7, arm64v8, i386, ppc64le, s390x
-GitCommit: a541c1b89df7d92c1027aa380454b066ffe9a315
+GitCommit: 8a8d6baac38dcd208f699ae2eb10f0893a764035
Directory: 3.8/alpine3.17
Tags: 3.8.16-bullseye, 3.8-bullseye
SharedTags: 3.8.16, 3.8
Architectures: amd64, arm32v5, arm32v7, arm64v8, i386, mips64le, ppc64le, s390x
-GitCommit: a541c1b89df7d92c1027aa380454b066ffe9a315
+GitCommit: 8a8d6baac38dcd208f699ae2eb10f0893a764035
Directory: 3.8/bullseye
Tags: 3.8.16-buster, 3.8-buster
Architectures: amd64, arm32v7, arm64v8, i386
-GitCommit: a541c1b89df7d92c1027aa380454b066ffe9a315
+GitCommit: 8a8d6baac38dcd208f699ae2eb10f0893a764035
Directory: 3.8/buster
Tags: 3.8.16-slim-bullseye, 3.8-slim-bullseye, 3.8.16-slim, 3.8-slim
Architectures: amd64, arm32v5, arm32v7, arm64v8, i386, mips64le, ppc64le, s390x
-GitCommit: a541c1b89df7d92c1027aa380454b066ffe9a315
+GitCommit: 8a8d6baac38dcd208f699ae2eb10f0893a764035
Directory: 3.8/slim-bullseye
Tags: 3.8.16-slim-buster, 3.8-slim-buster
Architectures: amd64, arm32v7, arm64v8, i386
-GitCommit: a541c1b89df7d92c1027aa380454b066ffe9a315
+GitCommit: 8a8d6baac38dcd208f699ae2eb10f0893a764035
Directory: 3.8/slim-buster
Tags: 3.9.16-alpine3.16, 3.9-alpine3.16
Architectures: amd64, arm32v6, arm32v7, arm64v8, i386, ppc64le, s390x
-GitCommit: f568f56f28fab0fe87b34db777e2c2861cef002b
+GitCommit: 8a8d6baac38dcd208f699ae2eb10f0893a764035
Directory: 3.9/alpine3.16
Tags: 3.9.16-alpine3.17, 3.9-alpine3.17, 3.9.16-alpine, 3.9-alpine
Architectures: amd64, arm32v6, arm32v7, arm64v8, i386, ppc64le, s390x
-GitCommit: f568f56f28fab0fe87b34db777e2c2861cef002b
+GitCommit: 8a8d6baac38dcd208f699ae2eb10f0893a764035
Directory: 3.9/alpine3.17
Tags: 3.9.16-bullseye, 3.9-bullseye
SharedTags: 3.9.16, 3.9
Architectures: amd64, arm32v5, arm32v7, arm64v8, i386, mips64le, ppc64le, s390x
-GitCommit: f568f56f28fab0fe87b34db777e2c2861cef002b
+GitCommit: 8a8d6baac38dcd208f699ae2eb10f0893a764035
Directory: 3.9/bullseye
Tags: 3.9.16-buster, 3.9-buster
Architectures: amd64, arm32v7, arm64v8, i386
-GitCommit: f568f56f28fab0fe87b34db777e2c2861cef002b
+GitCommit: 8a8d6baac38dcd208f699ae2eb10f0893a764035
Directory: 3.9/buster
Tags: 3.9.16-slim-bullseye, 3.9-slim-bullseye, 3.9.16-slim, 3.9-slim
Architectures: amd64, arm32v5, arm32v7, arm64v8, i386, mips64le, ppc64le, s390x
-GitCommit: f568f56f28fab0fe87b34db777e2c2861cef002b
+GitCommit: 8a8d6baac38dcd208f699ae2eb10f0893a764035
Directory: 3.9/slim-bullseye
Tags: 3.9.16-slim-buster, 3.9-slim-buster
Architectures: amd64, arm32v7, arm64v8, i386
-GitCommit: f568f56f28fab0fe87b34db777e2c2861cef002b
+GitCommit: 8a8d6baac38dcd208f699ae2eb10f0893a764035
Directory: 3.9/slim-buster
Tags: 3.10.10-alpine3.16, 3.10-alpine3.16
Architectures: amd64, arm32v6, arm32v7, arm64v8, i386, ppc64le, s390x
-GitCommit: a3533b1c48d968e784516470d18f3c24975df3d8
+GitCommit: 8a8d6baac38dcd208f699ae2eb10f0893a764035
Directory: 3.10/alpine3.16
Tags: 3.10.10-alpine3.17, 3.10-alpine3.17, 3.10.10-alpine, 3.10-alpine
Architectures: amd64, arm32v6, arm32v7, arm64v8, i386, ppc64le, s390x
-GitCommit: a3533b1c48d968e784516470d18f3c24975df3d8
+GitCommit: 8a8d6baac38dcd208f699ae2eb10f0893a764035
Directory: 3.10/alpine3.17
Tags: 3.10.10-bullseye, 3.10-bullseye
SharedTags: 3.10.10, 3.10
Architectures: amd64, arm32v5, arm32v7, arm64v8, i386, ppc64le, s390x
-GitCommit: a3533b1c48d968e784516470d18f3c24975df3d8
+GitCommit: 8a8d6baac38dcd208f699ae2eb10f0893a764035
Directory: 3.10/bullseye
Tags: 3.10.10-buster, 3.10-buster
Architectures: amd64, arm32v7, arm64v8, i386
-GitCommit: a3533b1c48d968e784516470d18f3c24975df3d8
+GitCommit: 8a8d6baac38dcd208f699ae2eb10f0893a764035
Directory: 3.10/buster
Tags: 3.10.10-slim-bullseye, 3.10-slim-bullseye, 3.10.10-slim, 3.10-slim
Architectures: amd64, arm32v5, arm32v7, arm64v8, i386, ppc64le, s390x
-GitCommit: a3533b1c48d968e784516470d18f3c24975df3d8
+GitCommit: 8a8d6baac38dcd208f699ae2eb10f0893a764035
Directory: 3.10/slim-bullseye
Tags: 3.10.10-slim-buster, 3.10-slim-buster
Architectures: amd64, arm32v7, arm64v8, i386
-GitCommit: a3533b1c48d968e784516470d18f3c24975df3d8
+GitCommit: 8a8d6baac38dcd208f699ae2eb10f0893a764035
Directory: 3.10/slim-buster
Tags: 3.10.10-windowsservercore-1809, 3.10-windowsservercore-1809
@@ -141,33 +141,33 @@ Constraints: windowsservercore-ltsc2022
Tags: 3.11.2-alpine3.16, 3.11-alpine3.16, 3-alpine3.16, alpine3.16
Architectures: amd64, arm32v6, arm32v7, arm64v8, i386, ppc64le, s390x
-GitCommit: e664abbb9af1ee6aae5778d70a5df79d86d9ec57
+GitCommit: 8a8d6baac38dcd208f699ae2eb10f0893a764035
Directory: 3.11/alpine3.16
Tags: 3.11.2-alpine3.17, 3.11-alpine3.17, 3-alpine3.17, alpine3.17, 3.11.2-alpine, 3.11-alpine, 3-alpine, alpine
Architectures: amd64, arm32v6, arm32v7, arm64v8, i386, ppc64le, s390x
-GitCommit: e664abbb9af1ee6aae5778d70a5df79d86d9ec57
+GitCommit: 8a8d6baac38dcd208f699ae2eb10f0893a764035
Directory: 3.11/alpine3.17
Tags: 3.11.2-bullseye, 3.11-bullseye, 3-bullseye, bullseye
SharedTags: 3.11.2, 3.11, 3, latest
Architectures: amd64, arm32v5, arm32v7, arm64v8, i386, ppc64le, s390x
-GitCommit: e664abbb9af1ee6aae5778d70a5df79d86d9ec57
+GitCommit: 8a8d6baac38dcd208f699ae2eb10f0893a764035
Directory: 3.11/bullseye
Tags: 3.11.2-buster, 3.11-buster, 3-buster, buster
Architectures: amd64, arm32v7, arm64v8, i386
-GitCommit: e664abbb9af1ee6aae5778d70a5df79d86d9ec57
+GitCommit: 8a8d6baac38dcd208f699ae2eb10f0893a764035
Directory: 3.11/buster
Tags: 3.11.2-slim-bullseye, 3.11-slim-bullseye, 3-slim-bullseye, slim-bullseye, 3.11.2-slim, 3.11-slim, 3-slim, slim
Architectures: amd64, arm32v5, arm32v7, arm64v8, i386, ppc64le, s390x
-GitCommit: e664abbb9af1ee6aae5778d70a5df79d86d9ec57
+GitCommit: 8a8d6baac38dcd208f699ae2eb10f0893a764035
Directory: 3.11/slim-bullseye
Tags: 3.11.2-slim-buster, 3.11-slim-buster, 3-slim-buster, slim-buster
Architectures: amd64, arm32v7, arm64v8, i386
-GitCommit: e664abbb9af1ee6aae5778d70a5df79d86d9ec57
+GitCommit: 8a8d6baac38dcd208f699ae2eb10f0893a764035
Directory: 3.11/slim-buster
Tags: 3.11.2-windowsservercore-1809, 3.11-windowsservercore-1809, 3-windowsservercore-1809, windowsservercore-1809
@@ -186,33 +186,33 @@ Constraints: windowsservercore-ltsc2022
Tags: 3.12.0a6-alpine3.16, 3.12-rc-alpine3.16
Architectures: amd64, arm32v6, arm32v7, arm64v8, i386, ppc64le, s390x
-GitCommit: 8442e048835d470610de219443b41d477d330e86
+GitCommit: 8a8d6baac38dcd208f699ae2eb10f0893a764035
Directory: 3.12-rc/alpine3.16
Tags: 3.12.0a6-alpine3.17, 3.12-rc-alpine3.17, 3.12.0a6-alpine, 3.12-rc-alpine
Architectures: amd64, arm32v6, arm32v7, arm64v8, i386, ppc64le, s390x
-GitCommit: 8442e048835d470610de219443b41d477d330e86
+GitCommit: 8a8d6baac38dcd208f699ae2eb10f0893a764035
Directory: 3.12-rc/alpine3.17
Tags: 3.12.0a6-bullseye, 3.12-rc-bullseye
SharedTags: 3.12.0a6, 3.12-rc
Architectures: amd64, arm32v5, arm32v7, arm64v8, i386, ppc64le, s390x
-GitCommit: 8442e048835d470610de219443b41d477d330e86
+GitCommit: 8a8d6baac38dcd208f699ae2eb10f0893a764035
Directory: 3.12-rc/bullseye
Tags: 3.12.0a6-buster, 3.12-rc-buster
Architectures: amd64, arm32v7, arm64v8, i386
-GitCommit: 8442e048835d470610de219443b41d477d330e86
+GitCommit: 8a8d6baac38dcd208f699ae2eb10f0893a764035
Directory: 3.12-rc/buster
Tags: 3.12.0a6-slim-bullseye, 3.12-rc-slim-bullseye, 3.12.0a6-slim, 3.12-rc-slim
Architectures: amd64, arm32v5, arm32v7, arm64v8, i386, ppc64le, s390x
-GitCommit: 8442e048835d470610de219443b41d477d330e86
+GitCommit: 8a8d6baac38dcd208f699ae2eb10f0893a764035
Directory: 3.12-rc/slim-bullseye
Tags: 3.12.0a6-slim-buster, 3.12-rc-slim-buster
Architectures: amd64, arm32v7, arm64v8, i386
-GitCommit: 8442e048835d470610de219443b41d477d330e86
+GitCommit: 8a8d6baac38dcd208f699ae2eb10f0893a764035
Directory: 3.12-rc/slim-buster
Tags: 3.12.0a6-windowsservercore-1809, 3.12-rc-windowsservercore-1809
diff --git a/python_3.10-alpine/Dockerfile b/python_3.10-alpine/Dockerfile
index ebe6bf7..8872caa 100644
--- a/python_3.10-alpine/Dockerfile
+++ b/python_3.10-alpine/Dockerfile
@@ -83,7 +83,7 @@ RUN set -eux; \
# set thread stack size to 1MB so we don't segfault before we hit sys.getrecursionlimit()
# https://github.com/alpinelinux/aports/commit/2026e1259422d4e0cf92391ca2d3844356c649d0
EXTRA_CFLAGS="-DTHREAD_STACK_SIZE=0x100000"; \
- LDFLAGS="-Wl,--strip-all"; \
+ LDFLAGS="${LDFLAGS:--Wl},--strip-all"; \
make -j "$nproc" \
"EXTRA_CFLAGS=${EXTRA_CFLAGS:-}" \
"LDFLAGS=${LDFLAGS:-}" \
diff --git a/python_3.10-alpine3.16/Dockerfile b/python_3.10-alpine3.16/Dockerfile
index 8f350e1..7237145 100644
--- a/python_3.10-alpine3.16/Dockerfile
+++ b/python_3.10-alpine3.16/Dockerfile
@@ -83,7 +83,7 @@ RUN set -eux; \
# set thread stack size to 1MB so we don't segfault before we hit sys.getrecursionlimit()
# https://github.com/alpinelinux/aports/commit/2026e1259422d4e0cf92391ca2d3844356c649d0
EXTRA_CFLAGS="-DTHREAD_STACK_SIZE=0x100000"; \
- LDFLAGS="-Wl,--strip-all"; \
+ LDFLAGS="${LDFLAGS:--Wl},--strip-all"; \
make -j "$nproc" \
"EXTRA_CFLAGS=${EXTRA_CFLAGS:-}" \
"LDFLAGS=${LDFLAGS:-}" \
diff --git a/python_3.10-bullseye/Dockerfile b/python_3.10-bullseye/Dockerfile
index ce13de5..b21a36c 100644
--- a/python_3.10-bullseye/Dockerfile
+++ b/python_3.10-bullseye/Dockerfile
@@ -52,6 +52,8 @@ RUN set -eux; \
--without-ensurepip \
; \
nproc="$(nproc)"; \
+ EXTRA_CFLAGS="$(dpkg-buildflags --get CFLAGS)"; \
+ LDFLAGS="$(dpkg-buildflags --get LDFLAGS)"; \
make -j "$nproc" \
"EXTRA_CFLAGS=${EXTRA_CFLAGS:-}" \
"LDFLAGS=${LDFLAGS:-}" \
diff --git a/python_3.10-buster/Dockerfile b/python_3.10-buster/Dockerfile
index 408954a..77e86e7 100644
--- a/python_3.10-buster/Dockerfile
+++ b/python_3.10-buster/Dockerfile
@@ -52,6 +52,8 @@ RUN set -eux; \
--without-ensurepip \
; \
nproc="$(nproc)"; \
+ EXTRA_CFLAGS="$(dpkg-buildflags --get CFLAGS)"; \
+ LDFLAGS="$(dpkg-buildflags --get LDFLAGS)"; \
make -j "$nproc" \
"EXTRA_CFLAGS=${EXTRA_CFLAGS:-}" \
"LDFLAGS=${LDFLAGS:-}" \
diff --git a/python_3.10-slim-buster/Dockerfile b/python_3.10-slim-buster/Dockerfile
index e9e5e50..d603aaf 100644
--- a/python_3.10-slim-buster/Dockerfile
+++ b/python_3.10-slim-buster/Dockerfile
@@ -77,7 +77,9 @@ RUN set -eux; \
--without-ensurepip \
; \
nproc="$(nproc)"; \
- LDFLAGS="-Wl,--strip-all"; \
+ EXTRA_CFLAGS="$(dpkg-buildflags --get CFLAGS)"; \
+ LDFLAGS="$(dpkg-buildflags --get LDFLAGS)"; \
+ LDFLAGS="${LDFLAGS:--Wl},--strip-all"; \
make -j "$nproc" \
"EXTRA_CFLAGS=${EXTRA_CFLAGS:-}" \
"LDFLAGS=${LDFLAGS:-}" \
diff --git a/python_3.10-slim/Dockerfile b/python_3.10-slim/Dockerfile
index f4bdfcb..1099ca4 100644
--- a/python_3.10-slim/Dockerfile
+++ b/python_3.10-slim/Dockerfile
@@ -77,7 +77,9 @@ RUN set -eux; \
--without-ensurepip \
; \
nproc="$(nproc)"; \
- LDFLAGS="-Wl,--strip-all"; \
+ EXTRA_CFLAGS="$(dpkg-buildflags --get CFLAGS)"; \
+ LDFLAGS="$(dpkg-buildflags --get LDFLAGS)"; \
+ LDFLAGS="${LDFLAGS:--Wl},--strip-all"; \
make -j "$nproc" \
"EXTRA_CFLAGS=${EXTRA_CFLAGS:-}" \
"LDFLAGS=${LDFLAGS:-}" \
diff --git a/python_3.12-rc-alpine/Dockerfile b/python_3.12-rc-alpine/Dockerfile
index 425e971..3527784 100644
--- a/python_3.12-rc-alpine/Dockerfile
+++ b/python_3.12-rc-alpine/Dockerfile
@@ -83,7 +83,7 @@ RUN set -eux; \
# set thread stack size to 1MB so we don't segfault before we hit sys.getrecursionlimit()
# https://github.com/alpinelinux/aports/commit/2026e1259422d4e0cf92391ca2d3844356c649d0
EXTRA_CFLAGS="-DTHREAD_STACK_SIZE=0x100000"; \
- LDFLAGS="-Wl,--strip-all"; \
+ LDFLAGS="${LDFLAGS:--Wl},--strip-all"; \
make -j "$nproc" \
"EXTRA_CFLAGS=${EXTRA_CFLAGS:-}" \
"LDFLAGS=${LDFLAGS:-}" \
diff --git a/python_3.12-rc-alpine3.16/Dockerfile b/python_3.12-rc-alpine3.16/Dockerfile
index 1c366f0..d19a969 100644
--- a/python_3.12-rc-alpine3.16/Dockerfile
+++ b/python_3.12-rc-alpine3.16/Dockerfile
@@ -83,7 +83,7 @@ RUN set -eux; \
# set thread stack size to 1MB so we don't segfault before we hit sys.getrecursionlimit()
# https://github.com/alpinelinux/aports/commit/2026e1259422d4e0cf92391ca2d3844356c649d0
EXTRA_CFLAGS="-DTHREAD_STACK_SIZE=0x100000"; \
- LDFLAGS="-Wl,--strip-all"; \
+ LDFLAGS="${LDFLAGS:--Wl},--strip-all"; \
make -j "$nproc" \
"EXTRA_CFLAGS=${EXTRA_CFLAGS:-}" \
"LDFLAGS=${LDFLAGS:-}" \
diff --git a/python_3.12-rc-bullseye/Dockerfile b/python_3.12-rc-bullseye/Dockerfile
index eb40fee..c26f1c8 100644
--- a/python_3.12-rc-bullseye/Dockerfile
+++ b/python_3.12-rc-bullseye/Dockerfile
@@ -52,6 +52,8 @@ RUN set -eux; \
--without-ensurepip \
; \
nproc="$(nproc)"; \
+ EXTRA_CFLAGS="$(dpkg-buildflags --get CFLAGS)"; \
+ LDFLAGS="$(dpkg-buildflags --get LDFLAGS)"; \
make -j "$nproc" \
"EXTRA_CFLAGS=${EXTRA_CFLAGS:-}" \
"LDFLAGS=${LDFLAGS:-}" \
diff --git a/python_3.12-rc-buster/Dockerfile b/python_3.12-rc-buster/Dockerfile
index 87e9b35..97bc568 100644
--- a/python_3.12-rc-buster/Dockerfile
+++ b/python_3.12-rc-buster/Dockerfile
@@ -52,6 +52,8 @@ RUN set -eux; \
--without-ensurepip \
; \
nproc="$(nproc)"; \
+ EXTRA_CFLAGS="$(dpkg-buildflags --get CFLAGS)"; \
+ LDFLAGS="$(dpkg-buildflags --get LDFLAGS)"; \
make -j "$nproc" \
"EXTRA_CFLAGS=${EXTRA_CFLAGS:-}" \
"LDFLAGS=${LDFLAGS:-}" \
diff --git a/python_3.12-rc-slim-buster/Dockerfile b/python_3.12-rc-slim-buster/Dockerfile
index b71cb07..f5f9fe6 100644
--- a/python_3.12-rc-slim-buster/Dockerfile
+++ b/python_3.12-rc-slim-buster/Dockerfile
@@ -77,7 +77,9 @@ RUN set -eux; \
--without-ensurepip \
; \
nproc="$(nproc)"; \
- LDFLAGS="-Wl,--strip-all"; \
+ EXTRA_CFLAGS="$(dpkg-buildflags --get CFLAGS)"; \
+ LDFLAGS="$(dpkg-buildflags --get LDFLAGS)"; \
+ LDFLAGS="${LDFLAGS:--Wl},--strip-all"; \
make -j "$nproc" \
"EXTRA_CFLAGS=${EXTRA_CFLAGS:-}" \
"LDFLAGS=${LDFLAGS:-}" \
diff --git a/python_3.12-rc-slim/Dockerfile b/python_3.12-rc-slim/Dockerfile
index 27d0402..6a2977a 100644
--- a/python_3.12-rc-slim/Dockerfile
+++ b/python_3.12-rc-slim/Dockerfile
@@ -77,7 +77,9 @@ RUN set -eux; \
--without-ensurepip \
; \
nproc="$(nproc)"; \
- LDFLAGS="-Wl,--strip-all"; \
+ EXTRA_CFLAGS="$(dpkg-buildflags --get CFLAGS)"; \
+ LDFLAGS="$(dpkg-buildflags --get LDFLAGS)"; \
+ LDFLAGS="${LDFLAGS:--Wl},--strip-all"; \
make -j "$nproc" \
"EXTRA_CFLAGS=${EXTRA_CFLAGS:-}" \
"LDFLAGS=${LDFLAGS:-}" \
diff --git a/python_3.7-alpine/Dockerfile b/python_3.7-alpine/Dockerfile
index 6de41e8..c59065f 100644
--- a/python_3.7-alpine/Dockerfile
+++ b/python_3.7-alpine/Dockerfile
@@ -82,7 +82,7 @@ RUN set -eux; \
# set thread stack size to 1MB so we don't segfault before we hit sys.getrecursionlimit()
# https://github.com/alpinelinux/aports/commit/2026e1259422d4e0cf92391ca2d3844356c649d0
EXTRA_CFLAGS="-DTHREAD_STACK_SIZE=0x100000"; \
- LDFLAGS="-Wl,--strip-all"; \
+ LDFLAGS="${LDFLAGS:--Wl},--strip-all"; \
# setting PROFILE_TASK makes "--enable-optimizations" reasonable: https://bugs.python.org/issue36044 / https://github.com/docker-library/python/issues/160#issuecomment-509426916
PROFILE_TASK='-m test.regrtest --pgo \
test_array \
diff --git a/python_3.7-alpine3.16/Dockerfile b/python_3.7-alpine3.16/Dockerfile
index 72468bb..4ee525d 100644
--- a/python_3.7-alpine3.16/Dockerfile
+++ b/python_3.7-alpine3.16/Dockerfile
@@ -82,7 +82,7 @@ RUN set -eux; \
# set thread stack size to 1MB so we don't segfault before we hit sys.getrecursionlimit()
# https://github.com/alpinelinux/aports/commit/2026e1259422d4e0cf92391ca2d3844356c649d0
EXTRA_CFLAGS="-DTHREAD_STACK_SIZE=0x100000"; \
- LDFLAGS="-Wl,--strip-all"; \
+ LDFLAGS="${LDFLAGS:--Wl},--strip-all"; \
# setting PROFILE_TASK makes "--enable-optimizations" reasonable: https://bugs.python.org/issue36044 / https://github.com/docker-library/python/issues/160#issuecomment-509426916
PROFILE_TASK='-m test.regrtest --pgo \
test_array \
diff --git a/python_3.7-bullseye/Dockerfile b/python_3.7-bullseye/Dockerfile
index 69f4a9e..4e5858c 100644
--- a/python_3.7-bullseye/Dockerfile
+++ b/python_3.7-bullseye/Dockerfile
@@ -51,6 +51,8 @@ RUN set -eux; \
--without-ensurepip \
; \
nproc="$(nproc)"; \
+ EXTRA_CFLAGS="$(dpkg-buildflags --get CFLAGS)"; \
+ LDFLAGS="$(dpkg-buildflags --get LDFLAGS)"; \
# setting PROFILE_TASK makes "--enable-optimizations" reasonable: https://bugs.python.org/issue36044 / https://github.com/docker-library/python/issues/160#issuecomment-509426916
PROFILE_TASK='-m test.regrtest --pgo \
test_array \
diff --git a/python_3.7-buster/Dockerfile b/python_3.7-buster/Dockerfile
index 6d37031..763550c 100644
--- a/python_3.7-buster/Dockerfile
+++ b/python_3.7-buster/Dockerfile
@@ -51,6 +51,8 @@ RUN set -eux; \
--without-ensurepip \
; \
nproc="$(nproc)"; \
+ EXTRA_CFLAGS="$(dpkg-buildflags --get CFLAGS)"; \
+ LDFLAGS="$(dpkg-buildflags --get LDFLAGS)"; \
# setting PROFILE_TASK makes "--enable-optimizations" reasonable: https://bugs.python.org/issue36044 / https://github.com/docker-library/python/issues/160#issuecomment-509426916
PROFILE_TASK='-m test.regrtest --pgo \
test_array \
diff --git a/python_3.7-slim-buster/Dockerfile b/python_3.7-slim-buster/Dockerfile
index 63a321d..0820e20 100644
--- a/python_3.7-slim-buster/Dockerfile
+++ b/python_3.7-slim-buster/Dockerfile
@@ -76,7 +76,9 @@ RUN set -eux; \
--without-ensurepip \
; \
nproc="$(nproc)"; \
- LDFLAGS="-Wl,--strip-all"; \
+ EXTRA_CFLAGS="$(dpkg-buildflags --get CFLAGS)"; \
+ LDFLAGS="$(dpkg-buildflags --get LDFLAGS)"; \
+ LDFLAGS="${LDFLAGS:--Wl},--strip-all"; \
# setting PROFILE_TASK makes "--enable-optimizations" reasonable: https://bugs.python.org/issue36044 / https://github.com/docker-library/python/issues/160#issuecomment-509426916
PROFILE_TASK='-m test.regrtest --pgo \
test_array \
diff --git a/python_3.7-slim/Dockerfile b/python_3.7-slim/Dockerfile
index a7cae63..a4de441 100644
--- a/python_3.7-slim/Dockerfile
+++ b/python_3.7-slim/Dockerfile
@@ -76,7 +76,9 @@ RUN set -eux; \
--without-ensurepip \
; \
nproc="$(nproc)"; \
- LDFLAGS="-Wl,--strip-all"; \
+ EXTRA_CFLAGS="$(dpkg-buildflags --get CFLAGS)"; \
+ LDFLAGS="$(dpkg-buildflags --get LDFLAGS)"; \
+ LDFLAGS="${LDFLAGS:--Wl},--strip-all"; \
# setting PROFILE_TASK makes "--enable-optimizations" reasonable: https://bugs.python.org/issue36044 / https://github.com/docker-library/python/issues/160#issuecomment-509426916
PROFILE_TASK='-m test.regrtest --pgo \
test_array \
diff --git a/python_3.8-alpine/Dockerfile b/python_3.8-alpine/Dockerfile
index 31a6076..e781b9c 100644
--- a/python_3.8-alpine/Dockerfile
+++ b/python_3.8-alpine/Dockerfile
@@ -82,7 +82,7 @@ RUN set -eux; \
# set thread stack size to 1MB so we don't segfault before we hit sys.getrecursionlimit()
# https://github.com/alpinelinux/aports/commit/2026e1259422d4e0cf92391ca2d3844356c649d0
EXTRA_CFLAGS="-DTHREAD_STACK_SIZE=0x100000"; \
- LDFLAGS="-Wl,--strip-all"; \
+ LDFLAGS="${LDFLAGS:--Wl},--strip-all"; \
make -j "$nproc" \
"EXTRA_CFLAGS=${EXTRA_CFLAGS:-}" \
"LDFLAGS=${LDFLAGS:-}" \
diff --git a/python_3.8-alpine3.16/Dockerfile b/python_3.8-alpine3.16/Dockerfile
index 7dd14c3..f1a93dc 100644
--- a/python_3.8-alpine3.16/Dockerfile
+++ b/python_3.8-alpine3.16/Dockerfile
@@ -82,7 +82,7 @@ RUN set -eux; \
# set thread stack size to 1MB so we don't segfault before we hit sys.getrecursionlimit()
# https://github.com/alpinelinux/aports/commit/2026e1259422d4e0cf92391ca2d3844356c649d0
EXTRA_CFLAGS="-DTHREAD_STACK_SIZE=0x100000"; \
- LDFLAGS="-Wl,--strip-all"; \
+ LDFLAGS="${LDFLAGS:--Wl},--strip-all"; \
make -j "$nproc" \
"EXTRA_CFLAGS=${EXTRA_CFLAGS:-}" \
"LDFLAGS=${LDFLAGS:-}" \
diff --git a/python_3.8-bullseye/Dockerfile b/python_3.8-bullseye/Dockerfile
index 98df29f..df12f23 100644
--- a/python_3.8-bullseye/Dockerfile
+++ b/python_3.8-bullseye/Dockerfile
@@ -51,6 +51,8 @@ RUN set -eux; \
--without-ensurepip \
; \
nproc="$(nproc)"; \
+ EXTRA_CFLAGS="$(dpkg-buildflags --get CFLAGS)"; \
+ LDFLAGS="$(dpkg-buildflags --get LDFLAGS)"; \
make -j "$nproc" \
"EXTRA_CFLAGS=${EXTRA_CFLAGS:-}" \
"LDFLAGS=${LDFLAGS:-}" \
diff --git a/python_3.8-buster/Dockerfile b/python_3.8-buster/Dockerfile
index 3d08597..43862d2 100644
--- a/python_3.8-buster/Dockerfile
+++ b/python_3.8-buster/Dockerfile
@@ -51,6 +51,8 @@ RUN set -eux; \
--without-ensurepip \
; \
nproc="$(nproc)"; \
+ EXTRA_CFLAGS="$(dpkg-buildflags --get CFLAGS)"; \
+ LDFLAGS="$(dpkg-buildflags --get LDFLAGS)"; \
make -j "$nproc" \
"EXTRA_CFLAGS=${EXTRA_CFLAGS:-}" \
"LDFLAGS=${LDFLAGS:-}" \
diff --git a/python_3.8-slim-buster/Dockerfile b/python_3.8-slim-buster/Dockerfile
index 95179eb..052746e 100644
--- a/python_3.8-slim-buster/Dockerfile
+++ b/python_3.8-slim-buster/Dockerfile
@@ -76,7 +76,9 @@ RUN set -eux; \
--without-ensurepip \
; \
nproc="$(nproc)"; \
- LDFLAGS="-Wl,--strip-all"; \
+ EXTRA_CFLAGS="$(dpkg-buildflags --get CFLAGS)"; \
+ LDFLAGS="$(dpkg-buildflags --get LDFLAGS)"; \
+ LDFLAGS="${LDFLAGS:--Wl},--strip-all"; \
make -j "$nproc" \
"EXTRA_CFLAGS=${EXTRA_CFLAGS:-}" \
"LDFLAGS=${LDFLAGS:-}" \
diff --git a/python_3.8-slim/Dockerfile b/python_3.8-slim/Dockerfile
index f7185a5..df183b7 100644
--- a/python_3.8-slim/Dockerfile
+++ b/python_3.8-slim/Dockerfile
@@ -76,7 +76,9 @@ RUN set -eux; \
--without-ensurepip \
; \
nproc="$(nproc)"; \
- LDFLAGS="-Wl,--strip-all"; \
+ EXTRA_CFLAGS="$(dpkg-buildflags --get CFLAGS)"; \
+ LDFLAGS="$(dpkg-buildflags --get LDFLAGS)"; \
+ LDFLAGS="${LDFLAGS:--Wl},--strip-all"; \
make -j "$nproc" \
"EXTRA_CFLAGS=${EXTRA_CFLAGS:-}" \
"LDFLAGS=${LDFLAGS:-}" \
diff --git a/python_3.9-alpine/Dockerfile b/python_3.9-alpine/Dockerfile
index 1f65814..579feff 100644
--- a/python_3.9-alpine/Dockerfile
+++ b/python_3.9-alpine/Dockerfile
@@ -82,7 +82,7 @@ RUN set -eux; \
# set thread stack size to 1MB so we don't segfault before we hit sys.getrecursionlimit()
# https://github.com/alpinelinux/aports/commit/2026e1259422d4e0cf92391ca2d3844356c649d0
EXTRA_CFLAGS="-DTHREAD_STACK_SIZE=0x100000"; \
- LDFLAGS="-Wl,--strip-all"; \
+ LDFLAGS="${LDFLAGS:--Wl},--strip-all"; \
make -j "$nproc" \
"EXTRA_CFLAGS=${EXTRA_CFLAGS:-}" \
"LDFLAGS=${LDFLAGS:-}" \
diff --git a/python_3.9-alpine3.16/Dockerfile b/python_3.9-alpine3.16/Dockerfile
index 9e0fe74..8023933 100644
--- a/python_3.9-alpine3.16/Dockerfile
+++ b/python_3.9-alpine3.16/Dockerfile
@@ -82,7 +82,7 @@ RUN set -eux; \
# set thread stack size to 1MB so we don't segfault before we hit sys.getrecursionlimit()
# https://github.com/alpinelinux/aports/commit/2026e1259422d4e0cf92391ca2d3844356c649d0
EXTRA_CFLAGS="-DTHREAD_STACK_SIZE=0x100000"; \
- LDFLAGS="-Wl,--strip-all"; \
+ LDFLAGS="${LDFLAGS:--Wl},--strip-all"; \
make -j "$nproc" \
"EXTRA_CFLAGS=${EXTRA_CFLAGS:-}" \
"LDFLAGS=${LDFLAGS:-}" \
diff --git a/python_3.9-bullseye/Dockerfile b/python_3.9-bullseye/Dockerfile
index 81e53aa..caff7fd 100644
--- a/python_3.9-bullseye/Dockerfile
+++ b/python_3.9-bullseye/Dockerfile
@@ -51,6 +51,8 @@ RUN set -eux; \
--without-ensurepip \
; \
nproc="$(nproc)"; \
+ EXTRA_CFLAGS="$(dpkg-buildflags --get CFLAGS)"; \
+ LDFLAGS="$(dpkg-buildflags --get LDFLAGS)"; \
make -j "$nproc" \
"EXTRA_CFLAGS=${EXTRA_CFLAGS:-}" \
"LDFLAGS=${LDFLAGS:-}" \
diff --git a/python_3.9-buster/Dockerfile b/python_3.9-buster/Dockerfile
index e5c6d6e..3df43cb 100644
--- a/python_3.9-buster/Dockerfile
+++ b/python_3.9-buster/Dockerfile
@@ -51,6 +51,8 @@ RUN set -eux; \
--without-ensurepip \
; \
nproc="$(nproc)"; \
+ EXTRA_CFLAGS="$(dpkg-buildflags --get CFLAGS)"; \
+ LDFLAGS="$(dpkg-buildflags --get LDFLAGS)"; \
make -j "$nproc" \
"EXTRA_CFLAGS=${EXTRA_CFLAGS:-}" \
"LDFLAGS=${LDFLAGS:-}" \
diff --git a/python_3.9-slim-buster/Dockerfile b/python_3.9-slim-buster/Dockerfile
index be3fe8b..2e6bfbb 100644
--- a/python_3.9-slim-buster/Dockerfile
+++ b/python_3.9-slim-buster/Dockerfile
@@ -76,7 +76,9 @@ RUN set -eux; \
--without-ensurepip \
; \
nproc="$(nproc)"; \
- LDFLAGS="-Wl,--strip-all"; \
+ EXTRA_CFLAGS="$(dpkg-buildflags --get CFLAGS)"; \
+ LDFLAGS="$(dpkg-buildflags --get LDFLAGS)"; \
+ LDFLAGS="${LDFLAGS:--Wl},--strip-all"; \
make -j "$nproc" \
"EXTRA_CFLAGS=${EXTRA_CFLAGS:-}" \
"LDFLAGS=${LDFLAGS:-}" \
diff --git a/python_3.9-slim/Dockerfile b/python_3.9-slim/Dockerfile
index a2fe1dd..1239c88 100644
--- a/python_3.9-slim/Dockerfile
+++ b/python_3.9-slim/Dockerfile
@@ -76,7 +76,9 @@ RUN set -eux; \
--without-ensurepip \
; \
nproc="$(nproc)"; \
- LDFLAGS="-Wl,--strip-all"; \
+ EXTRA_CFLAGS="$(dpkg-buildflags --get CFLAGS)"; \
+ LDFLAGS="$(dpkg-buildflags --get LDFLAGS)"; \
+ LDFLAGS="${LDFLAGS:--Wl},--strip-all"; \
make -j "$nproc" \
"EXTRA_CFLAGS=${EXTRA_CFLAGS:-}" \
"LDFLAGS=${LDFLAGS:-}" \
diff --git a/python_alpine/Dockerfile b/python_alpine/Dockerfile
index ed78032..40f3616 100644
--- a/python_alpine/Dockerfile
+++ b/python_alpine/Dockerfile
@@ -83,7 +83,7 @@ RUN set -eux; \
# set thread stack size to 1MB so we don't segfault before we hit sys.getrecursionlimit()
# https://github.com/alpinelinux/aports/commit/2026e1259422d4e0cf92391ca2d3844356c649d0
EXTRA_CFLAGS="-DTHREAD_STACK_SIZE=0x100000"; \
- LDFLAGS="-Wl,--strip-all"; \
+ LDFLAGS="${LDFLAGS:--Wl},--strip-all"; \
make -j "$nproc" \
"EXTRA_CFLAGS=${EXTRA_CFLAGS:-}" \
"LDFLAGS=${LDFLAGS:-}" \
diff --git a/python_alpine3.16/Dockerfile b/python_alpine3.16/Dockerfile
index 3813222..22125b1 100644
--- a/python_alpine3.16/Dockerfile
+++ b/python_alpine3.16/Dockerfile
@@ -83,7 +83,7 @@ RUN set -eux; \
# set thread stack size to 1MB so we don't segfault before we hit sys.getrecursionlimit()
# https://github.com/alpinelinux/aports/commit/2026e1259422d4e0cf92391ca2d3844356c649d0
EXTRA_CFLAGS="-DTHREAD_STACK_SIZE=0x100000"; \
- LDFLAGS="-Wl,--strip-all"; \
+ LDFLAGS="${LDFLAGS:--Wl},--strip-all"; \
make -j "$nproc" \
"EXTRA_CFLAGS=${EXTRA_CFLAGS:-}" \
"LDFLAGS=${LDFLAGS:-}" \
diff --git a/python_bullseye/Dockerfile b/python_bullseye/Dockerfile
index e08bd1b..8ecdc37 100644
--- a/python_bullseye/Dockerfile
+++ b/python_bullseye/Dockerfile
@@ -52,6 +52,8 @@ RUN set -eux; \
--without-ensurepip \
; \
nproc="$(nproc)"; \
+ EXTRA_CFLAGS="$(dpkg-buildflags --get CFLAGS)"; \
+ LDFLAGS="$(dpkg-buildflags --get LDFLAGS)"; \
make -j "$nproc" \
"EXTRA_CFLAGS=${EXTRA_CFLAGS:-}" \
"LDFLAGS=${LDFLAGS:-}" \
diff --git a/python_buster/Dockerfile b/python_buster/Dockerfile
index fd704f8..98fc6cf 100644
--- a/python_buster/Dockerfile
+++ b/python_buster/Dockerfile
@@ -52,6 +52,8 @@ RUN set -eux; \
--without-ensurepip \
; \
nproc="$(nproc)"; \
+ EXTRA_CFLAGS="$(dpkg-buildflags --get CFLAGS)"; \
+ LDFLAGS="$(dpkg-buildflags --get LDFLAGS)"; \
make -j "$nproc" \
"EXTRA_CFLAGS=${EXTRA_CFLAGS:-}" \
"LDFLAGS=${LDFLAGS:-}" \
diff --git a/python_slim-buster/Dockerfile b/python_slim-buster/Dockerfile
index 1a28336..9e55e16 100644
--- a/python_slim-buster/Dockerfile
+++ b/python_slim-buster/Dockerfile
@@ -77,7 +77,9 @@ RUN set -eux; \
--without-ensurepip \
; \
nproc="$(nproc)"; \
- LDFLAGS="-Wl,--strip-all"; \
+ EXTRA_CFLAGS="$(dpkg-buildflags --get CFLAGS)"; \
+ LDFLAGS="$(dpkg-buildflags --get LDFLAGS)"; \
+ LDFLAGS="${LDFLAGS:--Wl},--strip-all"; \
make -j "$nproc" \
"EXTRA_CFLAGS=${EXTRA_CFLAGS:-}" \
"LDFLAGS=${LDFLAGS:-}" \
diff --git a/python_slim/Dockerfile b/python_slim/Dockerfile
index ac109db..b80ff80 100644
--- a/python_slim/Dockerfile
+++ b/python_slim/Dockerfile
@@ -77,7 +77,9 @@ RUN set -eux; \
--without-ensurepip \
; \
nproc="$(nproc)"; \
- LDFLAGS="-Wl,--strip-all"; \
+ EXTRA_CFLAGS="$(dpkg-buildflags --get CFLAGS)"; \
+ LDFLAGS="$(dpkg-buildflags --get LDFLAGS)"; \
+ LDFLAGS="${LDFLAGS:--Wl},--strip-all"; \
make -j "$nproc" \
"EXTRA_CFLAGS=${EXTRA_CFLAGS:-}" \
"LDFLAGS=${LDFLAGS:-}" \Relevant Maintainers: |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Changes:
dpkg-buildflagspython#811 from infosiftr/dpkg-buildflagsdpkg-buildflags