aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJulien Dessaux2022-11-03 08:41:47 +0100
committerJulien Dessaux2022-11-03 08:42:43 +0100
commitb7ac2084d349de4b2377cbdaf7fa5489e79c4bc6 (patch)
treedbaa712ae3950f06566027f68d91338f6455d2d3
parentAdded grenade-brothers scripts and jobs (diff)
downloadev-scripts-b7ac2084d349de4b2377cbdaf7fa5489e79c4bc6.tar.gz
ev-scripts-b7ac2084d349de4b2377cbdaf7fa5489e79c4bc6.tar.bz2
ev-scripts-b7ac2084d349de4b2377cbdaf7fa5489e79c4bc6.zip
Fix image building errors when podman is running pods
-rwxr-xr-xgrenade-brothers/build-image.sh2
-rwxr-xr-xwww/build-images.sh2
2 files changed, 2 insertions, 2 deletions
diff --git a/grenade-brothers/build-image.sh b/grenade-brothers/build-image.sh
index a5398a6..090e33d 100755
--- a/grenade-brothers/build-image.sh
+++ b/grenade-brothers/build-image.sh
@@ -11,7 +11,7 @@ trap cleanup EXIT
ret=0; buildah images adyxax/alpine &>/dev/null || ret=$?
if [[ "${ret}" != 0 ]]; then
- buildah rmi --all
+ buildah rmi --all || true
ALPINE_LATEST=$(curl --silent https://dl-cdn.alpinelinux.org/alpine/latest-stable/releases/x86_64/ |
perl -lane '$latest = $1 if $_ =~ /^<a href="(alpine-minirootfs-\d+\.\d+\.\d+-x86_64\.tar\.gz)">/; END {print $latest}'
)
diff --git a/www/build-images.sh b/www/build-images.sh
index d306572..903ecad 100755
--- a/www/build-images.sh
+++ b/www/build-images.sh
@@ -11,7 +11,7 @@ trap cleanup EXIT
ret=0; buildah images adyxax/alpine &>/dev/null || ret=$?
if [[ "${ret}" != 0 ]]; then
- buildah rmi --all
+ buildah rmi --all || true
ALPINE_LATEST=$(curl --silent https://dl-cdn.alpinelinux.org/alpine/latest-stable/releases/x86_64/ |
perl -lane '$latest = $1 if $_ =~ /^<a href="(alpine-minirootfs-\d+\.\d+\.\d+-x86_64\.tar\.gz)">/; END {print $latest}'
)