Skip to content

Commit 0a9ee3e

Browse files
belltailjptianon
belltailjp
and
tianon
authored
Prevent removing unexpected .a files in case of re-using the Dockerfile to build custom image (#706)
* Prevent removing unexpected .a files when building Python on top of other images * Add a check in GitHub Actions for leftover ".a" files in "/usr/local" Co-authored-by: Tianon Gravi <admwiggin@gmail.com>
1 parent acf9b90 commit 0a9ee3e

File tree

32 files changed

+48
-31
lines changed

32 files changed

+48
-31
lines changed

‎.github/workflows/ci.yml‎

Lines changed: 17 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,23 @@ jobs:
2424
run: |
2525
git clone --depth 1 https://github.com/docker-library/bashbrew.git -b master ~/bashbrew
2626
strategy="$(~/bashbrew/scripts/github-actions/generate.sh)"
27+
28+
# https://github.com/docker-library/python/pull/706 (ensure we don't have any unexpected ".a" leftovers in "/usr/local")
29+
strategy="$(jq <<<"$strategy" -c '
30+
.matrix.include |= map(
31+
if .os == "ubuntu-latest" then
32+
.runs.test += "\n" + (
33+
.meta.entries
34+
| map(
35+
.tags[0]
36+
| "aFiles=\"$(docker run --rm \(. | @sh) find /usr/local -name \"*.a\" | tee /dev/stderr)\"; [ -z \"$aFiles\" ]"
37+
)
38+
| join("\n")
39+
)
40+
else . end
41+
)
42+
')"
43+
2744
jq . <<<"$strategy" # sanity check / debugging aid
2845
echo "::set-output name=strategy::$strategy"
2946

‎3.10/alpine3.14/Dockerfile‎

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎3.10/alpine3.15/Dockerfile‎

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎3.10/bullseye/Dockerfile‎

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎3.10/buster/Dockerfile‎

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎3.10/slim-bullseye/Dockerfile‎

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎3.10/slim-buster/Dockerfile‎

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎3.11-rc/alpine3.14/Dockerfile‎

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎3.11-rc/alpine3.15/Dockerfile‎

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎3.11-rc/bullseye/Dockerfile‎

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)