make DEPLOYMENTS_DIR overridable (fabric8io-images#146)

and mkdir -p it, because it can (and in our use case does) not exist, yet.
vorburger · May 15, 2018 · 48902da · 48902da
1 parent 81274a1
commit 48902da
Show file tree

Hide file tree

Showing 6 changed files with 6 additions and 3 deletions.
diff --git a/java/images/jboss/s2i/assemble b/java/images/jboss/s2i/assemble
@@ -165,6 +165,7 @@ function build_maven() {
 
 echo "=================================================================="
 echo "Starting S2I Java Build ....."
+mkdir -p ${DEPLOYMENTS_DIR}
 if [ -f "${S2I_SOURCE_DIR}/pom.xml" ]; then
   echo "S2I source build for Maven detected"
   build_dir=$(get_output_dir)

diff --git a/java/images/jboss/s2i/s2i-setup b/java/images/jboss/s2i/s2i-setup
@@ -2,5 +2,5 @@
 S2I_DESTINATION=${S2I_DESTINATION:-/tmp}
 S2I_SOURCE_DIR="${S2I_DESTINATION}/src"
 S2I_ARTIFACTS_DIR="${S2I_DESTINATION}/artifacts"
-DEPLOYMENTS_DIR="/deployments"
+DEPLOYMENTS_DIR="${DEPLOYMENTS_DIR:-/deployments}"
 RUN_JAVA_DIR=/opt/run-java
diff --git a/java/images/rhel/s2i/assemble b/java/images/rhel/s2i/assemble
@@ -165,6 +165,7 @@ function build_maven() {
 
 echo "=================================================================="
 echo "Starting S2I Java Build ....."
+mkdir -p ${DEPLOYMENTS_DIR}
 if [ -f "${S2I_SOURCE_DIR}/pom.xml" ]; then
   echo "S2I source build for Maven detected"
   build_dir=$(get_output_dir)

diff --git a/java/images/rhel/s2i/s2i-setup b/java/images/rhel/s2i/s2i-setup
@@ -2,5 +2,5 @@
 S2I_DESTINATION=${S2I_DESTINATION:-/tmp}
 S2I_SOURCE_DIR="${S2I_DESTINATION}/src"
 S2I_ARTIFACTS_DIR="${S2I_DESTINATION}/artifacts"
-DEPLOYMENTS_DIR="/deployments"
+DEPLOYMENTS_DIR="${DEPLOYMENTS_DIR:-/deployments}"
 RUN_JAVA_DIR=/opt/run-java
diff --git a/java/templates/s2i/assemble b/java/templates/s2i/assemble
@@ -165,6 +165,7 @@ function build_maven() {
 
 echo "=================================================================="
 echo "Starting S2I Java Build ....."
+mkdir -p ${DEPLOYMENTS_DIR}
 if [ -f "${S2I_SOURCE_DIR}/pom.xml" ]; then
   echo "S2I source build for Maven detected"
   build_dir=$(get_output_dir)

diff --git a/java/templates/s2i/s2i-setup b/java/templates/s2i/s2i-setup
@@ -2,5 +2,5 @@
 S2I_DESTINATION=${S2I_DESTINATION:-/tmp}
 S2I_SOURCE_DIR="${S2I_DESTINATION}/src"
 S2I_ARTIFACTS_DIR="${S2I_DESTINATION}/artifacts"
-DEPLOYMENTS_DIR="/deployments"
+DEPLOYMENTS_DIR="${DEPLOYMENTS_DIR:-/deployments}"
 RUN_JAVA_DIR=/opt/run-java