Skip to content

Commit

Permalink
[CLOUD-3387] Don't attempt to enable maven in run
Browse files Browse the repository at this point in the history
don't try to enable Maven (Via SCL) in the s2i run script.

We might not have provided Maven via SCL in the image anyway.

Fixes jboss-openshift#354.

Signed-off-by: Jonathan Dowland <[email protected]>
  • Loading branch information
jmtd committed Oct 2, 2019
1 parent 23376a5 commit 8e90fb7
Showing 1 changed file with 0 additions and 3 deletions.
3 changes: 0 additions & 3 deletions jboss/container/java/s2i/bash/artifacts/usr/local/s2i/run
Original file line number Diff line number Diff line change
Expand Up @@ -11,9 +11,6 @@ source "${JBOSS_CONTAINER_JAVA_S2I_MODULE}/s2i-core-hooks"
# Global S2I variable setup
s2i_core_env_init

# XXX: Not sure why we need to setup maven, but this was part of the old s2i-setup script, so...
source "${JBOSS_CONTAINER_MAVEN_DEFAULT_MODULE}/scl-enable-maven"

JAVA_OPTS="${JAVA_OPTS:-${JAVA_OPTIONS}}"
if [ -f "${JBOSS_CONTAINER_JOLOKIA_MODULE}/jolokia-opts" ]; then
# Always include jolokia-opts, which can be empty if switched off via env
Expand Down

0 comments on commit 8e90fb7

Please sign in to comment.