Skip to content

Commit

Permalink
Merge pull request #2155 from rhansen/docker-pull
Browse files Browse the repository at this point in the history
chore: Pass `--pull` to `docker build` to get fresh images
  • Loading branch information
buchdag committed Jan 30, 2023
2 parents 926bd43 + 912a065 commit 8ac8b02
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 4 deletions.
6 changes: 3 additions & 3 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion test/pytest.sh
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down

0 comments on commit 8ac8b02

Please sign in to comment.