Merge pull request #208 from jmtd/cloud-3977-delete-source

[CLOUD-3977] Deleting src dir after s2i breaks WildFly image with ODO

Author: jmtd

modules/s2i/core/api/module.yaml

@@ -95,10 +95,15 @@ envs:
 
 - name: S2I_ENABLE_INCREMENTAL_BUILDS
   description: ^
-    Do not remove source and intermediate build files so they can be saved for
+    Do not remove intermediate build files so they can be saved for
     use with future builds.  Defaults to true.
   example: "true"
 
+- name: S2I_DELETE_SOURCE
+  description: ^
+    Delete source files at the end of build.  Defaults to true.
+  example: "false"
+
 # deprecated
 - name: APP_DATADIR
   description: Deprecated by **S2I_SOURCE_DATA_DIR**.

modules/s2i/core/bash/artifacts/opt/jboss/container/s2i/core/s2i-core

@@ -32,6 +32,7 @@ function s2i_core_env_init() {
   S2I_TARGET_DATA_DIR="${S2I_TARGET_DATA_DIR:-${JAVA_DATA_DIR:-${DATA_DIR:-${S2I_TARGET_DEPLOYMENTS_DIR}}}}"
   S2I_IMAGE_SOURCE_MOUNTS="${S2I_IMAGE_SOURCE_MOUNTS:-${CUSTOM_INSTALL_DIRECTORIES}}"
   S2I_ENABLE_INCREMENTAL_BUILDS="${S2I_ENABLE_INCREMENTAL_BUILDS:-true}"
+  S2I_DELETE_SOURCE="${S2I_DELETE_SOURCE:-true}"
 
   s2i_core_env_backward_compatibility
 }
@@ -145,9 +146,11 @@ function s2i_core_process_image_mounts() {
 }
 
 function s2i_core_cleanup() {
-  if [ -n "$(find ${S2I_SOURCE_DIR} -maxdepth 0 -type d ! -empty 2> /dev/null)" ]; then
-    log_info "Cleaning up source directory (${S2I_SOURCE_DIR})"
-    rm -rf ${S2I_SOURCE_DIR}
+  if [ "${S2I_DELETE_SOURCE,,}" == "true" ]; then
+    if [ -n "$(find ${S2I_SOURCE_DIR} -maxdepth 0 -type d ! -empty 2> /dev/null)" ]; then
+      log_info "Cleaning up source directory (${S2I_SOURCE_DIR})"
+      rm -rf ${S2I_SOURCE_DIR}
+    fi
   fi
   if [ "${S2I_ENABLE_INCREMENTAL_BUILDS,,}" == "true" ]; then
     return 0