Merge pull request #314 from JrCs/dev

buchdag · web-flow · commit e6db45e24c06 · 2018-01-01T10:59:39.000+01:00
Merge dev into master
diff --git a/Dockerfile b/Dockerfile
@@ -1,4 +1,4 @@
-FROM alpine:3.6
+FROM alpine:3.7
 
 LABEL maintainer="Yves Blusseau <90z7oey02@sneakemail.com> (@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

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-FROM alpine:3.6`
	`1`	`+FROM alpine:3.7`
`2`	`2`
`3`	`3`	`LABEL maintainer="Yves Blusseau <[email protected]> (@blusseau)"`
`4`	`4`
Original file line number	Diff line number	Diff line change
`@@ -8,7 +8,7 @@ term_handler() {`
`8`	`8`	`source /app/functions.sh`
`9`	`9`	`remove_all_location_configurations`
`10`	`10`
`11`		`- exit 143; # 128 + 15 -- SIGTERM`
	`11`	`+ exit 0`
`12`	`12`	`}`
`13`	`13`
`14`	`14`	`trap 'term_handler' INT QUIT TERM`