Make the JVM get pid 1 to allow graceful shutdown

Follows up on vert-x3/vertx-stack#54
markhu · Sep 28, 2016 · 32831b1 · 32831b1
1 parent 8353bef
commit 32831b1
Show file tree

Hide file tree

Showing 11 changed files with 11 additions and 11 deletions.
diff --git a/docker-examples/vertx-docker-example/src/main/docker/Dockerfile b/docker-examples/vertx-docker-example/src/main/docker/Dockerfile
@@ -19,5 +19,5 @@ COPY ./verticles $VERTICLE_HOME
 
 # We use the "sh -c" to turn around https://github.com/docker/docker/issues/5509 - variable not expanded
 ENTRYPOINT ["sh", "-c"]
-CMD ["vertx run $VERTICLE_NAME -cp $VERTICLE_HOME/* $VERTX_OPTIONS"]
+CMD ["exec vertx run $VERTICLE_NAME -cp $VERTICLE_HOME/* $VERTX_OPTIONS"]
 
diff --git a/docker-examples/vertx-docker-groovy/Dockerfile b/docker-examples/vertx-docker-groovy/Dockerfile
@@ -23,4 +23,4 @@ COPY $VERTICLE_NAME $VERTICLE_HOME/
 # Launch the verticle                       <5>
 WORKDIR $VERTICLE_HOME
 ENTRYPOINT ["sh", "-c"]
-CMD ["vertx run $VERTICLE_NAME -cp $VERTICLE_HOME/*"]
+CMD ["exec vertx run $VERTICLE_NAME -cp $VERTICLE_HOME/*"]
diff --git a/docker-examples/vertx-docker-java-fatjar/Dockerfile b/docker-examples/vertx-docker-java-fatjar/Dockerfile
@@ -21,4 +21,4 @@ COPY target/$VERTICLE_FILE $VERTICLE_HOME/
 # Launch the verticle
 WORKDIR $VERTICLE_HOME
 ENTRYPOINT ["sh", "-c"]
-CMD ["java -jar $VERTICLE_FILE"]
+CMD ["exec java -jar $VERTICLE_FILE"]
diff --git a/docker-examples/vertx-docker-java/Dockerfile b/docker-examples/vertx-docker-java/Dockerfile
@@ -23,4 +23,4 @@ COPY $VERTICLE_FILE $VERTICLE_HOME/
 # Launch the verticle
 WORKDIR $VERTICLE_HOME
 ENTRYPOINT ["sh", "-c"]
-CMD ["vertx run $VERTICLE_NAME -cp $VERTICLE_HOME/*"]
+CMD ["exec vertx run $VERTICLE_NAME -cp $VERTICLE_HOME/*"]
diff --git a/docker-examples/vertx-docker-javascript/Dockerfile b/docker-examples/vertx-docker-javascript/Dockerfile
@@ -23,4 +23,4 @@ COPY $VERTICLE_NAME $VERTICLE_HOME/
 # Launch the verticle                       <5>
 WORKDIR $VERTICLE_HOME
 ENTRYPOINT ["sh", "-c"]
-CMD ["vertx run $VERTICLE_NAME -cp $VERTICLE_HOME/*"]
+CMD ["exec vertx run $VERTICLE_NAME -cp $VERTICLE_HOME/*"]
diff --git a/docker-examples/vertx-docker-ruby/Dockerfile b/docker-examples/vertx-docker-ruby/Dockerfile
@@ -23,4 +23,4 @@ COPY $VERTICLE_NAME $VERTICLE_HOME/
 # Launch the verticle                       <5>
 WORKDIR $VERTICLE_HOME
 ENTRYPOINT ["sh", "-c"]
-CMD ["vertx run $VERTICLE_NAME -cp $VERTICLE_HOME/*"]
+CMD ["exec vertx run $VERTICLE_NAME -cp $VERTICLE_HOME/*"]
diff --git a/openshift3-examples/clustered-application/clustered-application-http/Dockerfile b/openshift3-examples/clustered-application/clustered-application-http/Dockerfile
@@ -10,4 +10,4 @@ RUN chmod 777 /app/
 
 WORKDIR /app/
 ENTRYPOINT ["sh", "-c"]
-CMD ["java -jar $JAVA_APP_JAR -cluster"]
+CMD ["exec java -jar $JAVA_APP_JAR -cluster"]
diff --git a/openshift3-examples/clustered-application/clustered-application-service/Dockerfile b/openshift3-examples/clustered-application/clustered-application-service/Dockerfile
@@ -10,4 +10,4 @@ RUN chmod 777 /app/
 
 WORKDIR /app/
 ENTRYPOINT ["sh", "-c"]
-CMD ["java -jar $JAVA_APP_JAR -cluster"]
+CMD ["exec java -jar $JAVA_APP_JAR -cluster"]
diff --git a/openshift3-examples/service-discovery-application/http-backend/Dockerfile b/openshift3-examples/service-discovery-application/http-backend/Dockerfile
@@ -10,4 +10,4 @@ RUN chmod 777 /app/
 
 WORKDIR /app/
 ENTRYPOINT ["sh", "-c"]
-CMD ["java -jar $JAVA_APP_JAR"]
+CMD ["exec java -jar $JAVA_APP_JAR"]
diff --git a/openshift3-examples/service-discovery-application/http-frontend/Dockerfile b/openshift3-examples/service-discovery-application/http-frontend/Dockerfile
@@ -10,4 +10,4 @@ RUN chmod 777 /app/
 
 WORKDIR /app/
 ENTRYPOINT ["sh", "-c"]
-CMD ["java -jar $JAVA_APP_JAR"]
+CMD ["exec java -jar $JAVA_APP_JAR"]
diff --git a/openshift3-examples/simple-web-application/Dockerfile b/openshift3-examples/simple-web-application/Dockerfile
@@ -10,4 +10,4 @@ RUN chmod 777 /app/
 
 WORKDIR /app/
 ENTRYPOINT ["sh", "-c"]
-CMD ["java -jar $JAVA_APP_JAR"]
+CMD ["exec java -jar $JAVA_APP_JAR"]