Merge pull request #311 from jetty-project/async-support-302

Issue #302, exec jetty_cmd.sh so that signals are passed to JVM
GoogleCloudPlatform · Aug 4, 2016 · 9172a68 · 9172a68
2 parents 761012d + c87997a
commit 9172a68
Showing 1 changed file with 1 addition and 1 deletion.
diff --git a/jetty9-compat/src/main/docker/Dockerfile b/jetty9-compat/src/main/docker/Dockerfile
@@ -29,7 +29,7 @@ ADD jetty-base jetty_run.sh $JETTY_BASE/
 WORKDIR $JETTY_BASE
 RUN sed -i 's/^\([a-zA-Z\.]*=\).*/#\1(see gae.ini)/' start.d/server.ini \
  && java -jar $JETTY_HOME/start.jar --dry-run \
-  | sed 's/^.*java /& ${JAVA_OPTS} /' > jetty_cmd.sh \
+  | sed 's/^.*java /exec & ${JAVA_OPTS} /' > jetty_cmd.sh \
  && chown -R jetty:jetty $JETTY_BASE \
  && chmod +x $JETTY_BASE/jetty_run.sh