From 912a0654069097cc725eca74f7bae85df0e9c920 Mon Sep 17 00:00:00 2001 From: Richard Hansen Date: Sat, 28 Jan 2023 18:14:59 -0500 Subject: [PATCH] chore: Pass `--pull` to `docker build` to get fresh images This is a no-op if the images are already up to date, and it prevents puzzling problems when the images are old. --- Makefile | 6 +++--- test/pytest.sh | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/Makefile b/Makefile index ab44880..5e53e36 100644 --- a/Makefile +++ b/Makefile @@ -3,13 +3,13 @@ build-webserver: - docker build -t web test/requirements/web + docker build --pull -t web test/requirements/web build-nginx-proxy-test-debian: - docker build --build-arg NGINX_PROXY_VERSION="test" -t nginxproxy/nginx-proxy:test . + docker build --pull --build-arg NGINX_PROXY_VERSION="test" -t nginxproxy/nginx-proxy:test . build-nginx-proxy-test-alpine: - docker build --build-arg NGINX_PROXY_VERSION="test" -f Dockerfile.alpine -t nginxproxy/nginx-proxy:test . + docker build --pull --build-arg NGINX_PROXY_VERSION="test" -f Dockerfile.alpine -t nginxproxy/nginx-proxy:test . test-debian: build-webserver build-nginx-proxy-test-debian test/pytest.sh diff --git a/test/pytest.sh b/test/pytest.sh index 9088d10..19a8188 100755 --- a/test/pytest.sh +++ b/test/pytest.sh @@ -14,7 +14,7 @@ DIR=$(cd "${TESTDIR}/.." && pwd) || exit 1 # check requirements echo "> Building nginx-proxy-tester image..." -docker build -t nginx-proxy-tester \ +docker build --pull -t nginx-proxy-tester \ -f "${TESTDIR}/requirements/Dockerfile-nginx-proxy-tester" \ "${TESTDIR}/requirements" \ || exit 1