dcarrillo/docker-nginx
1
0
Fork 0
mirror of https://github.com/dcarrillo/docker-nginx.git synced 2025-10-30 16:29:09 +00:00
Code Issues Releases Wiki Activity

Merge pull request #3 from dcarrillo/1.17.7

Browse Source 
1.17.7
This commit is contained in:
Daniel Carrillo
2019-12-24 17:25:02 +01:00
committed by GitHub
parent b9f3f51de0 6e43b5c7a8
commit 8b86bde182
4 changed files with 5 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
Dockerfile
View File

@@ -1,4 +1,4 @@
FROM alpine:3.10 FROM alpine:3.11
ARG ARG_NGINX_VERSION ARG ARG_NGINX_VERSION
ARG ARG_NGX_GEOIP2_VERSION ARG ARG_NGX_GEOIP2_VERSION

2
build.sh
View File

@@ -30,5 +30,5 @@ fi
if [ x$LATEST = "xtrue" ]; then if [ x$LATEST = "xtrue" ]; then
docker tag "$DOCKER_IMAGE":"$NGINX_VERSION" "$DOCKER_IMAGE":latest docker tag "$DOCKER_IMAGE":"$NGINX_VERSION" "$DOCKER_IMAGE":latest
docker push "$DOCKER_IMAGE":latest [ x$PUSH = "xtrue" ] && docker push "$DOCKER_IMAGE":latest
fi fi

2
conf.env
View File

@@ -1,3 +1,3 @@
NGINX_VERSION=1.17.6 NGINX_VERSION=1.17.7
NGX_GEOIP2_VERSION=3.3 NGX_GEOIP2_VERSION=3.3
DOCKER_IMAGE=dcarrillo/nginx DOCKER_IMAGE=dcarrillo/nginx

6
tests/test.sh
View File

@@ -9,9 +9,7 @@ fi
trap _catch_err ERR trap _catch_err ERR
trap _cleanup EXIT 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 . "$LOCAL_DIR"/../conf.env
TMP_DIR=$(mktemp -d) 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.pem:/tmp/cert.pem:ro \
-v "$TMP_DIR"/cert.key:/tmp/cert.key:ro \ -v "$TMP_DIR"/cert.key:/tmp/cert.key:ro \
-v "$TMP_DIR"/dhparams.pem:/tmp/dhparams.pem: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 for request in http://localhost:65521/nginx_status https://localhost:65523/nginx_status; do
printf "\nRequesting %s\n" $request printf "\nRequesting %s\n" $request