More alignment for operator

Author: CarolynRountree

samples/docker-domain/Dockerfile

@@ -48,73 +48,81 @@ MAINTAINER Richard Killen <richard.killen@oracle.com>
 ARG WDT_ARCHIVE
 ARG WDT_VARIABLE
 ARG WDT_MODEL
-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
+ARG CUSTOM_ADMIN_NAME=admin-server
+ARG CUSTOM_ADMIN_HOST=wlsadmin
+ARG CUSTOM_ADMIN_PORT=7001
+ARG CUSTOM_MANAGED_SERVER_PORT=8001
+ARG CUSTOM_DOMAIN_NAME=base_domain
+ARG CUSTOM_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
+# Weblogic and Domain locations
+# Set the start derby in admin server flag to true. Override this in the runtime properties
+# The boot.properties will be created under the DOMAIN_HOME when the admin server container is run 
+# WDT installation
 # ---------------------------
-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 ADMIN_NAME=${CUSTOM_ADMIN_NAME} \
+    ADMIN_HOST=${CUSTOM_ADMIN_HOST} \
+    ADMIN_PORT=${CUSTOM_ADMIN_PORT} \
+    MANAGED_SERVER_NAME=${MANAGED_SERVER_NAME} \
+    MANAGED_SERVER_PORT=${CUSTOM_MANAGED_SERVER_PORT} \
+    DEBUG_PORT=${CUSTOM_DEBUG_PORT} \
+    DERBY_FLAG="true" \
+    ORACLE_HOME=/u01/oracle \
+    DOMAIN_NAME=${CUSTOM_DOMAIN_NAME} \
+    DOMAIN_PARENT=${ORACLE_HOME}/user_projects/domains 
 
-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 DOMAIN_HOME=$DOMAIN_PARENT/${DOMAIN_NAME} \
+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}
-    
+    PATH=$PATH:${ORACLE_HOME}/oracle_common/common/bin:${ORACLE_HOME}/wlserver/common/bin:${DOMAIN_HOME}:${DOMAIN_HOME}/bin:${ORACLE_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} && \
+RUN chmod +xw $SCRIPT_HOME/*.sh && \ 
+    chown -R oracle:oracle ${SCRIPT_HOME} && \
+    mkdir -p +xwr $PROPERTIES_FILE_DIR && \
+    chown -R oracle:oracle $PROPERTIES_FILE_DIR && \
     mkdir -p $DOMAIN_PARENT && \
+    chown -R oracle:oracle $DOMAIN_PARENT && \
     chmod -R a+xwr $DOMAIN_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  
+    chmod -R +xw weblogic-deploy/lib/python   && \
+    chown -R oracle:oracle weblogic-deploy 
+
+# Persist the WDT tool home location
+ENV WDT_HOME=$WDT_HOME/weblogic-deploy 
 
 # 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
 
-COPY ${WDT_MODEL} ${WDT_ARCHIVE} ${WDT_VARIABLE} properties/docker_build/*.properties ${PROPERTIES_FILE_DIR}/
+COPY ${WDT_MODEL} ${WDT_ARCHIVE} ${WDT_VARIABLE} properties/docker-build/*.properties ${PROPERTIES_FILE_DIR}/
+# --chown for COPY is available in docker version 18 'COPY --chown oracle:oracle'
+RUN chown -R oracle:oracle ${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.
-
-ENV WDT_HOME=$WDT_HOME/weblogic-deploy 
-
+#
 # Set WORKDIR for @@PWD@@ global token in model file
 WORKDIR $ORACLE_HOME
+USER oracle
 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 \
@@ -123,16 +131,17 @@ RUN if [ -n "$WDT_MODEL" ]; then MODEL_OPT="-model_file $PROPERTIES_FILE_DIR/${W
         $VARIABLE_OPT  \
         $MODEL_OPT \
         $ARCHIVE_OPT && \
-    chown -R oracle:oracle $DOMAIN_PARENT && \
+    chmod -R a+x $DOMAIN_HOME/bin/*.sh && \
     rm -rf $PROPERTIES_FILE_DIR 
 
+# Mount the domain home and the WDT home for easy access.
 VOLUME $DOMAIN_HOME
+VOLUME $WDT_HOME
 
 # Expose admin server, managed server port and domain debug port
-EXPOSE $ADMIN_PORT $MS_PORT $DEBUG_PORT
+EXPOSE $ADMIN_PORT $MANAGED_SERVER_PORT $DEBUG_PORT
 
-# Define default command to start bash.
-WORKDIR $SCRIPT_HOME
-USER oracle
+WORKDIR $DOMAIN_HOME
 
-CMD ["./startWLSDomain.sh"]
+# Define default command to start bash.
+CMD ["/u01/oracle/startAdminServer.sh"]

samples/docker-domain/README.md

@@ -38,7 +38,7 @@ 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 \
+          --build-arg WDT_VARIABLE=container-scripts/domain.properties \
           --force-rm=true \
           -t 12213-domain-wdt .
 

samples/docker-domain/build.sh

@@ -15,5 +15,6 @@ docker build \
     --build-arg WDT_MODEL=simple-topology.yaml \
     --build-arg WDT_VARIABLE=properties/docker-build/domain.properties \
     --build-arg WDT_ARCHIVE=archive.zip \
+    --force-rm=true \
     -t 12213-domain-wdt .
 

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

@@ -1,6 +1,6 @@
 #!/bin/bash ex
 
-# Copyright (c) 2017, 2018, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2018, Oracle and/or its affiliates. All rights reserved.
 # The Universal Permissive License (UPL), Version 1.0
 #
 # This example creates the BUILD_ARG environment variable as a string of --build-arg for 
@@ -29,35 +29,42 @@ if [ -n "$DOMAIN_DIR" ]; then
      DOMAIN_NAME=$DOMAIN_DIR
      export DOMAIN_NAME
      echo DOMAIN_NAME=$DOMAIN_NAME
-     BUILD_ARG="$BUILD_ARG --build-arg ARG_DOMAIN_NAME=$DOMAIN_NAME"
+     BUILD_ARG="$BUILD_ARG --build-arg CUSTOM_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 ARG_ADMIN_HOST=$ADMIN_HOST"
+    BUILD_ARG="$BUILD_ARG --build-arg CUSTOM_ADMIN_HOST=$ADMIN_HOST"
+fi
+
+ADMIN_NAME=`awk '{print $1}' $PROPERTIES_FILE | grep ^ADMIN_NAME= | cut -d "=" -f2`
+if [ -n "$ADMIN_NAME" ]; then
+    export ADMIN_NAME
+    echo ADMIN_NAME=$ADMIN_NAME
+    BUILD_ARG="$BUILD_ARG --build-arg CUSTOM_ADMIN_NAME=$ADMIN_NAME"
 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 ARG_ADMIN_PORT=$ADMIN_PORT"
+    BUILD_ARG="$BUILD_ARG --build-arg CUSTOM_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 ARG_MS_PORT=$MS_PORT"
+MANAGED_SERVER_PORT=`awk '{print $1}' $PROPERTIES_FILE | grep ^MANAGED_SERVER_PORT= | cut -d "=" -f2`
+if [ -n "$MANAGED_SERVER_PORT" ]; then
+    export MANAGED_SERVER_PORT 
+    echo MANAGED_SERVER_PORT=$MANAGED_SERVER_PORT
+    BUILD_ARG="$BUILD_ARG --build-arg CUSTOM_MANAGED_SERVER_PORT=$MANAGED_SERVER_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 ARG_DEBUG_PORT=$DEBUG_PORT"
+    BUILD_ARG="$BUILD_ARG --build-arg CUSTOM_DEBUG_PORT=$DEBUG_PORT"
 fi
 
 echo BUILD_ARG=$BUILD_ARG

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

@@ -0,0 +1,71 @@
+#!/bin/bash
+#
+#Copyright (c) 2018, Oracle and/or its affiliates. All rights reserved.
+#
+#Licensed under the Universal Permissive License v 1.0 as shown at http://oss.oracle.com/licenses/upl.
+#
+# Start the domain Admin Server.
+
+# Locate the runtime properties
+PROPERTIES_FILE=${PROPERTIES_FILE_DIR}/security.properties
+if [ ! -e "$PROPERTIES_FILE" ]; then
+    echo "A security.properties file with the username and password needs to be supplied."
+    exit
+fi
+
+# Define Admin Server JAVA_OPTIONS
+JAVA_OPTIONS=`awk '{print $1}' $PROPERTIES_FILE | grep ^JAVA_OPTIONS= | cut -d "=" -f2`
+if [ -z "${JAVA_OPTIONS}" ]; then
+    JAVA_OPTIONS="-Dweblogic.StdoutDebugEnabled=false"
+fi
+export ${JAVA_OPTIONS}
+echo "Java Options: ${JAVA_OPTIONS}"
+
+echo "I am here"
+# Define start of Derby Database
+echo "start derby"
+CUSTOM_DERBY_FLAG=`awk '{print $1}' $PROPERTIES_FILE | grep ^DERBY_FLAG= | cut -d "=" -f2`
+if [ -n "${CUSTOM_DERBY_FLAG}" ]; then
+    echo got a derby flag from prop
+    DERBY_FLAG="${CUSTOM_DERBY_FLAG}"
+fi
+echo found the dervby
+export ${DERBY_FLAG}
+echo "Start Derby: ${DERBY_FLAG}"
+
+export AS_HOME="${DOMAIN_HOME}/servers/${ADMIN_NAME}"
+export AS_SECURITY="${AS_HOME}/security"
+export AS_LOGS="${AS_HOME}/logs"
+
+if [ -f ${AS_LOGS}}/${ADMIN_NAME}.log ]; then
+    exit
+fi
+
+echo "Admin Server Home: ${AS_HOME}"
+echo "Admin Server Security: ${AS_SECURITY}"
+echo "Admin Server Logs: ${AS_LOGS}"
+
+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."
+    exit 1
+fi
+
+PASS=`awk '{print $1}' $PROPERTIES_FILE | grep ^password= | cut -d "=" -f2`
+if [ -z "$PASS" ]; then
+    echo "The domain password is blank.  The Admin password must be set in the properties file."
+    exit 1
+fi
+
+mkdir -p ${AS_SECURITY}
+echo "username=${USER}" >> ${AS_SECURITY}/boot.properties
+echo "password=${PASS}" >> ${AS_SECURITY}/boot.properties
+
+# Start Admin Server and tail the logs
+${DOMAIN_HOME}/bin/setDomainEnv.sh
+${DOMAIN_HOME}/startWebLogic.sh
+
+tail -f ${AS_LOGS}/${ADMIN_NAME}.log &
+
+childPID=$!
+wait $childPID

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

@@ -1,21 +1,42 @@
 #!/bin/bash
 #
-#Copyright (c) 2014-2018 Oracle and/or its affiliates. All rights reserved.
+#Copyright (c) 2018, Oracle and/or its affiliates. All rights reserved.
 #
 #Licensed under the Universal Permissive License v 1.0 as shown at http://oss.oracle.com/licenses/upl.
 #
-# Start the Domain.
+# Start a Domain Managed Server.
 
-PROPERTIES_FILE=/u01/oracle/properties/security.properties
+PROPERTIES_FILE=${PROPERTIES_FILE_DIR}/security.properties
 if [ ! -e "$PROPERTIES_FILE" ]; then
-    echo "A properties file with variable definitions needs to be supplied."
+    echo "A security.properties file with variable definitions needs to be supplied."
     exit
 fi
 
+JAVA_OPTIONS=`awk '{print $1}' $PROPERTIES_FILE | grep ^JAVA_OPTIONS= | cut -d "=" -f2`
+if [ -z "$JAVA_OPTIONS" ]; then
+    JAVA_OPTIONS="-Dweblogic.StdoutDebugEnabled=false"
+fi
+
+export MS_HOME="${DOMAIN_HOME}/servers/${MANAGED_SERVER_NAME}"
+export MS_SECURITY="${MS_HOME}/security"
+export MS_LOGS="${MS_HOME}/logs"
+
+if [ -f ${MS_LOGS}/${MANAGED_SERVER_NAME}.log ]; then
+    exit
+fi
+
+# Wait for the domain Admin Server to become available
+${SCRIPT_HOME}/waitForAdminServer.sh
+
+echo "Managed Server Name: ${MANAGED_SERVER_NAME}"
+echo "Managed Server Home: ${MS_HOME}"
+echo "Managed Server Security: ${MS_SECURITY}"
+echo "Managed Server Logs: ${MS_LOGS}"
+
 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."
-    exit
+    exit 
 fi
 
 PASS=`awk '{print $1}' $PROPERTIES_FILE | grep ^password= | cut -d "=" -f2`
@@ -24,14 +45,17 @@ if [ -z "$PASS" ]; then
     exit
 fi
 
-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
+mkdir -p ${MS_SECURITY}
+echo username=$USER > ${MS_SECURITY}/boot.properties
+echo password=$PASS >> ${MS_SECURITY}/boot.properties
+
+# Start Managed Server 
+${DOMAIN_HOME}/bin/setDomainEnv.sh
+echo 'Start Managed Server: ${MANAGED_SERVER_NAME}'
+${DOMAIN_HOME}/bin/startManagedWebLogic.sh ${MANAGED_SERVER_NAME} http://${ADMIN_HOST}:${ADMIN_PORT}
 
-# Start Managed Server and tail the logs
-${DOMAIN_HOME}/bin/startManagedWebLogic.sh $MS_NAME http://$ADMIN_HOST:$ADMIN_PORT
-touch ${DOMAIN_HOME}/servers/$MS_NAME/logs/${MS_NAME}.log
-tail -f ${DOMAIN_HOME}/servers/$MS_NAME/logs/${MS_NAME}.log &
+# Tail Managed Server Log
+tail -f ${MS_LOGS}/${MANAGED_SERVER_NAME}.log &
 
 childPID=$!
 wait $childPID