Skip to content

Commit 3267852

Browse files
authored
Merge pull request #590 from jmtd/OPENJDK-3856-vestigal-run
[OPENJDK-3856] Remove broken support for appsrc run.sh
2 parents 9303fe3 + 664fa6a commit 3267852

File tree

1 file changed

+2
-7
lines changed
  • modules/s2i/bash/artifacts/usr/local/s2i

1 file changed

+2
-7
lines changed

modules/s2i/bash/artifacts/usr/local/s2i/run

Lines changed: 2 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -13,10 +13,5 @@ s2i_core_env_init
1313

1414
export JAVA_OPTS
1515

16-
if [ -f "${S2I_TARGET_DEPLOYMENTS_DIR}/bin/run.sh" ]; then
17-
echo "Starting the application using the bundled ${S2I_TARGET_DEPLOYMENTS_DIR}/bin/run.sh ..."
18-
exec ${DEPLOYMENTS_DIR}/bin/run.sh $args ${JAVA_ARGS}
19-
else
20-
echo "Starting the Java application using ${JBOSS_CONTAINER_JAVA_RUN_MODULE}/run-java.sh $args..."
21-
exec "${JBOSS_CONTAINER_JAVA_RUN_MODULE}/run-java.sh" $args ${JAVA_ARGS}
22-
fi
16+
echo "Starting the Java application using ${JBOSS_CONTAINER_JAVA_RUN_MODULE}/run-java.sh $args ${JAVA_ARGS}"
17+
exec "${JBOSS_CONTAINER_JAVA_RUN_MODULE}/run-java.sh" $args ${JAVA_ARGS}

0 commit comments

Comments
 (0)