Changes to properties

Author: CarolynRountree

samples/docker-domain/Dockerfile

@@ -29,70 +29,81 @@ FROM oracle/weblogic:12.2.1.3-developer
 
 # Maintainer
 # ----------
-MAINTAINER Monica Riccelli <monica.riccelli@oracle.com>
+MAINTAINER Richard Killen <richard.killen@oracle.com>
 
 ARG WDT_MODEL
 ARG WDT_ARCHIVE
+ARG WDT_VARIABLE
 
 # WLS Configuration
 # ---------------------------
-ENV ADMIN_HOST="wlsadmin" \
-    NM_PORT="5556" \
-    MS_PORT="8001" \
-    DEBUG_PORT="8453" \
-    ORACLE_HOME=/u01/oracle \
-    SCRIPT_FILE=/u01/oracle/createAndStartWLSDomain.sh \
-    CONFIG_JVM_ARGS="-Dweblogic.security.SSL.ignoreHostnameVerification=true"  \
-    PATH=$PATH:/u01/oracle/oracle_common/common/bin:/u01/oracle/wlserver/common/bin:/u01/oracle/user_projects/domains/${DOMAIN_NAME:-base_domain}/bin:/u01/oracle
+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}
 
-# Domain and Server environment variables
+# WDT install and WDT user files
+# COPY
 # ------------------------------------------------------------
-ENV DOMAIN_NAME="${DOMAIN_NAME:-base_domain}" \
-    PRE_DOMAIN_HOME=/u01/oracle/user_projects \
-    ADMIN_PORT="${ADMIN_PORT:-7001}" \
+ENV COPY_PROPERTIES="poperties/docker_build" \
+    INSTALL_HOME="/u01" \
     WDT_MODEL="$WDT_MODEL" \
-    WDT_ARCHIVE="$WDT_ARCHIVE"
+    WDT_ARCHIVE="$WDT_ARCHIVE" \
+    WDT_VARIABLE="WDT_VARIABLE"
 
 # Add files required to build this image
-COPY container-scripts/* /u01/oracle/
-COPY weblogic-deploy.zip /u01
-COPY ${WDT_MODEL} ${ARCHIVE_FILE} /u01/
-
-# this file contains credentials.
-# be sure to build with --force-rm to eliminate this container layer
-COPY properties /u01/oracle
+COPY container-scripts/* ${INSTALL_HOME}
+COPY weblogic-deploy.zip ${INSTALL_HOME}
 
-# Create directory where domain will be written to
 USER root
-RUN chmod +xw /u01/oracle/*.sh && \
-    chmod +xw /u01/oracle/*.py && \
-    mkdir -p $PRE_DOMAIN_HOME && \
-    mkdir -p $PRE_DOMAIN_HOME/domains && \
-    chmod a+xr $PRE_DOMAIN_HOME && \
-    chown -R oracle:oracle $PRE_DOMAIN_HOME && \
-    cd /u01 && \
-    $JAVA_HOME/bin/jar xf /u01/weblogic-deploy.zip && \
-    chmod +xw /u01/weblogic-deploy/bin/*.sh && \
-    chmod -R +xw /u01/weblogic-deploy/lib/python && \
-    if [ -n "$WDT_MODEL" ]; then MODEL_OPT="-model_file /u01/$WDT_MODEL"; fi && \
-    if [ -n "$WDT_ARCHIVE" ]; then ARCHIVE_OPT="-archive_file /u01/$WDT_ARCHIVE"; fi && \
+RUN chmod +xw ${INSTALL_HOME}/*.sh && \
+    mkdir +xwr ${PROPERTIES_FILE_DIR} && \
+    chown -R oracle:oracle ${PROPERTIES_FILE_DIR} && \
+    mkdir -p $DOMAIN_HOME_PARENT && \
+    chown -R oracle:oracle $DOMAIN_HOME_PARENT && \
+    chmod -R a+xwr $DOMAIN_HOME_PARENT
+
+COPY ${WDT_MODEL} ${WDT_ARCHIVE} ${WDT_VARIABLE} ${COPY_PROPERTIES}/*.properties ${PROPERTIES_FILE_DIR}/
+
+# export domain and server specific variables into environment
+RUN /bin/sh ${INSTALL_HOME}/setEnv.sh
+
+# 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}:
+
+# 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 \
         -java_home ${JAVA_HOME} \
-        -domain_parent $PRE_DOMAIN_HOME/domains \
+        -domain_home ${DOMAIN_HOME} \
         -domain_type WLS \
-        -variable_file /u01/oracle/domain.properties \
+        $VARIABLE_OPT \
         $MODEL_OPT \
         $ARCHIVE_OPT && \
-    chown -R oracle:oracle $PRE_DOMAIN_HOME && \
-    rm /u01/oracle/domain.properties
+    rm ${PROPERTIES_FILE_DIR}/*
 
 VOLUME $PRE_DOMAIN_HOME
 # Expose Node Manager default port, and also default for admin and managed server
-EXPOSE $NM_PORT $ADMIN_PORT $MS_PORT $DEBUG_PORT
+EXPOSE $ADMIN_PORT $MS_PORT $DEBUG_PORT
 
 USER oracle
 WORKDIR $ORACLE_HOME
 
 # Define default command to start bash.
-CMD ["/u01/oracle/startWLSDomain.sh"]
+CMD ["${ORACLE_HOME}/startWLSDomain.sh"]

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

@@ -0,0 +1,38 @@
+#!/bin/bash
+#
+# 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 [ ! -e "$WDT_VARIABLE" ]; then
+    echo "A properties file with variable definitions should be supplied."
+    goto envexit
+fi
+
+DOMAIN_NAME=`awk '{print $1}' $WDT_VARIABLE | grep ^DOMAIN_NAME= | cut -d "=" -f2`
+if [ -n "$DOMAIN_NAME" ]; then
+    export DOMAIN_NAME
+fi
+
+ADMIN_HOST=`awk '{print $1}' $WDT_VARIABLE | grep ^ADMIN_HOST= | cut -d "=" -f2`
+if [ -n "$ADMIN_HOST" ]; then
+    export ADMIN_HOST
+fi
+
+ADMIN_PORT=`awk '{print $1}' $WDT_VARIABLE | grep ^ADMIN_PORT= | cut -d "=" -f2`
+if [ -n "$ADMIN_PORT" ]; then
+    export ADMIN_PORT
+fi
+
+MS_PORT=`awk '{print $1}' $WDT_VARIABLE | grep ^MS_PORT= | cut -d "=" -f2`
+if [ -n "$MS_PORT" ]; then
+    export MS_PORT
+fi
+
+DEBUG_PORT=`awk '{print $1}' $WDT_VARIABLE | grep ^MS_PORT= | cut -d "=" -f2`
+if [ -n "$DEBUG_PORT" ]; then
+    export DEBUG_PORT
+fi
+
+envexit:

samples/docker-domain/properties/docker_build/adminpass.properties

@@ -0,0 +1 @@
+ADMIN_PASS=welcome1

samples/docker-domain/properties/docker_build/adminuser.properties

@@ -0,0 +1 @@
+ADMIN_USER=weblogic

samples/docker-domain/properties/docker_run/security.properties

@@ -0,0 +1,3 @@
+ADMIN_USER=weblogic
+ADMIN_PASS=welcome1
+DOMAIN_NAME=my_domain

samples/docker-domain/properties/domain.properties

@@ -0,0 +1,30 @@
+# These variables are used for substitution in the WDT model file.
+# Any port that will be exposed through Docker is put in this file.
+# The sample Dockerfile will get the ports from this file and not the WDT model.
+DOMAIN_NAME=my_domain
+DB_USER=dba
+DB_PASSWORD=dba1
+ADMIN_PORT=7001
+ADMIN_HOST=wlsadmin
+ADMIN_NAME=admin-server
+DEBUG_PORT=8453
+ADMIN_HOST=wlsadmin
+MANAGED_SERVER_PORT
+MANAGED_SERVER_NAME_BASE=ms-
+CONFIGURED_MANAGED_SERVER_COUNT=2
+CLUSTER_NAME=cluster-1
+DEBUG_FLAG=true
+PRODUCTION_MODE_ENABLED=true
+CLUSTER_TYPE=DYNAMIC
+JAVA_OPTIONS="-Dweblogic.StdoutDebugEnabled=false -Dweblogic.security.SSL.ignoreHostnameVerification=true"
+#Derby Data Source parameters
+dsname=DockerDS
+dsdbname=default;create=true
+dsjndiname=jdbc/DockerDS
+dsdriver=org.apache.derby.jdbc.ClientDataSource
+dsurl=jdbc:derby://localhost:1527/default;ServerName=localhost;databaseName=default;create=true
+dsusername=dbuser
+dspassword=dbpassword
+dstestquery=SQL SELECT 1 FROM SYS.SYSTABLES
+dsinitalcapacity=0
+dsmaxcapacity=1

samples/docker-domain/simple-topology.properties

@@ -1,49 +1,32 @@
 domainInfo:
-    AdminUserName: '@@PROP:username@@'
-    AdminPassword: '@@PROP:password@@'
-    ServerStartMode: prod
+    AdminUserName: '@@FILE:/u01/oracle/properties/adminuser.properties@@'
+    AdminPassword: '@@FILE:/u01/oracle/properties/adminpass.properties@@'
+    ServerStartMode: '@@PROP:PRODUCTION_MODE_ENABLED@@'
 topology:
     Name: '@@PROP:DOMAIN_NAME@@'
-    AdminServerName: AdminServer
+    AdminServerName: '@@PROP:ADMIN_NAME@@'
+    DebugPort
     Cluster:
-        mycluster:
+        '@@PROP:CLUSTER_NAME@@':
+            ClusterType: '@@PROP:CLUSTER_TYPE@@PROP'
             ClientCertProxyEnabled: true
             ClusterMessagingMode: unicast
             DynamicServers:
                 ServerTemplate: template1
                 CalculatedListenPorts: false
-                ServerNamePrefix: 'ms-'
+                ServerNamePrefix: '@@PROP:MANAGED_SERVER_NAME_BASE@@'
                 DynamicClusterSize: 2
                 MaxDynamicClusterSize: 8
     Server:
         AdminServer:
-            Machine: machine1
             ListenPort: '@@PROP:ADMIN_PORT@@'
     ServerTemplate:
         template1:
-            Machine: machine1
-            ListenPort: 9001
-    Machine:
-        machine1:
-            Notes: The only machine
-            NodeManager:
-                NMType: SSL
-                ListenPort: 5556
-                Notes: The only node manager
-    SecurityConfiguration:
-        NodeManagerUsername: '@@PROP:NM_USER@@'
-        NodeManagerPasswordEncrypted: '@@PROP:NM_PASSWORD@@'
-    JMX:
-        InvocationTimeoutSeconds: 40
-        Notes: JMX notes
-        ManagedServerNotificationsEnabled: true
-    JTA:
-        MaxTransactions: 4
-        Notes: JTA notes
+            ListenPort: '@@PROP:MS_PORT@@'
 resources:
     JDBCSystemResource:
         Generic1:
-            Target: mycluster
+            Target: '@@PROP:CLUSTER_NAME@@'
             JdbcResource:
                 JDBCDataSourceParams:
                     JNDIName: [ jdbc/generic1, jdbc/special1 ]
@@ -67,7 +50,7 @@ appDeployments:
         # Quote needed because of hyphen in string
         'simple-app':
             SourcePath: 'wlsdeploy/applications/simple-app.war'
-            Target: mycluster
+            Target: '@@PROP:CLUSTER_NAME@@'
             ModuleType: war
             StagingMode: nostage
             PlanStagingMode: nostage