Merge pull request #314 from JrCs/dev

Merge dev into master
nginx-proxy · Jan 1, 2018 · e6db45e · e6db45e
2 parents 75137c6 + d27d4cf
commit e6db45e
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/Dockerfile b/Dockerfile
@@ -1,4 +1,4 @@
-FROM alpine:3.6
+FROM alpine:3.7
 
 LABEL maintainer="Yves Blusseau <[email protected]> (@blusseau)"
 

diff --git a/app/start.sh b/app/start.sh
@@ -8,7 +8,7 @@ term_handler() {
     source /app/functions.sh
     remove_all_location_configurations
 
-    exit 143; # 128 + 15 -- SIGTERM
+    exit 0
 }
 
 trap 'term_handler' INT QUIT TERM