Merge pull request metabase#2071 from mvertes/master

docker entrypoint shell scripts: use exec to allow graceful docker stop
sturgill · Mar 2, 2016 · a3de989 · a3de989
2 parents 60a0ba8 + a5469a6
commit a3de989
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/bin/docker/run_metabase.sh b/bin/docker/run_metabase.sh
@@ -26,4 +26,4 @@ fi
 
 
 # Launch the application
-java -Dlogfile.path=target/log -XX:+CMSClassUnloadingEnabled -XX:+UseConcMarkSweepGC -jar /app/metabase.jar
+exec java -Dlogfile.path=target/log -XX:+CMSClassUnloadingEnabled -XX:+UseConcMarkSweepGC -jar /app/metabase.jar
diff --git a/deploy/aws-eb-docker/run_metabase.sh b/deploy/aws-eb-docker/run_metabase.sh
@@ -16,4 +16,4 @@ export MB_DB_PORT=$RDS_PORT
 # TODO: dynamically determine type, probably using the port number
 export MB_DB_TYPE=postgres
 
-java -Dlogfile.path=target/log -XX:+CMSClassUnloadingEnabled -XX:+UseConcMarkSweepGC -jar /app/metabase.jar
+exec java -Dlogfile.path=target/log -XX:+CMSClassUnloadingEnabled -XX:+UseConcMarkSweepGC -jar /app/metabase.jar
Original file line number	Diff line number	Diff line change
Expand Up		@@ -26,4 +26,4 @@ fi


		# Launch the application
		java -Dlogfile.path=target/log -XX:+CMSClassUnloadingEnabled -XX:+UseConcMarkSweepGC -jar /app/metabase.jar
		exec java -Dlogfile.path=target/log -XX:+CMSClassUnloadingEnabled -XX:+UseConcMarkSweepGC -jar /app/metabase.jar