make build args from var file

Author: CarolynRountree

samples/docker-domain/Dockerfile

@@ -32,39 +32,45 @@ FROM store/oracle/weblogic:12.2.1.3-dev
 # ----------
 MAINTAINER Richard Killen <richard.killen@oracle.com>
 
-ARG WDT_MODEL
 ARG WDT_ARCHIVE
 ARG WDT_VARIABLE
+ARG WDT_MODEL
+ARG ADMIN_HOST
+ARG ADMIN_PORT
+ARG MS_PORT
+ARG DOMAIN_DIR
+ARG DEBUG_PORT
 
 # WLS Configuration - oracle home and domain home
 # The boot.properties will be created under the DOMAIN_HOME when the AdminServer container is run 
 # ---------------------------
 ENV ORACLE_HOME=/u01/oracle \
-    PROPERTIES_FILE_DIR="${ORACLE_HOME}/properties" \
-    DOMAIN_HOME_PARENT=${ORACLE_HOME}/user_projects/domains \
-    PATH=$PATH:${ORACLE_HOME}/oracle_common/common/bin:${ORACLE_HOME}/wlserver/common/bin:${ORACLE_HOME}
+    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}" \
+    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 COPY_PROPERTIES="properties/docker_build" \
-    WDT_HOME="/u01" \
-    SCRIPT_HOME="${ORACLE_HOME}" \
-    WDT_MODEL="$WDT_MODEL" \
-    WDT_ARCHIVE="$WDT_ARCHIVE" \
-    WDT_VARIABLE="$WDT_VARIABLE"
+ENV WDT_HOME="/u01" \
+    SCRIPT_HOME="${ORACLE_HOME}" 
 
 # Add files required to build this image and run a container from the image
-COPY container-scripts/* ${SCRIPT_HOME}/
 COPY weblogic-deploy.zip ${WDT_HOME}
+COPY container-scripts/* ${SCRIPT_HOME}/
 
 # Create the properties file directory and the domain home parent with the correct permissions / owner. 
 # Unzip and install the WDT image.
 # Export variable file values into the environment
 USER root
 RUN chmod +xw ${SCRIPT_HOME}/*.sh && \ 
     mkdir -p +xwr ${PROPERTIES_FILE_DIR} && \
-    mkdir -p $DOMAIN_HOME_PARENT && \
-    chmod -R a+xwr $DOMAIN_HOME_PARENT && \
+    mkdir -p $DOMAIN_PARENT && \
+    chmod -R a+xwr $DOMAIN_PARENT && \
     cd ${WDT_HOME} && \
     $JAVA_HOME/bin/jar xf ./weblogic-deploy.zip && \
     rm weblogic-deploy.zip && \
@@ -75,7 +81,7 @@ RUN chmod +xw ${SCRIPT_HOME}/*.sh && \
 # These files will be removed after the image is built.
 # Be sure to build with --force-rm to eliminate this container layer
 
-COPY ${WDT_MODEL} ${WDT_ARCHIVE} ${WDT_VARIABLE} ${COPY_PROPERTIES}/*.properties ${PROPERTIES_FILE_DIR}/
+COPY ${WDT_MODEL} ${WDT_ARCHIVE} ${WDT_VARIABLE} properties/docker_build/*.properties ${PROPERTIES_FILE_DIR}/
 
 # Create the domain home in the docker image.
 #
@@ -87,14 +93,9 @@ ENV WDT_HOME=$WDT_HOME/weblogic-deploy
 
 # Set WORKDIR for @@PWD@@ global token in model file
 WORKDIR $ORACLE_HOME
-RUN chmod -R +xwr ${PROPERTIES_FILE_DIR} && \
-    PROPERTIES_FILE=$PROPERTIES_FILE_DIR/$WDT_VARIABLE && \ 
-    . ${SCRIPT_HOME}/setEnv.sh && \
-    DOMAIN_HOME=${DOMAIN_HOME_PARENT}/${DOMAIN_NAME} && \
-    export DOMAIN_HOME && \
-    if [ -n "$WDT_MODEL" ]; then MODEL_OPT="-model_file $PROPERTIES_FILE_DIR/$WDT_MODEL"; 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"; fi && \ 
+    if [ -n "$WDT_VARIABLE" ]; then VARIABLE_OPT="-variable_file $PROPERTIES_FILE_DIR/$WDT_VARIABLE"; fi && \ 
     ${WDT_HOME}/bin/createDomain.sh \
         -oracle_home ${ORACLE_HOME} \
         -java_home ${JAVA_HOME} \
@@ -103,22 +104,9 @@ RUN chmod -R +xwr ${PROPERTIES_FILE_DIR} && \
         $VARIABLE_OPT  \
         $MODEL_OPT \
         $ARCHIVE_OPT && \
-    chown -R oracle:oracle ${DOMAIN_HOME_PARENT} && \
+    chown -R oracle:oracle ${DOMAIN_PARENT} && \
     rm -rf ${PROPERTIES_FILE_DIR} 
 
-# Set the ENV variables needed for runing container.
-# If these variables are not in the variable file and not set on the build or run, set a default value.
-# If not using a variable file, then make sure these ENV values match those in the model.
-ENV ADMIN_HOST="${ADMIN_HOST:-wlsadmin}" \
-    ADMIN_PORT="${ADMIN_PORT:-7001}" \
-    MS_NAME="${MS_NAME}" \
-    MS_PORT="${MS_PORT:-8001}" \
-    DEBUG_PORT="${DEBUG_PORT:-8453}" \
-    DOMAIN_NAME="`awk '{print $1}' $PROPERTIES_FILE | grep ^DOMAIN_NAME= | cut -d "=" -f2`" \
-    DOMAIN_HOME="$DOMAIN_HOME_PARENT/$DOMAIN_NAME" \
-    WDT_HOME="${WDT_HOME}/weblogic-deploy" \
-    PATH=$PATH:$DOMAIN_HOME/bin
-    
 VOLUME $DOMAIN_HOME
 
 # Expose admin server, managed server port and domain debug port

samples/docker-domain/build.sh

@@ -4,7 +4,11 @@
 #
 #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
+
+
 docker build \
+    $BUILD_ARG \
     --build-arg WDT_MODEL=simple-topology.yaml \
     --build-arg WDT_VARIABLE=simple-topology.properties \
     --build-arg WDT_ARCHIVE=archive.zip \

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

@@ -1,15 +1,14 @@
-#!/bin/bash
-#
+#!/bin/bash ex
+
 # Copyright (c) 2017, 2018, Oracle and/or its affiliates. All rights reserved.
 # The Universal Permissive License (UPL), Version 1.0
-#
-# if [ $# > 0 ]; then
-#   PROPERTIES_FILE=$1
-# fi
+ BUILD_ARG=''
+ if [ $# > 1 ]; then
+   PROPERTIES_FILE=$1
+ fi
 
 if [ ! -e "${PROPERTIES_FILE}" ]; then
     echo "A properties file with variable definitions should be supplied."
-    exit 1
 fi
 
 echo Export environment variables from the ${PROPERTIES_FILE} properties file
@@ -18,36 +17,37 @@ DOMAIN_DIR=`awk '{print $1}' $PROPERTIES_FILE | grep ^DOMAIN_NAME= | cut -d "="
 if [ ! -n "$DOMAIN_DIR" ]; then  
    if [ -n "$DOMAIN_NAME" ]; then
       DOMAIN_DIR=$DOMAIN_NAME
-   else
-      DOMAIN_DIR=base_domain
    fi
 fi
-DOMAIN_NAME=$DOMAIN_DIR
-export DOMAIN_NAME
-echo DOMAIN_NAME=$DOMAIN_NAME
+if [ -n "$DOMAIN_DIR" ]; then
+     export DOMAIN_DIR
+     echo DOMAIN_DIR=$DOMAIN_DIR
+     BUILD_ARG="$BUILD_ARG --build-arg DOMAIN_DIR=$DOMAIN_DIR"
+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"
 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"
 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
-fi
+    export MS_PORT echo MS_PORT=$MS_PORT BUILD_ARG="$BUILD_ARG --build-arg MS_PORT=$MS_PORT" fi
 
-DEBUG_PORT=`awk '{print $1}' $PROPERTIES_FILE | grep ^MS_PORT= | cut -d "=" -f2`
+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"
 fi
 
-
+echo BUILD_ARG=$BUILD_ARG