Merge pull request #297 from jfdenise/v2

Fix for WFWIP-428, s2i v2, drivers not added to server config

jboss/container/wildfly/s2i/legacy/artifacts/opt/jboss/container/wildfly/s2i/assemble.sh

@@ -9,13 +9,15 @@ if [ -n "${GALLEON_PROVISION_LAYERS}" ]; then
      exit 1
    fi
 fi
+# This is required in all cases
+# Needed in case some drivers are installed during s2i, the CLI execution must occurs during s2i.
+export CONFIG_ADJUSTMENT_MODE=cli
 
 if [ -n "${GALLEON_PROVISION_FEATURE_PACKS}" ] || [ -n "${GALLEON_USE_LOCAL_FILE}" ]; then
   log_warning "You have activated legacy s2i workflow by setting GALLEON_PROVISION_FEATURE_PACKS or GALLEON_USE_LOCAL_FILE env variable."
   log_warning "This support is deprecated and will be removed in a future release. Provision and configure your server during s2i from your pom.xml file by using the dedicated Maven plugin."
   # Legacy s2i workflow integration
   #For backward compatibility
-  export CONFIG_ADJUSTMENT_MODE=cli
   source "${JBOSS_CONTAINER_WILDFLY_S2I_LEGACY_GALLEON_MODULE}/s2i-core-hooks"
   source "${JBOSS_CONTAINER_WILDFLY_S2I_LEGACY_GALLEON_MODULE}/s2i_galleon"
   galleon_legacy=true;