Add prefix ARG to arg variables

Author: CarolynRountree

samples/docker-domain/Dockerfile

@@ -17,12 +17,25 @@
 #
 # Run:
 #      $ sudo docker build \
+#            --build-arg ADMIN_HOST=wlsadmin
+#            --build-arg ADMIN_PORT=7001
+#            --build-arg MS_PORT=8001
+#            --build-arg DOMAIN_NAME=base_domain
 #            --build-arg WDT_MODEL=simple-topology.yaml \
 #            --build-arg WDT_ARCHIVE=archive.zip \
-#            --build-arg WDT_VARIABLE=simple-topology.properties \
+#            --build-arg WDT_VARIABLE=domain.properties \
 #            --force-rm=true \
 #            -t 12213-domain-wdt .
 #
+# If the ADMIN_HOST, ADMIN_PORT, MS_PORT, DOMAIN_NAME are not provided, the variables 
+# are set to default values. (The values shown in the build statement). 
+#
+# You must insure that the build arguments align with the values in the model. 
+# The sample model replaces the attributes with tokens that are resolved fromn values in the
+# corresponding property file domain.properties. The container-scripts/setEnv.sh script
+# demonstrates parsing the variable file to build a string of --build-args that can
+# be passed on the docker builds command.
+#
 # Pull base image
 # ---------------
 # FROM store/oracle/weblogic:12.2.1.3
@@ -35,31 +48,36 @@ MAINTAINER Richard Killen <richard.killen@oracle.com>
 ARG WDT_ARCHIVE
 ARG WDT_VARIABLE
 ARG WDT_MODEL
-ARG ADMIN_HOST
-ARG ADMIN_PORT
-ARG MS_PORT
-ARG DOMAIN_DIR
-ARG DEBUG_PORT
+ARG ARG_ADMIN_HOST=wlsadmin
+ARG ARG_ADMIN_PORT=7001
+ARG ARG_MS_PORT=8001
+ARG ARG_DOMAIN_NAME=base_domain
+ARG ARG_DEBUG_PORT=8453
+
+RUN echo DOMAIN_NAME=${DOMAIN_FOLDER_NAME}
+# Persist arguments - for ports to expose and container to use
+# Create a placeholder for the manager server name. This will be provided when run the container
+# ---------------------------
+ENV ADMIN_HOST=${ARG_ADMIN_HOST} \
+    ADMIN_PORT=${ARG_ADMIN_PORT} \
+    MS_NAME="" \
+    MS_PORT=${ARG_MS_PORT} \
+    DEBUG_PORT=${ARG_DEBUG_PORT} \
+    DOMAIN_NAME=${ARG_DOMAIN_NAME} \
+    ORACLE_HOME=/u01/oracle 
+
+ENV DOMAIN_PARENT=$ORACLE_HOME/user_projects/domains 
 
 # WLS Configuration - oracle home and domain home
 # The boot.properties will be created under the DOMAIN_HOME when the AdminServer container is run 
+# WDT install location and container scripts location
 # ---------------------------
-ENV ORACLE_HOME=/u01/oracle \
-    PROPERTIES_FILE_DIR="$ORACLE_HOME/properties" \
-    DOMAIN_PARENT="${ORACLE_HOME}/user_projects/domains" \
-    DOMAIN_HOME="${DOMAIN_PARENT}/${DOMAIN_DIR:-TESTDOMAON}" \
-    ADMIN_HOST="${ADMIN_HOST:-wlsadmin}" \
-    ADMIN_PORT="${ADMIN_PORT:-7001}" \
-    MS_PORT="${MS_PORT:-8001}" \
-    DEBUG_PORT="${DEBUG_PORT:-8453}" \
+ENV DOMAIN_HOME=$DOMAIN_PARENT/${DOMAIN_NAME} \
+    PROPERTIES_FILE_DIR=$ORACLE_HOME/properties \
+    WDT_HOME="/u01" \
+    SCRIPT_HOME="${ORACLE_HOME}" \
     PATH=$PATH:${ORACLE_HOME}/oracle_common/common/bin:${ORACLE_HOME}/wlserver/common/bin:$DOMAIN_HOME/bin:${ORACLE_HOME}
 
-# WDT install and WDT user files
-# ------------------------------------------------------------
-ENV WDT_HOME="/u01" \
-    SCRIPT_HOME="${ORACLE_HOME}" 
-
-# Add files required to build this image and run a container from the image
 COPY weblogic-deploy.zip ${WDT_HOME}
 COPY container-scripts/* ${SCRIPT_HOME}/
 
@@ -93,19 +111,20 @@ ENV WDT_HOME=$WDT_HOME/weblogic-deploy
 
 # Set WORKDIR for @@PWD@@ global token in model file
 WORKDIR $ORACLE_HOME
-RUN if [ -n "$WDT_MODEL" ]; then MODEL_OPT="-model_file $PROPERTIES_FILE_DIR/$WDT_MODEL"; fi && \
-    if [ -n "$WDT_ARCHIVE" ]; then ARCHIVE_OPT="-archive_file $PROPERTIES_FILE_DIR/$WDT_ARCHIVE"; fi && \
-    if [ -n "$WDT_VARIABLE" ]; then VARIABLE_OPT="-variable_file $PROPERTIES_FILE_DIR/$WDT_VARIABLE"; fi && \ 
+RUN if [ -n "$WDT_MODEL" ]; then MODEL_OPT="-model_file $PROPERTIES_FILE_DIR/${WDT_MODEL##*/}"; fi && \
+    if [ -n "$WDT_ARCHIVE" ]; then ARCHIVE_OPT="-archive_file $PROPERTIES_FILE_DIR/${WDT_ARCHIVE##*/}"; fi && \
+    if [ -n "$WDT_VARIABLE" ]; then VARIABLE_OPT="-variable_file $PROPERTIES_FILE_DIR/${WDT_VARIABLE##*/}"; fi && \ 
+    echo parent  $DOMAIN_PARENT && \
     ${WDT_HOME}/bin/createDomain.sh \
-        -oracle_home ${ORACLE_HOME} \
-        -java_home ${JAVA_HOME} \
-        -domain_home ${DOMAIN_HOME} \
+        -oracle_home $ORACLE_HOME \
+        -java_home $JAVA_HOME \
+        -domain_home $DOMAIN_HOME \
         -domain_type WLS \
         $VARIABLE_OPT  \
         $MODEL_OPT \
         $ARCHIVE_OPT && \
-    chown -R oracle:oracle ${DOMAIN_PARENT} && \
-    rm -rf ${PROPERTIES_FILE_DIR} 
+    chown -R oracle:oracle $DOMAIN_PARENT && \
+    rm -rf $PROPERTIES_FILE_DIR 
 
 VOLUME $DOMAIN_HOME
 

samples/docker-domain/build.sh

@@ -4,13 +4,16 @@
 #
 #Licensed under the Universal Permissive License v 1.0 as shown at http://oss.oracle.com/licenses/upl.
 #
-. container-scripts/setEnv.sh ./simple-topology.properties
+
+# parse the ADMIN_HOST, ADMIN_PORT, MS_PORT, and DOMAIN_NAME from the sample properties file and pass
+# as a string of --build-arg in the variable BUILD_ARG
+. container-scripts/setEnv.sh properties/docker-build/domain.properties
 
 
 docker build \
     $BUILD_ARG \
     --build-arg WDT_MODEL=simple-topology.yaml \
-    --build-arg WDT_VARIABLE=simple-topology.properties \
+    --build-arg WDT_VARIABLE=properties/docker-build/domain.properties \
     --build-arg WDT_ARCHIVE=archive.zip \
-    -t 12213-domain-wdt-test .
+    -t 12213-domain-wdt .
 

samples/docker-domain/container-scripts/setEnv.sh

@@ -2,10 +2,16 @@
 
 # Copyright (c) 2017, 2018, Oracle and/or its affiliates. All rights reserved.
 # The Universal Permissive License (UPL), Version 1.0
- BUILD_ARG=''
- if [ $# > 1 ]; then
-   PROPERTIES_FILE=$1
- fi
+#
+# This example creates the BUILD_ARG environment variable as a string of --build-arg for 
+# the arguments passed on the docker build command. The variable file that is used for the WDT
+# create domain step is the input to this script. This insures that the values persisted
+# as environment variables in the docker image match the configured domain home.
+
+BUILD_ARG=''
+if [ $# > 1 ]; then
+  PROPERTIES_FILE=$1
+fi
 
 if [ ! -e "${PROPERTIES_FILE}" ]; then
     echo "A properties file with variable definitions should be supplied."
@@ -20,34 +26,38 @@ if [ ! -n "$DOMAIN_DIR" ]; then
    fi
 fi
 if [ -n "$DOMAIN_DIR" ]; then
-     export DOMAIN_DIR
-     echo DOMAIN_DIR=$DOMAIN_DIR
-     BUILD_ARG="$BUILD_ARG --build-arg DOMAIN_DIR=$DOMAIN_DIR"
+     DOMAIN_NAME=$DOMAIN_DIR
+     export DOMAIN_NAME
+     echo DOMAIN_NAME=$DOMAIN_NAME
+     BUILD_ARG="$BUILD_ARG --build-arg ARG_DOMAIN_NAME=$DOMAIN_NAME"
 fi
 
 ADMIN_HOST=`awk '{print $1}' $PROPERTIES_FILE | grep ^ADMIN_HOST= | cut -d "=" -f2`
 if [ -n "$ADMIN_HOST" ]; then
     export ADMIN_HOST
     echo ADMIN_HOST=$ADMIN_HOST
-    BUILD_ARG="$BUILD_ARG --build-arg ADMIN_HOST=$ADMIN_HOST"
+    BUILD_ARG="$BUILD_ARG --build-arg ARG_ADMIN_HOST=$ADMIN_HOST"
 fi
 
 ADMIN_PORT=`awk '{print $1}' $PROPERTIES_FILE | grep ^ADMIN_PORT= | cut -d "=" -f2`
 if [ -n "$ADMIN_PORT" ]; then
     export ADMIN_PORT
     echo ADMIN_PORT=$ADMIN_PORT
-    BUILD_ARG="$BUILD_ARG --build-arg ADMIN_PORT=$ADMIN_PORT"
+    BUILD_ARG="$BUILD_ARG --build-arg ARG_ADMIN_PORT=$ADMIN_PORT"
 fi
 
 MS_PORT=`awk '{print $1}' $PROPERTIES_FILE | grep ^MS_PORT= | cut -d "=" -f2`
 if [ -n "$MS_PORT" ]; then
-    export MS_PORT echo MS_PORT=$MS_PORT BUILD_ARG="$BUILD_ARG --build-arg MS_PORT=$MS_PORT" fi
+    export MS_PORT 
+    echo MS_PORT=$MS_PORT
+    BUILD_ARG="$BUILD_ARG --build-arg ARG_MS_PORT=$MS_PORT"
+fi
 
 DEBUG_PORT=`awk '{print $1}' $PROPERTIES_FILE | grep ^DEBUG_PORT= | cut -d "=" -f2`
 if [ -n "$DEBUG_PORT" ]; then
     export DEBUG_PORT
     echo DEBUG_PORT=$DEBUG_PORT
-    BUILD_ARG="$BUILD_ARG --build-arg DEBUG_PORT=$DEBUG_PORT"
+    BUILD_ARG="$BUILD_ARG --build-arg ARG_DEBUG_PORT=$DEBUG_PORT"
 fi
 
 echo BUILD_ARG=$BUILD_ARG