Incorporating Monica's feedback comments

Author: aseembajaj

OracleWebLogic/samples/12212-msiserver/Dockerfile

@@ -27,15 +27,23 @@ MAINTAINER Aseem Bajaj <aseem.bajaj@oracle.com>
 # Arguments
 # ---------
 ARG number_of_ms=10
+ARG domains_dir=wlserver/samples/domains
+ARG domain_name=msi-sample
+ARG ms_name_prefix=ms
+ARG ms_port=8011
+ARG prod_or_dev=dev
 
 # Environment variables required for this build (do NOT change)
 # -------------------------------------------------------------
 ENV MW_HOME="$ORACLE_HOME" \
     PATH="$ORACLE_HOME/wlserver/server/bin:$ORACLE_HOME/wlserver/../oracle_common/modules/org.apache.ant_1.9.2/bin:$JAVA_HOME/jre/bin:$JAVA_HOME/bin:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:$ORACLE_HOME/oracle_common/common/bin:$ORACLE_HOME/wlserver/common/bin:$ORACLE_HOME/user_projects/domains/medrec/bin:$ORACLE_HOME/wlserver/samples/server/medrec/:$ORACLE_HOME/wlserver/samples/server/:$ORACLE_HOME/wlserver/../oracle_common/modules/org.apache.maven_3.2.5/bin" \
     NUMBER_OF_MS=$number_of_ms \
-    DOMAINS_DIR=$ORACLE_HOME/wlserver/samples/domains \
-    DOMAIN_NAME=msi-sample \
-    DEFAULT_MS_NAME=ms1
+    DOMAINS_DIR=$ORACLE_HOME/$domains_dir \
+    DOMAIN_NAME=$domain_name \
+    MS_NAME_PREFIX=$ms_name_prefix \
+    DEFAULT_MS_NAME=${ms_name_prefix}1 \
+    MS_PORT=$ms_port \
+    PROD_OR_DEV=$prod_or_dev
 
 # Copy scripts
 # --------------------------------
@@ -46,8 +54,8 @@ COPY container-scripts/* /u01/oracle/
 # ---------------------------------------------
 RUN . $ORACLE_HOME/wlserver/server/bin/setWLSEnv.sh && \
     cd /u01/oracle && \
-    ./provision-domain-for-msi.sh $DOMAIN_NAME $ORACLE_HOME/wlserver/common/templates/wls/wls.jar $DOMAINS_DIR weblogic weblogic1 8001 $DEFAULT_MS_NAME 8011 dev $NUMBER_OF_MS
+    ./provision-domain-for-msi.sh $DOMAIN_NAME $ORACLE_HOME/wlserver/common/templates/wls/wls.jar $DOMAINS_DIR weblogic weblogic1 8001 $DEFAULT_MS_NAME $MS_PORT $PROD_OR_DEV $NUMBER_OF_MS $MS_NAME_PREFIX
 
-EXPOSE 8011
+EXPOSE $MS_PORT
 WORKDIR $DOMAINS_DIR/$DOMAIN_NAME
 ENTRYPOINT ["/u01/oracle/launcher.sh"]

OracleWebLogic/samples/12212-msiserver/Dockerfile.addapp

@@ -46,4 +46,4 @@ COPY ${source} /u01/apps/${simple_filename}
 # WLST offline use to update domain configuration
 # ---------------------------------------------
 RUN . $ORACLE_HOME/wlserver/server/bin/setWLSEnv.sh && \
-    java weblogic.WLST /u01/oracle/add-app-to-domain.py $ORACLE_HOME/wlserver/samples/domains/msi-sample $NUMBER_OF_MS $name /u01/apps/${simple_filename}
+    java weblogic.WLST /u01/oracle/add-app-to-domain.py $DOMAINS_DIR/$DOMAIN_NAME $NUMBER_OF_MS $name /u01/apps/${simple_filename} $MS_NAME_PREFIX

OracleWebLogic/samples/12212-msiserver/README.md

@@ -2,7 +2,11 @@ Example of docker images with WebLogic server in MSI Mode
 =========================================================
 This Dockerfile extends the Oracle WebLogic image by creating a domain that configures a managed
 server in MSI mode (or Managed Server Independence mode). In this mode, a managed server can run
-without the need of an admin server
+without the need of an admin server. Such a managed server is not driven by admin server for
+configuration or deployment changes. However, it can handle all configuration and deploymnets
+already in config.xml like any other managed server. For use cases where the managed server does
+not need to be updated for configuration or deployments, this image can be used by itself without
+running a admin server or node manager
 
 How to build and run the base image
 -----------------------------------
@@ -36,15 +40,32 @@ deployed to it yet. When additional images are created by adding application(s)
 the same command (as above) may be used to launch the server and accessed using the URL
 http://localhost:8011/<relevant-context-root>
 
-Randomly generated managed server name can both be overridden using environment variable.
-For example, the following command may be used to run a managed server with name ms1
+Randomly generated managed server name can be overridden using build arguments or runtime variables.
+
+**Build Argument ms_name_prefix**
+This argument may be used to alter the prefix of managed server name, and a random
+number prefix is appended to it. For example, the following command may be used to
+run a managed with a name managedServer<RandomNumber>
 
-docker run --name msiserver --env MS_NAME=ms1 12212-msiserver
+docker build -t 12212-msiserver --build-arg ms_name_prefix=managedServer .
 
+**Build Argument number_of_ms**
 By default, this image comes configured with 10 managed servers, ms1 to ms10. However, the image
 can be built with configurable number of managed servers using NUMBER_OF_MS argument
 
-docker build -t 12212-msiserver --build-arg NUMBER_OF_MS=15 .
+docker build -t 12212-msiserver --build-arg number_of_ms=15 .
+
+**Other build arguments**
+* domain_name may be used to identify the name of generated domain that gets packed into MSI image. Default value msi-sample
+* domains_dir may be used identify the directory under $ORACLE_HOME where the domain home directory is created. Default value wlserver/samples/domains 
+* ms_port may be used to configure port of the managed server, default is 8011
+* prod_or_dev may be used to identify whether server is started in production or development mode. Defaults to "dev" for development mode.
+
+**Runtime Argument MS_NAME**
+This argument may be used to completely override the managed server name.
+For example, the following command may be used to run a managed server with name ms1
+
+docker run --name msiserver --env MS_NAME=managedServer1 12212-msiserver
 
 How to use the base image to add application
 --------------------------------------------
@@ -63,6 +84,12 @@ summercamps app will now be accessible at
 http://localhost:8011/
 
 As with the base image, you can still override managed server name and cluster name
+**Build arguments**
+Three build arguments may be used to customize the image to include an application of user
+choice. By default, the build arguments point to an example application included in this
+sample. The "name" argument helps identify the name of deployment, while the "source"
+argument helps identify the source of the application. The source is copied into the image.
+So "simple_filename" helps identify the name of the file where the source is copied to
 
 Using swarm service creation with this image
 --------------------------------------------

OracleWebLogic/samples/12212-msiserver/container-scripts/add-app-to-domain.py

@@ -2,11 +2,13 @@
 number_of_ms = int(sys.argv[2])
 app_name = sys.argv[3]
 app_location = sys.argv[4]
+ms_name_prefix = sys.argv[5]
 
 print('domain_path     : [%s]' % domain_path);
 print('app_name     : [%s]' % app_name);
 print('app_location     : [%s]' % app_location);
 print('number_of_ms     : [%s]' % number_of_ms);
+print('ms_name_prefix     : [%s]' % ms_name_prefix);
 
 # Open default domain template
 # ======================
@@ -19,9 +21,9 @@
 cd('/AppDeployments/%s/' % app_name)
 set('StagingMode', 'nostage')
 set('SourcePath', app_location)
-targets = 'ms1'
+targets = ms_name_prefix + str(1)
 for index in range(2, number_of_ms + 1):
-  targets = targets + ',ms%s' % index
+  targets = targets + ',%s' % (ms_name_prefix + str(index))
 set('Target', targets)
 
 # Write Domain

OracleWebLogic/samples/12212-msiserver/container-scripts/launcher.sh

@@ -2,7 +2,7 @@
 
 ms_name_from_image=${DEFAULT_MS_NAME}
 number_of_ms=${NUMBER_OF_MS}
-ms_name=${MS_NAME:-ms$(( ( RANDOM % $number_of_ms )  + 1 ))}
+ms_name=${MS_NAME:-${MS_NAME_PREFIX}$(( ( RANDOM % $number_of_ms )  + 1 ))}
 domain_home=${DOMAINS_DIR}/${DOMAIN_NAME}
 
 echo "Launching with parameters"
@@ -19,17 +19,19 @@ if [ "$ms_name_from_image" != "$ms_name" ]; then
   mv servers/$ms_name_from_image servers/$ms_name
 fi
 
+bin/startManagedWebLogic.sh $ms_name
+
 # Relays SIGTERM to all java processes
-function relay_SIGTERM {
-  pid=`grep java /proc/[0-9]*/comm | awk -F / '{ print $3; }'`
-  echo "Sending SIGTERM to java process " $pid
-  kill -SIGTERM $pid
-}
-
-trap relay_SIGTERM SIGTERM
-
-bin/startManagedWebLogic.sh $ms_name &
-while true
-do
-  tail -f /dev/null & wait ${!}
-done
+# function relay_SIGTERM {
+#  pid=`grep java /proc/[0-9]*/comm | awk -F / '{ print $3; }'`
+#  echo "Sending SIGTERM to java process " $pid
+#  kill -SIGTERM $pid
+#}
+
+#trap relay_SIGTERM SIGTERM
+
+# bin/startManagedWebLogic.sh $ms_name &
+# while true
+# do
+  # tail -f /dev/null & wait ${!}
+# done

OracleWebLogic/samples/12212-msiserver/container-scripts/provision-domain-for-msi.py

@@ -10,17 +10,19 @@
 ms_port = int(sys.argv[8])
 production_mode = sys.argv[9]
 number_of_ms = int(sys.argv[10])
+ms_name_prefix = sys.argv[11]
 
 print('domain_name     : [%s]' % domain_name);
 print('template_location     : [%s]' % template_location);
 print('domain_path     : [%s]' % domain_path);
 print('user_name     : [%s]' % user_name);
 print('password     : ********');
 print('as_port      : [%s]' % as_port);
-print('ms_name     : [%s]' % ms_name);
+print('ms_name  : [%s]' % ms_name);
 print('ms_port     : [%s]' % ms_port);
 print('production_mode : [%s]' % production_mode);
 print('number_of_ms : [%s]' % number_of_ms);
+print('ms_name_prefix  : [%s]' % ms_name_prefix);
 
 # Open default domain template
 # ======================
@@ -57,8 +59,8 @@
   cd('/')
   sys.stdout.write('.')
   sys.stdout.flush()
-  create('ms%s' % index, 'Server')
-  cd('/Servers/ms%s/' % index )
+  create(ms_name_prefix + str(index), 'Server')
+  cd('/Servers/%s/' % (ms_name_prefix + str(index) ))
   set('ListenPort', ms_port)
   set('NumOfRetriesBeforeMSIMode', 0)
   set('RetryIntervalBeforeMSIMode', 1)