fix(entrypoint): stop handling

Fix improper Docker stop handling
strapi · Mar 5, 2018 · 7fb72fc · 7fb72fc
2 parents ce4e800 + b0b96ad
commit 7fb72fc
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 2 deletions.
diff --git a/Dockerfile b/Dockerfile
@@ -18,4 +18,4 @@ RUN chmod +x ./strapi.sh
 
 EXPOSE 1337
 
-CMD ./strapi.sh
+CMD ["./strapi.sh"]
diff --git a/strapi.sh b/strapi.sh
@@ -1,6 +1,14 @@
 #!/bin/sh
 set -ea
 
+_stopStrapi() {
+  echo "Stopping strapi"
+  kill -SIGINT "$strapiPID"
+  wait "$strapiPID"
+}
+
+trap _stopStrapi SIGTERM SIGINT
+
 cd /usr/src/api
 
 APP_NAME=${APP_NAME:-strapi-app}
@@ -15,4 +23,7 @@ then
 fi
 
 cd $APP_NAME
-strapi start
+strapi start &
+
+strapiPID=$!
+wait "$strapiPID"
Original file line number	Diff line number	Diff line change
Expand Up		@@ -18,4 +18,4 @@ RUN chmod +x ./strapi.sh

		EXPOSE 1337

		CMD ./strapi.sh
		CMD ["./strapi.sh"]