push changes for property problems

Author: CarolynRountree

samples/docker-domain/README.md

@@ -98,13 +98,13 @@ To start the containerized Administration Server, run:
 
     $ 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:
+To start a containerized Managed Server (managed-server-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/docker_run:/u01/oracle/properties -e MANAGED_SERVER_NAME=managed-server-1 12213-domain-wdt startManagedServer.sh
+    $ docker run -d --name managed-server-1 --link wlsadmin:wlsadmin -p 9001:9001 -v <sample-directory>/properties/docker_run:/u01/oracle/properties -e MANAGED_SERVER_NAME=managed-server-1 12213-domain-wdt startManagedServer.sh
 
-To start an additional Managed Server (in this example ms-2), run:
+To start an additional Managed Server (in this example managed-server-2), run:
 
-    $ docker run -d --name ms-2 --link wlsadmin:wlsadmin -p 9002:9001 -v <sample-directory>/properties/docker_run/:/u01/oracle/properties -e MANAGED_SERVER_NAME=managed-server-2 12213-domain-wdt startManagedServer.sh
+    $ docker run -d --name managed-server-2 --link wlsadmin:wlsadmin -p 9002:9001 -v <sample-directory>/properties/docker_run/:/u01/oracle/properties -e MANAGED_SERVER_NAME=managed-server-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.
 

samples/docker-domain/properties/docker-build/domain.properties

@@ -6,7 +6,7 @@ ADMIN_PORT=7001
 ADMIN_NAME=admin-server
 ADMIN_HOST=wlsadmin
 MANAGED_SERVER_PORT=8001
-MANAGED_SERVER_NAME_BASE=managed-server
+MANAGED_SERVER_NAME_BASE=managed-server-
 CONFIGURED_MANAGED_SERVER_COUNT=2
 CLUSTER_NAME=cluster-1
 DEBUG_PORT=8453
@@ -17,6 +17,7 @@ JAVA_OPTIONS=-Dweblogic.StdoutDebugEnabled=false
 T3_CHANNEL_PORT=30012
 T3_PUBLIC_ADDRESS=kubernetes
 SERVER_START_MODE=prod
+CLUSTER_ADMIN=cluster-1,admin-server
 # Derby Data Source parameters
 dsname=DockerDS
 dsdbname=DerbyDB;create=true

samples/docker-domain/simple-topology.yaml

@@ -22,18 +22,18 @@ topology:
                 T3Channel:
                     ListenAddress: None
                     ListenPort: '@@PROP:T3_CHANNEL_PORT@@'
-                    PublicAddress: '@@PROP:T3_PUBLIC_ADDRESS'
+                    PublicAddress: '@@PROP:T3_PUBLIC_ADDRESS@@'
                     PublicPort: '@@PROP:T3_CHANNEL_PORT@@'
     ServerTemplate:
         template1:
             ListenPort: '@@PROP:MANAGED_SERVER_PORT@@'
 resources:
     JDBCSystemResource:
         '@@PROP:dsname@@':
-            Target: '@@PROP:CLUSTER_NAME@@'
+            Target: '@@PROP:CLUSTER_ADMIN@@'
             JdbcResource:
                 JDBCDataSourceParams:
-                    JNDIName: [ '@@PROP:dsjndiname@@' ]
+                    JNDIName: '@@PROP:dsjndiname@@'
                     GlobalTransactionsProtocol: None
                 JDBCDriverParams:
                     DriverName: '@@PROP:dsdriver@@'