Skip to content

Commit d90eea9

Browse files
committed
Merge bitcoin/bitcoin#28708: ci: Add missing --external to podman image prune
fa65887 ci: Add missing --external to podman image prune (MarcoFalke) Pull request description: This should fix the out-of-space issues seen in CI. For example: https://cirrus-ci.com/task/6208410429947904?logs=ci#L8613 ``` Error: committing container for step {Env:[FILE_ENV=./ci/test/00_setup_env_native_msan.sh PATH=/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin] Command:run Args:[bash -c cd /ci_container_base/ && set -o errexit && source ./ci/test/00_setup_env.sh && ./ci/test/01_base_install.sh] Flags:[] Attrs:map[json:true] Message:RUN bash -c cd /ci_container_base/ && set -o errexit && source ./ci/test/00_setup_env.sh && ./ci/test/01_base_install.sh Original:RUN ["bash", "-c", "cd /ci_container_base/ && set -o errexit && source ./ci/test/00_setup_env.sh && ./ci/test/01_base_install.sh"]}: copying layers and metadata for container "8d882455cc157be6a85d9779b45cacf4dd92a37cfb16fad38213f758a830827d": writing blob: adding layer with blob "sha256:371f657e226fef20f4af6fb88a288dd6248c82c2088daca2d53aaacb51b4303a": processing tar file(write /usr/lib/x86_64-linux-gnu/perl/5.34.0/auto/Unicode/Collate/Collate.so: no space left on device): exit status 1 ACKs for top commit: stickies-v: utACK fa65887 Tree-SHA512: a949b957654272b9c9450feebb64397542029019f031a18444b5b403aca899c972b3b163be716bf1bfbd5820430c70a6fec008771c6e13d3d8281ed100df575b
2 parents 565c551 + fa65887 commit d90eea9

File tree

1 file changed

+4
-1
lines changed

1 file changed

+4
-1
lines changed

ci/test/02_run_container.sh

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,10 +35,13 @@ if [ -z "$DANGER_RUN_CI_ON_HOST" ]; then
3535

3636
# Still prune everything in case the filtered pruning doesn't work, or if labels were not set
3737
# on a previous run. Belt and suspenders approach, should be fine to remove in the future.
38+
# Prune images used by --external containers (e.g. build containers) when
39+
# using podman.
3840
echo "Prune all dangling images"
39-
docker image prune --force
41+
podman image prune --force --external
4042
fi
4143
echo "Prune all dangling $CI_IMAGE_LABEL images"
44+
# When detecting podman-docker, `--external` should be added.
4245
docker image prune --force --filter "label=$CI_IMAGE_LABEL"
4346

4447
# shellcheck disable=SC2086

0 commit comments

Comments
 (0)