Merge pull request #59 from oracle/derek-domain-home

DOMAIN_HOME should not be in the ENV when no domain is installed

Author: ddsharpe

imagetool/src/main/resources/docker-files/Create_Image.mustache

@@ -135,10 +135,8 @@ ENV WDT_PKG=${WDT_PKG:-weblogic-deploy.zip} \
     PROPERTIES_FILE_DIR=$ORACLE_HOME/properties \
     WDT_HOME=${WDT_HOME:-/u01/app/weblogic-deploy} \
     SCRIPTS_DIR=${SCRIPTS_DIR:-scripts} \
-    RCU_RUN_FLAG=${RCU_RUN_FLAG:-}
-
-# DO NOT COMBINE THESE BLOCKS. It won't work when formatting variables like DOMAIN_HOME
-ENV DOMAIN_HOME=${DOMAIN_HOME:-/u01/domains/base_domain} \
+    RCU_RUN_FLAG=${RCU_RUN_FLAG:-} \
+    DOMAIN_HOME=${DOMAIN_HOME:-/u01/domains/base_domain} \
     PATH=$PATH:{{{java_home}}}/bin:${ORACLE_HOME}/oracle_common/common/bin:${ORACLE_HOME}/wlserver/common/bin:${DOMAIN_HOME}/bin:${ORACLE_HOME}
 
 {{#installJava}}
@@ -192,20 +190,17 @@ ENV ORACLE_HOME=${ORACLE_HOME} \
     MANAGED_SERVER_PORT=${MANAGED_SERVER_PORT:-8001} \
     WLSDEPLOY_PROPERTIES="-Djava.security.egd=file:/dev/./urandom" \
     DOMAIN_PARENT=${DOMAIN_PARENT:-/u01/domains} \
+    DOMAIN_HOME=${DOMAIN_HOME:-/u01/domains/base_domain} \
 {{/isWdtEnabled}}
     LC_ALL=${DEFAULT_LOCALE:-en_US.UTF-8} \
-    PROPERTIES_FILE_DIR=$ORACLE_HOME/properties
-
-# DO NOT COMBINE THESE BLOCKS. It won't work when formatting variables like DOMAIN_HOME
-ENV DOMAIN_HOME=${DOMAIN_HOME:-/u01/domains/base_domain} \
     PROPERTIES_FILE_DIR=$ORACLE_HOME/properties \
-    PATH=$PATH:{{{java_home}}}/bin:${ORACLE_HOME}/oracle_common/common/bin:${ORACLE_HOME}/wlserver/common/bin:${DOMAIN_HOME}/bin:${ORACLE_HOME}
+    PATH=$PATH:{{{java_home}}}/bin:${ORACLE_HOME}/oracle_common/common/bin:${ORACLE_HOME}/wlserver/common/bin:${ORACLE_HOME}{{#isWdtEnabled}}:${DOMAIN_HOME}/bin{{/isWdtEnabled}}
 
 ## Create user and group
 RUN if [ -z "$(getent group {{groupid}})" ]; then hash groupadd &> /dev/null && groupadd {{groupid}} || exit -1 ; fi \
  && if [ -z "$(getent passwd {{userid}})" ]; then hash useradd &> /dev/null && useradd -g {{groupid}} {{userid}} || exit -1; fi \
- && mkdir -p $(dirname {{{java_home}}}) $(dirname $ORACLE_HOME) $(dirname $DOMAIN_HOME) \
- && chown {{userid}}:{{groupid}} $(dirname {{{java_home}}}) $(dirname $ORACLE_HOME) $(dirname $DOMAIN_HOME)
+ && mkdir -p $(dirname {{{java_home}}}) $(dirname $ORACLE_HOME) {{#isWdtEnabled}}$(dirname $DOMAIN_HOME) {{/isWdtEnabled}} \
+ && chown {{userid}}:{{groupid}} $(dirname {{{java_home}}}) $(dirname $ORACLE_HOME) {{#isWdtEnabled}}$(dirname $DOMAIN_HOME){{/isWdtEnabled}}
 
 {{#installJava}}
 COPY --from=JDK_BUILD --chown={{userid}}:{{groupid}} $JAVA_HOME {{{java_home}}}/