From ec2f8aea0da803dc31f2419f2ceb4827a863dc38 Mon Sep 17 00:00:00 2001
From: dcarrillo <daniel.carrillo@gmail.com>
Date: Tue, 24 Dec 2019 17:19:08 +0100
Subject: [PATCH 1/4] Remove duplicated variable declaration

---
 build.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

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

From 82d27eacb1d19a6a31306d8ef91d05c1a609a786 Mon Sep 17 00:00:00 2001
From: dcarrillo <daniel.carrillo@gmail.com>
Date: Tue, 24 Dec 2019 17:19:57 +0100
Subject: [PATCH 2/4] Improve output readability

---
 tests/test.sh | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

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

From a7161c9f55c292207ba7516d3875ecd4db3de35a Mon Sep 17 00:00:00 2001
From: dcarrillo <daniel.carrillo@gmail.com>
Date: Tue, 24 Dec 2019 17:22:07 +0100
Subject: [PATCH 3/4] Update alpine base image to 3.11

---
 Dockerfile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

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

From 6e43b5c7a8309641aa0aa0991230a85308997dc1 Mon Sep 17 00:00:00 2001
From: dcarrillo <daniel.carrillo@gmail.com>
Date: Tue, 24 Dec 2019 17:22:25 +0100
Subject: [PATCH 4/4] Bump nginx version to 1.17.7

---
 conf.env | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

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