fix up topology

CarolynRountree · CarolynRountree · commit cd8d38cd067a · 2018-11-27T09:37:59.000-08:00
diff --git a/samples/docker-domain/Dockerfile b/samples/docker-domain/Dockerfile
@@ -19,13 +19,14 @@
 #      $ sudo docker build \
 #            --build-arg WDT_MODEL=simple-topology.yaml \
 #            --build-arg WDT_ARCHIVE=archive.zip \
+#            --build-arg WDT_VARIABLE=simple-topology.properties \
 #            --force-rm=true \
 #            -t 12213-domain-wdt .
 #
 # Pull base image
 # ---------------
 # FROM store/oracle/weblogic:12.2.1.3
-FROM oracle/weblogic:12.2.1.3-developer
+FROM store/oracle/weblogic:12.2.1.3-dev
 
 # Maintainer
 # ----------
@@ -35,75 +36,96 @@ ARG WDT_MODEL
 ARG WDT_ARCHIVE
 ARG WDT_VARIABLE
 
-# WLS Configuration
+# 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" \
-    SCRIPT_FILE=${ORACLE_HOME}/createAndStartWLSDomain.sh \
     DOMAIN_HOME_PARENT=${ORACLE_HOME}/user_projects/domains \
-    DOMAIN_HOME="${DOMAIN_HOME_PARENT}/${DOMAIN_NAME}-base_domain}" \
-    PATH=$PATH:${ORACLE_HOME}/oracle_common/common/bin:${ORACLE_HOME}/wlserver/common/bin:${DOMAIN_HOME}/bin:${ORACLE_HOME}
-
+    PATH=$PATH:${ORACLE_HOME}/oracle_common/common/bin:${ORACLE_HOME}/wlserver/common/bin:${ORACLE_HOME}
+    
 # WDT install and WDT user files
-# COPY
 # ------------------------------------------------------------
-ENV COPY_PROPERTIES="poperties/docker_build" \
-    INSTALL_HOME="/u01" \
+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"
+    WDT_VARIABLE="$WDT_VARIABLE"
 
-# Add files required to build this image
-COPY container-scripts/* ${INSTALL_HOME}
-COPY weblogic-deploy.zip ${INSTALL_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}
 
+# 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 ${INSTALL_HOME}/*.sh && \
-    mkdir +xwr ${PROPERTIES_FILE_DIR} && \
-    chown -R oracle:oracle ${PROPERTIES_FILE_DIR} && \
+RUN chmod +xw ${SCRIPT_HOME}/*.sh && \ 
+    mkdir -p +xwr ${PROPERTIES_FILE_DIR} && \
     mkdir -p $DOMAIN_HOME_PARENT && \
-    chown -R oracle:oracle $DOMAIN_HOME_PARENT && \
-    chmod -R a+xwr $DOMAIN_HOME_PARENT
+    chmod -R a+xwr $DOMAIN_HOME_PARENT && \
+    cd ${WDT_HOME} && \
+    $JAVA_HOME/bin/jar xf ./weblogic-deploy.zip && \
+    rm weblogic-deploy.zip && \
+    chmod +xw weblogic-deploy/bin/*.sh && \
+    chmod -R +xw weblogic-deploy/lib/python  
 
-COPY ${WDT_MODEL} ${WDT_ARCHIVE} ${WDT_VARIABLE} ${COPY_PROPERTIES}/*.properties ${PROPERTIES_FILE_DIR}/
+# Copy the WDT model, archive file, variable file and credential secrets to the property file directory.
+# These files will be removed after the image is built.
+# Be sure to build with --force-rm to eliminate this container layer
 
-# export domain and server specific variables into environment
-RUN /bin/sh ${INSTALL_HOME}/setEnv.sh
+COPY ${WDT_MODEL} ${WDT_ARCHIVE} ${WDT_VARIABLE} ${COPY_PROPERTIES}/*.properties ${PROPERTIES_FILE_DIR}/
+         
+# Create the domain home in the docker image.
+#
+# The create domain tool creates a domain at the DOMAIN_HOME location
+# The domain name is set using the value in the model / variable files 
+# The domain name can be different from the DOMAIN_HOME domain folder name.
 
-# Default values - these values will be replaced by the values in the properties file
-# The DOMAIN_NAME in the variable file can be different than the DOMAIN NAME in the DOMAIN_HOME
-ENV DOMAIN_NAME="${DOMAIN_NAME:-base-domain}" \
-    ADMIN_HOST="${ADMIN_HOST:-wlsadmin}" \
-    ADMIN_PORT="${ADMIN_PORT:-7001}" \
-    MS_PORT="${MS_PORT:-8001}" \
-    DEBUG_PORT="${DEBUG_PORT:-8453}" \
-    DOMAIN_HOME="${DOMAIN_PARENT}\${DOMAIN
-    PATH=${PATH}:
+ENV WDT_HOME=$WDT_HOME/weblogic-deploy 
 
-# Run the WDT createDomain to create the domain home in the image
-RUN cd ${INSTALL_HOME} && \
-    $JAVA_HOME/bin/jar xf ${INSTALL_HOME_BASE}/weblogic-deploy.zip && \
-    chmod +xw ${INSTALL_HOME_BASE}/weblogic-deploy/bin/*.sh && \
-    chmod -R +xw ${INSTALL_HOME_BASE}/weblogic-deploy/lib/python && \
-    if [ -n "$WDT_MODEL" ]; then MODEL_OPT="-archive_file ${INSTALL_HOME_BASE}/$WDT_ARCHIVE"; fi && \
-    if [ -n "$WDT_ARCHIVE" ]; then ARCHIVE_OPT="-archive_file ${INSTALL_HOME_BASE}/$WDT_ARCHIVE"; fi && \
-    if [ -n "$WDT_VARIABLE" ]; then VARIABLE_OPT="-variable_file ${INSTALL_HOME_BASE}/$WDT_VARIABLE"; fi && \
-    /u01/weblogic-deploy/bin/createDomain.sh \
-        -oracle_home $ORACLE_HOME \
+# 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 && \
+    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 && \ 
+    ${WDT_HOME}/bin/createDomain.sh \
+        -oracle_home ${ORACLE_HOME} \
         -java_home ${JAVA_HOME} \
         -domain_home ${DOMAIN_HOME} \
         -domain_type WLS \
-        $VARIABLE_OPT \
+        $VARIABLE_OPT  \
         $MODEL_OPT \
         $ARCHIVE_OPT && \
-    rm ${PROPERTIES_FILE_DIR}/*
+    chown -R oracle:oracle ${DOMAIN_HOME_PARENT} && \
+    rm -rf ${PROPERTIES_FILE_DIR} 
 
-VOLUME $PRE_DOMAIN_HOME
-# Expose Node Manager default port, and also default for admin and managed server
+# 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
 EXPOSE $ADMIN_PORT $MS_PORT $DEBUG_PORT
 
+# Define default command to start bash.
+WORKDIR $SCRIPT_HOME
 USER oracle
-WORKDIR $ORACLE_HOME
 
-# Define default command to start bash.
-CMD ["${ORACLE_HOME}/startWLSDomain.sh"]
+CMD ["./startWLSDomain.sh"]
diff --git a/samples/docker-domain/README.md b/samples/docker-domain/README.md
@@ -12,6 +12,11 @@ This sample includes a basic WDT model, `simple-topology.yaml`, that describes t
 
 Another option is to use the WDT `discoverDomain` tool to create a model. This process is also described in the WDT project's README file. A user can use the tool to analyze an existing domain, and create a model based on its configuration. The user may choose to customize the model before using it to create a new Docker image.
 
+The sample model file includes variable tokens that are replaced with values from the provided 'simple-topology.properties'. The properties files can be created and modified using a text editor. The property file must contain the values that the Dockerfile sets as ENV variables to expose ports
+ and run a server in a docker container.
+ 
+The admin server credentials in the sample model contain file tokens that reference special property files. A special property file must contain only one property value pair. The sample includes the credentials secrets property files in the properties/docker_build directory. The files can be created and modified using a text editor; one file must contain the admin password and one file must contain the admin user. See the README file for more information on using property and file tokens in the WDT model.
+
 Domain creation may require the deployment of applications and libraries. This is accomplished by creating a ZIP archive with a specific structure, then referencing those items in the model. This sample creates and deploys a simple ZIP archive containing a small application WAR. That archive is built in the sample directory prior to creating the Docker image.
 
 When the WDT `discoverDomain` tool is used on an existing domain, a ZIP archive is created containing any necessary applications and libraries. The corresponding configuration for those applications and libraries is added to the model.
@@ -33,22 +38,25 @@ To build this sample, run:
     $ docker build \
           --build-arg WDT_MODEL=simple-topology.yaml \
           --build-arg WDT_ARCHIVE=archive.zip \
+          --build-arg WDT_VARIABLE=simple-topology.properties \
           --force-rm=true \
           -t 12213-domain-wdt .
 
-This will use the model file and archive in the sample directory.
+This will use the model, variable and archive files in the sample directory.
+
+The Admin Server and each Managed Server are run in containers from this build image. The admin server credentials, required for running the admin server or a managed server, are provided in a properties file. This sample contains a credentials properties file in the properties/docker_run directory, which can be mounted into a volume on the container image. It is the responsibility of the user to mange the properties file in this mounted container volume.
 
 To start the containerized Administration Server, run:
 
-    $ docker run -d --name wlsadmin --hostname wlsadmin -p 7001:7001 -v <sample-directory>/properties:/u01/oracle/properties 12213-domain-wdt
+    $ docker run -d --name wlsadmin --hostname wlsadmin -p 7001:7001 -v <sample-directory>/properties/docker_run:/u01/oracle/properties 12213-domain-wdt
 
 To start a containerized Managed Server (ms-1) to self-register with the Administration Server above, run:
 
-    $ docker run -d --name ms-1 --link wlsadmin:wlsadmin -p 9001:9001 -v <sample-directory>/properties:/u01/oracle/properties -e MS_NAME=ms-1 12213-domain-wdt startManagedServer.sh
+    $ docker run -d --name ms-1 --link wlsadmin:wlsadmin -p 9001:9001 -v <sample-directory>/properties/docker_run:/u01/oracle/properties -e MS_NAME=ms-1 12213-domain-wdt startManagedServer.sh
 
 To start an additional Managed Server (in this example ms-2), run:
 
-    $ docker run -d --name ms-2 --link wlsadmin:wlsadmin -p 9002:9001 -v <sample-directory>/properties:/u01/oracle/properties -e MS_NAME=ms-2 12213-domain-wdt startManagedServer.sh
+    $ docker run -d --name ms-2 --link wlsadmin:wlsadmin -p 9002:9001 -v <sample-directory>/properties/docker_run/:/u01/oracle/properties -e MS_NAME=ms-2 12213-domain-wdt startManagedServer.sh
 
 The above scenario from this sample will give you a WebLogic domain with a dynamic cluster set up on a single host environment.
 
diff --git a/samples/docker-domain/build.sh b/samples/docker-domain/build.sh
@@ -6,6 +6,7 @@
 #
 docker build \
     --build-arg WDT_MODEL=simple-topology.yaml \
+    --build-arg WDT_VARIABLE=simple-topology.properties \
     --build-arg WDT_ARCHIVE=archive.zip \
-    -t 12213-domain-wdt .
+    -t 12213-domain-wdt-test .
 
diff --git a/samples/docker-domain/container-scripts/setEnv.sh b/samples/docker-domain/container-scripts/setEnv.sh
@@ -3,36 +3,51 @@
 # Copyright (c) 2017, 2018, Oracle and/or its affiliates. All rights reserved.
 # The Universal Permissive License (UPL), Version 1.0
 #
-# Set the Domain environment variables.
+# if [ $# > 0 ]; then
+#   PROPERTIES_FILE=$1
+# fi
 
-if [ ! -e "$WDT_VARIABLE" ]; then
+if [ ! -e "${PROPERTIES_FILE}" ]; then
     echo "A properties file with variable definitions should be supplied."
-    goto envexit
+    exit 1
 fi
 
-DOMAIN_NAME=`awk '{print $1}' $WDT_VARIABLE | grep ^DOMAIN_NAME= | cut -d "=" -f2`
-if [ -n "$DOMAIN_NAME" ]; then
-    export DOMAIN_NAME
+echo Export environment variables from the ${PROPERTIES_FILE} properties file
+
+DOMAIN_DIR=`awk '{print $1}' $PROPERTIES_FILE | grep ^DOMAIN_NAME= | cut -d "=" -f2`
+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
 
-ADMIN_HOST=`awk '{print $1}' $WDT_VARIABLE | grep ^ADMIN_HOST= | cut -d "=" -f2`
+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
 fi
 
-ADMIN_PORT=`awk '{print $1}' $WDT_VARIABLE | grep ^ADMIN_PORT= | cut -d "=" -f2`
+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
 fi
 
-MS_PORT=`awk '{print $1}' $WDT_VARIABLE | grep ^MS_PORT= | cut -d "=" -f2`
+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
 
-DEBUG_PORT=`awk '{print $1}' $WDT_VARIABLE | grep ^MS_PORT= | cut -d "=" -f2`
+DEBUG_PORT=`awk '{print $1}' $PROPERTIES_FILE | grep ^MS_PORT= | cut -d "=" -f2`
 if [ -n "$DEBUG_PORT" ]; then
     export DEBUG_PORT
+    echo DEBUG_PORT=$DEBUG_PORT
 fi
 
-envexit:
+
diff --git a/samples/docker-domain/container-scripts/startManagedServer.sh b/samples/docker-domain/container-scripts/startManagedServer.sh
@@ -6,18 +6,12 @@
 #
 # Start the Domain.
 
-PROPERTIES_FILE=/u01/oracle/properties/domain.properties
+PROPERTIES_FILE=/u01/oracle/properties/security.properties
 if [ ! -e "$PROPERTIES_FILE" ]; then
     echo "A properties file with variable definitions needs to be supplied."
     exit
 fi
 
-DOMAIN_NAME=`awk '{print $1}' $PROPERTIES_FILE | grep ^DOMAIN_NAME= | cut -d "=" -f2`
-if [ -z "$DOMAIN_NAME" ]; then
-    echo "The domain name is blank.  The domain name must be set in the properties file."
-    exit
-fi
-
 USER=`awk '{print $1}' $PROPERTIES_FILE | grep ^username= | cut -d "=" -f2`
 if [ -z "$USER" ]; then
     echo "The admin username is blank.  The admin username must be set in the properties file."
@@ -30,21 +24,6 @@ if [ -z "$PASS" ]; then
     exit
 fi
 
-ADMIN_HOST=`awk '{print $1}' $PROPERTIES_FILE | grep ^ADMIN_HOST= | cut -d "=" -f2`
-if [ -z "$ADMIN_HOST" ]; then
-    echo "The admin host is blank.  The admin host must be set in the properties file."
-    exit
-fi
-
-ADMIN_PORT=`awk '{print $1}' $PROPERTIES_FILE | grep ^ADMIN_PORT= | cut -d "=" -f2`
-if [ -z "$ADMIN_PORT" ]; then
-    echo "The admin port is blank.  The admin port must be set in the properties file."
-    exit
-fi
-
-#Define DOMAIN_HOME
-export DOMAIN_HOME=/u01/oracle/user_projects/domains/$DOMAIN_NAME
-
 mkdir -p $DOMAIN_HOME/servers/$MS_NAME/security
 echo username=$USER > $DOMAIN_HOME/servers/$MS_NAME/security/boot.properties
 echo password=$PASS >> $DOMAIN_HOME/servers/$MS_NAME/security/boot.properties
diff --git a/samples/docker-domain/container-scripts/startWLSDomain.sh b/samples/docker-domain/container-scripts/startWLSDomain.sh
@@ -6,18 +6,12 @@
 #
 # Start the Domain.
 
-PROPERTIES_FILE=/u01/oracle/properties/domain.properties
+PROPERTIES_FILE=/u01/oracle/properties/security.properties
 if [ ! -e "$PROPERTIES_FILE" ]; then
     echo "A properties file with the username and password needs to be supplied."
     exit
 fi
 
-DOMAIN_NAME=`awk '{print $1}' $PROPERTIES_FILE | grep ^DOMAIN_NAME= | cut -d "=" -f2`
-if [ -z "$DOMAIN_NAME" ]; then
-    echo "The domain name is blank.  The domain name must be set in the properties file."
-    exit
-fi
-
 USER=`awk '{print $1}' $PROPERTIES_FILE | grep ^username= | cut -d "=" -f2`
 if [ -z "$USER" ]; then
     echo "The domain username is blank.  The Admin username must be set in the properties file."
@@ -30,9 +24,6 @@ if [ -z "$PASS" ]; then
     exit
 fi
 
-#Define DOMAIN_HOME
-export DOMAIN_HOME=/u01/oracle/user_projects/domains/$DOMAIN_NAME
-
 mkdir -p ${DOMAIN_HOME}/servers/AdminServer/security/
 echo "username=${USER}" >> $DOMAIN_HOME/servers/AdminServer/security/boot.properties
 echo "password=${PASS}" >> $DOMAIN_HOME/servers/AdminServer/security/boot.properties
diff --git a/samples/docker-domain/properties/docker_run/security.properties b/samples/docker-domain/properties/docker_run/security.properties
@@ -1,3 +1,2 @@
-ADMIN_USER=weblogic
-ADMIN_PASS=welcome1
-DOMAIN_NAME=my_domain
+username=weblogic
+password=welcome1
diff --git a/samples/docker-domain/simple-topology.properties b/samples/docker-domain/simple-topology.properties
diff --git a/samples/docker-domain/simple-topology.yaml b/samples/docker-domain/simple-topology.yaml

Original file line number	Diff line number	Diff line change
`@@ -6,6 +6,7 @@`
`6`	`6`	`#`
`7`	`7`	`docker build \`
`8`	`8`	`--build-arg WDT_MODEL=simple-topology.yaml \`
	`9`	`+ --build-arg WDT_VARIABLE=simple-topology.properties \`
`9`	`10`	`--build-arg WDT_ARCHIVE=archive.zip \`
`10`		`- -t 12213-domain-wdt .`
	`11`	`+ -t 12213-domain-wdt-test .`
`11`	`12`