From 03df60db5fe55ede3bc1ea6e9b60c74ae08a3666 Mon Sep 17 00:00:00 2001 From: Alex Pyrgiotis Date: Wed, 2 Aug 2023 13:47:59 +0300 Subject: [PATCH] Always pull base image when building ours Always pull the base container image (alpine:latest) before building our own container image. Else, in an environments that we haven't touched for a while, an older image may be used. --- install/linux/build-image.sh | 2 +- install/macos/build-image.sh | 2 +- install/windows/build-image.py | 1 + 3 files changed, 3 insertions(+), 2 deletions(-) diff --git a/install/linux/build-image.sh b/install/linux/build-image.sh index ad573c7..8470ebb 100755 --- a/install/linux/build-image.sh +++ b/install/linux/build-image.sh @@ -5,7 +5,7 @@ set -e TAG=dangerzone.rocks/dangerzone:latest echo "Building container image" -podman build dangerzone/ -f Dockerfile --tag $TAG +podman build --pull dangerzone/ -f Dockerfile --tag $TAG echo "Saving and compressing container image" podman save $TAG | gzip > share/container.tar.gz diff --git a/install/macos/build-image.sh b/install/macos/build-image.sh index eafb1c6..29e462b 100755 --- a/install/macos/build-image.sh +++ b/install/macos/build-image.sh @@ -5,7 +5,7 @@ set -e TAG=dangerzone.rocks/dangerzone:latest echo "Building container image" -docker build dangerzone/ -f Dockerfile --tag $TAG +docker build --pull dangerzone/ -f Dockerfile --tag $TAG echo "Saving and compressing container image" docker save $TAG | gzip > share/container.tar.gz diff --git a/install/windows/build-image.py b/install/windows/build-image.py index 23fd2d5..92c2581 100644 --- a/install/windows/build-image.py +++ b/install/windows/build-image.py @@ -9,6 +9,7 @@ def main(): [ "docker", "build", + "--pull", "dangerzone/", "-f", "Dockerfile",