Pārlūkot izejas kodu

Merge pull request #2155 from rhansen/docker-pull

chore: Pass `--pull` to `docker build` to get fresh images
Nicolas Duchon 2 gadi atpakaļ
vecāks
revīzija
8ac8b021b8
2 mainītis faili ar 4 papildinājumiem un 4 dzēšanām
  1. 3 3
      Makefile
  2. 1 1
      test/pytest.sh

+ 3 - 3
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

+ 1 - 1
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