diff --git a/Dockerfile b/Dockerfile index 76ced13..4c4bfcb 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,4 +1,4 @@ -FROM alpine:3.10 +FROM alpine:3.11 ARG ARG_NGINX_VERSION ARG ARG_NGX_GEOIP2_VERSION diff --git a/build.sh b/build.sh index da4eb4d..ed29c0e 100755 --- a/build.sh +++ b/build.sh @@ -30,5 +30,5 @@ fi if [ x$LATEST = "xtrue" ]; then docker tag "$DOCKER_IMAGE":"$NGINX_VERSION" "$DOCKER_IMAGE":latest - docker push "$DOCKER_IMAGE":latest + [ x$PUSH = "xtrue" ] && docker push "$DOCKER_IMAGE":latest fi diff --git a/conf.env b/conf.env index d321a11..acd9ad8 100644 --- a/conf.env +++ b/conf.env @@ -1,3 +1,3 @@ -NGINX_VERSION=1.17.6 +NGINX_VERSION=1.17.7 NGX_GEOIP2_VERSION=3.3 DOCKER_IMAGE=dcarrillo/nginx diff --git a/tests/test.sh b/tests/test.sh index 3207875..f77fb9f 100755 --- a/tests/test.sh +++ b/tests/test.sh @@ -9,9 +9,7 @@ fi trap _catch_err ERR trap _cleanup EXIT -LOCAL_DIR=$(dirname "$0") - -LOCAL_DIR="$( cd "$(dirname "$0")" ; pwd -P )" +LOCAL_DIR="$(cd "$(dirname "$0")" ; pwd -P)" . "$LOCAL_DIR"/../conf.env TMP_DIR=$(mktemp -d) @@ -65,7 +63,7 @@ docker run --name "${NGINX_VERSION}"_test --rm -p 65521:80 -p 65523:443 \ -v "$TMP_DIR"/cert.pem:/tmp/cert.pem:ro \ -v "$TMP_DIR"/cert.key:/tmp/cert.key:ro \ -v "$TMP_DIR"/dhparams.pem:/tmp/dhparams.pem:ro \ - -d "${DOCKER_IMAGE}":"${NGINX_VERSION}" + -d "${DOCKER_IMAGE}":"${NGINX_VERSION}" > /dev/null for request in http://localhost:65521/nginx_status https://localhost:65523/nginx_status; do printf "\nRequesting %s\n" $request