From 064e6587cf9671fbdb0f2200605035d493323618 Mon Sep 17 00:00:00 2001 From: Rosemary Marano Date: Wed, 23 May 2018 15:10:27 -0400 Subject: [PATCH] fixed copyright date --- OracleFMWInfrastructure/LICENSE | 2 +- OracleFMWInfrastructure/README.md | 4 +- .../dockerfiles/12.2.1.2/Dockerfile | 18 ++++---- .../container-scripts/createInfraDomain.py | 6 +-- .../container-scripts/startManagedServer.sh | 2 +- .../container-scripts/update_listenaddress.py | 2 +- .../dockerfiles/12.2.1.2/install.file | 2 +- .../dockerfiles/12.2.1.3/Dockerfile | 20 ++++---- .../container-scripts/createInfraDomain.py | 6 +-- .../createOrStartInfraDomain.sh | 38 +++++++-------- .../container-scripts/startManagedServer.sh | 2 +- .../container-scripts/update_listenaddress.py | 2 +- .../dockerfiles/12.2.1.3/install.file | 2 +- .../dockerfiles/buildDockerImage.sh | 19 ++++---- .../samples/12212-patch/Dockerfile | 10 ++-- .../samples/12212-patch/README.md | 34 +++++++------- .../dockerfiles/12.1.3/Dockerfile.developer | 28 +++++------ .../dockerfiles/12.1.3/Dockerfile.generic | 26 +++++------ .../dockerfiles/12.1.3/install.file | 2 +- .../dockerfiles/12.2.1.1/Dockerfile.developer | 34 +++++++------- .../dockerfiles/12.2.1.1/Dockerfile.generic | 36 +++++++-------- OracleWebLogic/dockerfiles/12.2.1.1/README.md | 20 ++++---- .../container-scripts/create-wls-domain.py | 4 +- .../createAndStartEmptyDomain.sh | 14 +++--- .../dockerfiles/12.2.1.1/install.file | 2 +- .../dockerfiles/12.2.1.2/Dockerfile.developer | 46 +++++++++---------- .../dockerfiles/12.2.1.2/Dockerfile.generic | 24 +++++----- OracleWebLogic/dockerfiles/12.2.1.2/README.md | 30 ++++++------ .../container-scripts/create-wls-domain.py | 2 +- .../createAndStartEmptyDomain.sh | 14 +++--- .../dockerfiles/12.2.1.2/install.file | 2 +- .../dockerfiles/12.2.1.3/Dockerfile.developer | 46 +++++++++---------- .../dockerfiles/12.2.1.3/Dockerfile.generic | 24 +++++----- OracleWebLogic/dockerfiles/12.2.1.3/README.md | 20 ++++---- .../container-scripts/create-wls-domain.py | 2 +- .../createAndStartEmptyDomain.sh | 14 +++--- .../dockerfiles/12.2.1.3/install.file | 2 +- .../dockerfiles/12.2.1/Dockerfile.developer | 24 +++++----- .../dockerfiles/12.2.1/Dockerfile.generic | 24 +++++----- .../12.2.1/Dockerfile.infrastructure | 26 +++++------ .../dockerfiles/buildDockerImage.sh | 19 ++++---- OracleWebLogic/samples/1213-domain/Dockerfile | 18 ++++---- .../container-scripts/add-machine.py | 2 +- .../container-scripts/add-server.py | 2 +- .../1213-domain/container-scripts/commEnv.sh | 2 +- .../container-scripts/create-wls-domain.py | 2 +- .../container-scripts/createMachine.sh | 2 +- .../container-scripts/createServer.sh | 2 +- .../samples/1221-appdeploy/Dockerfile | 8 ++-- .../samples/1221-appdeploy/README.md | 6 +-- .../container-scripts/app-deploy.py | 6 +-- .../1221-docker-compose/docker-compose.yml | 15 +++--- .../1221-domain-with-resources/Dockerfile | 8 ++-- .../1221-domain-with-resources/README.md | 6 +-- .../container-scripts/ds-deploy.py | 12 ++--- .../container-scripts/jms-deploy.py | 8 ++-- OracleWebLogic/samples/1221-domain/Dockerfile | 12 ++--- OracleWebLogic/samples/1221-domain/README.md | 2 +- .../container-scripts/add-machine.py | 2 +- .../container-scripts/add-server.py | 2 +- .../container-scripts/create-wls-domain.py | 2 +- .../container-scripts/createMachine.sh | 2 +- .../container-scripts/createServer.sh | 2 +- OracleWebLogic/samples/1221-medrec/Dockerfile | 14 +++--- OracleWebLogic/samples/1221-medrec/README.md | 4 +- .../samples/1221-medrec/startSample.sh | 2 +- .../samples/1221-medrec/weblogic.properties | 2 +- .../samples/1221-multihost/README.md | 2 +- .../samples/1221-multihost/bootstrap.sh | 10 ++-- .../1221-multihost/create-container.sh | 4 +- .../samples/1221-multihost/create-machine.sh | 4 +- .../1221-multihost/destroy-all-machines.sh | 2 +- .../samples/1221-multihost/setenv.sh | 2 +- .../samples/1221-multihost/start-webtier.sh | 13 +++--- .../samples/12211-medrec/Dockerfile | 18 ++++---- OracleWebLogic/samples/12211-medrec/README.md | 4 +- .../samples/12211-medrec/startSample.sh | 4 +- OracleWebLogic/samples/12211-patch/Dockerfile | 10 ++-- OracleWebLogic/samples/12211-patch/README.md | 4 +- .../12212-domain-online-config/Dockerfile | 9 ++-- .../12212-domain-online-config/README.md | 6 +-- .../container-scripts/jms-config.properties | 6 +-- .../samples/12212-domain/Dockerfile | 16 +++---- OracleWebLogic/samples/12212-domain/README.md | 6 +-- OracleWebLogic/samples/12212-domain/build.sh | 4 +- .../container-scripts/add-machine.py | 2 +- .../container-scripts/add-server.py | 2 +- .../container-scripts/commonfuncs.py | 2 +- .../container-scripts/create-wls-domain.py | 2 +- .../createAndStartWLSDomain.sh | 14 +++--- .../container-scripts/createMachine.sh | 2 +- .../container-scripts/createServer.sh | 4 +- .../container-scripts/waitForAdminServer.sh | 4 +- .../samples/12212-medrec/Dockerfile | 18 ++++---- OracleWebLogic/samples/12212-medrec/README.md | 4 +- .../samples/12212-medrec/startSample.sh | 4 +- .../samples/12212-msiserver/Dockerfile | 4 +- .../samples/12212-msiserver/Dockerfile.addapp | 6 +-- .../samples/12212-msiserver/README.md | 6 +-- .../samples/12212-oradb-medrec/Dockerfile | 18 ++++---- .../samples/12212-oradb-medrec/README.md | 4 +- .../container-scripts/medrec-ds-deploy.py | 8 ++-- .../container-scripts/startSample.sh | 7 ++- .../samples/12212-oradb-wlsstore/Dockerfile | 14 +++--- .../samples/12212-oradb-wlsstore/README.md | 17 ++++--- .../samples/12212-oradb-wlsstore/build.sh | 2 +- .../container-scripts/app-deploy.py | 6 +-- .../container-scripts/create-wls-domain.py | 2 +- .../createDomainAndStartAdmin.sh | 14 +++--- .../container-scripts/ds-deploy.py | 8 ++-- .../ds-wlst-online-config.sh | 4 +- .../oradatasource.properties | 2 +- .../container-scripts/wlst | 2 +- .../samples/12213-domain/Dockerfile | 20 ++++---- OracleWebLogic/samples/12213-domain/build.sh | 4 +- .../container-scripts/add-machine.py | 2 +- .../container-scripts/add-server.py | 2 +- .../container-scripts/commonfuncs.py | 2 +- .../container-scripts/create-wls-domain.py | 2 +- .../createAndStartWLSDomain.sh | 14 +++--- .../container-scripts/createMachine.sh | 2 +- .../container-scripts/createServer.sh | 2 +- .../container-scripts/waitForAdminServer.sh | 4 +- .../samples/12213-webtier-apache/README.md | 2 +- OracleWebLogic/samples/clean-up-docker.sh | 2 +- OracleWebLogic/samples/rm-containers.sh | 2 +- OracleWebLogic/samples/wls-K8s/README.md | 36 +++++++-------- .../wls-K8s/wls-12213-domain/Dockerfile | 14 +++--- .../wls-12213-domain/Dockerfile.adddemoapps | 5 +- .../wls-12213-domain/Dockerfile.webhook | 5 +- .../container-scripts/add-app-to-domain.py | 2 +- .../container-scripts/provision-domain.py | 2 +- .../container-scripts/provision-domain.sh | 2 +- .../container-scripts/shutdown-servers.py | 2 +- .../container-scripts/startadmin.sh | 8 ++-- .../container-scripts/startms.sh | 8 ++-- .../samples/wls-k8s-domain/README.md | 11 ++--- .../samples/wls-k8s-domain/build.sh | 6 +-- .../wls-k8s-domain/container-scripts/base.py | 10 ++-- .../wls-k8s-domain/container-scripts/run.py | 8 ++-- .../container-scripts/startadmin.sh | 7 ++- .../container-scripts/startms.sh | 4 +- 142 files changed, 636 insertions(+), 659 deletions(-) diff --git a/OracleFMWInfrastructure/LICENSE b/OracleFMWInfrastructure/LICENSE index 1cf6a4632d..9ab72014a7 100644 --- a/OracleFMWInfrastructure/LICENSE +++ b/OracleFMWInfrastructure/LICENSE @@ -1,4 +1,4 @@ -Copyright (c) 2017 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 diff --git a/OracleFMWInfrastructure/README.md b/OracleFMWInfrastructure/README.md index ab3dd01ec2..63bb97701b 100644 --- a/OracleFMWInfrastructure/README.md +++ b/OracleFMWInfrastructure/README.md @@ -35,7 +35,7 @@ You can also pull the Oracle Server JRE 8 image from the [Oracle Container Regis LICENSE UPL 1.0 - Copyright (c) 2014-2017 Oracle and/or its affiliates. All rights reserved. + Copyright (c) 2014-2018 Oracle and/or its affiliates. All rights reserved. **IMPORTANT:** The resulting images will have a domain with an Administration Server and one Managed Server by default. You must extend the image with your own Dockerfile, and create your domain using WLST. @@ -144,4 +144,4 @@ The database is created with the default password `Oradoc_db1`. To change the da `$ docker run -d -p 9801:8001 --network=InfraNET --volumes-from InfraAdminContainer --name InfraManagedContainer --env-file ./infraServer.env.list oracle/fmw-infrastructure:12.2.1.x startManagedServer.sh` ## Copyright -Copyright (c) 2014-2017 Oracle and/or its affiliates. All rights reserved. +Copyright (c) 2014-2018 Oracle and/or its affiliates. All rights reserved. diff --git a/OracleFMWInfrastructure/dockerfiles/12.2.1.2/Dockerfile b/OracleFMWInfrastructure/dockerfiles/12.2.1.2/Dockerfile index 2421532544..99b01e318c 100644 --- a/OracleFMWInfrastructure/dockerfiles/12.2.1.2/Dockerfile +++ b/OracleFMWInfrastructure/dockerfiles/12.2.1.2/Dockerfile @@ -1,22 +1,22 @@ -#Copyright (c) 2014-2017 Oracle and/or its affiliates. All rights reserved. +#Copyright (c) 2014-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. # # ORACLE DOCKERFILES PROJECT # -------------------------- # This is the Dockerfile for Oracle FMW Infrastructure 12.2.1.2 -# +# # HOW TO BUILD THIS IMAGE # ----------------------- # The Oracle FMW Infrastructure image extends the Oracle WebLogic Infrastructure 12.2.1.2 image, you must first build the Oracle WebLogic Infrastructure image. -# Run: +# Run: # $ docker build -f Dockerfile -t oracle/fmw-infrastructure:12.2.1.2 # # IMPORTANT # --------- # The resulting image of this Dockerfile contains a FMW Infra Base Domain. # -# From +# From # ------------------------- FROM oracle/serverjre:8 @@ -25,7 +25,7 @@ FROM oracle/serverjre:8 MAINTAINER Monica Riccelli -# Common environment variables required for this build +# Common environment variables required for this build # ---------------------------------------------------- ENV ORACLE_HOME=/u01/oracle \ SCRIPT_FILES=/u01/oracle/container-scripts/*.sh \ @@ -36,10 +36,10 @@ ENV ORACLE_HOME=/u01/oracle \ PATH=$PATH:/usr/java/default/bin:/u01/oracle/oracle_common/common/bin:/u01/oracle/wlserver/common/bin:/u01/oracle/container-scripts -#USER root +#USER root # Setup subdirectory for FMW install package and container-scripts -# ----------------------------------------------------------------- -RUN mkdir -p /u01 && \ +# ----------------------------------------------------------------- +RUN mkdir -p /u01 && \ chmod a+xr /u01 && \ useradd -b /u01 -d /u01/oracle -m -s /bin/bash oracle && \ mkdir -p /u01/oracle/container-scripts @@ -67,7 +67,7 @@ RUN chown oracle:oracle -R /u01 && \ VOLUME $VOLUME_DIR -# Install +# Install # ------------------------------------------------------------ USER oracle RUN cd /u01 && $JAVA_HOME/bin/jar xf /u01/$FMW_PKG && cd - && \ diff --git a/OracleFMWInfrastructure/dockerfiles/12.2.1.2/container-scripts/createInfraDomain.py b/OracleFMWInfrastructure/dockerfiles/12.2.1.2/container-scripts/createInfraDomain.py index d4ea7260ed..8d8be8df37 100644 --- a/OracleFMWInfrastructure/dockerfiles/12.2.1.2/container-scripts/createInfraDomain.py +++ b/OracleFMWInfrastructure/dockerfiles/12.2.1.2/container-scripts/createInfraDomain.py @@ -1,4 +1,4 @@ -# Copyright (c) 2014-2017 Oracle and/or its affiliates. All rights reserved. +# Copyright (c) 2014-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. @@ -143,7 +143,7 @@ def extendDomain(self, domainHome, db, dbPrefix, dbPassword): cd('/') for server in self.SERVERS: if not server == 'AdminServer': - setServerGroups(server, serverGroupsToTarget) + setServerGroups(server, serverGroupsToTarget) print "Set CoherenceClusterSystemResource to defaultCoherenceCluster for server:" + server cd('/Servers/' + server) set('CoherenceClusterSystemResource', 'defaultCoherenceCluster') @@ -152,7 +152,7 @@ def extendDomain(self, domainHome, db, dbPrefix, dbPassword): print "Set CoherenceClusterSystemResource to defaultCoherenceCluster for cluster:" + cluster cd('/Cluster/' + cluster) set('CoherenceClusterSystemResource', 'defaultCoherenceCluster') - + print "Set WLS clusters as target of defaultCoherenceCluster:[" + ",".join(self.CLUSTERS) + "]" cd('/CoherenceClusterSystemResource/defaultCoherenceCluster') set('Target', ",".join(self.CLUSTERS)) diff --git a/OracleFMWInfrastructure/dockerfiles/12.2.1.2/container-scripts/startManagedServer.sh b/OracleFMWInfrastructure/dockerfiles/12.2.1.2/container-scripts/startManagedServer.sh index 01215c4924..902b5e8e7b 100755 --- a/OracleFMWInfrastructure/dockerfiles/12.2.1.2/container-scripts/startManagedServer.sh +++ b/OracleFMWInfrastructure/dockerfiles/12.2.1.2/container-scripts/startManagedServer.sh @@ -1,6 +1,6 @@ #!/bin/bash -# Copyright (c) 2014-2017 Oracle and/or its affiliates. All rights reserved. +# Copyright (c) 2014-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. # diff --git a/OracleFMWInfrastructure/dockerfiles/12.2.1.2/container-scripts/update_listenaddress.py b/OracleFMWInfrastructure/dockerfiles/12.2.1.2/container-scripts/update_listenaddress.py index d7a16fa827..cfe16094f0 100644 --- a/OracleFMWInfrastructure/dockerfiles/12.2.1.2/container-scripts/update_listenaddress.py +++ b/OracleFMWInfrastructure/dockerfiles/12.2.1.2/container-scripts/update_listenaddress.py @@ -2,7 +2,7 @@ # # Author:swati.mukundan@oracle.com # -# Copyright (c) 2014-2017 Oracle and/or its affiliates. All rights reserved. +# Copyright (c) 2014-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. # diff --git a/OracleFMWInfrastructure/dockerfiles/12.2.1.2/install.file b/OracleFMWInfrastructure/dockerfiles/12.2.1.2/install.file index b83bcab557..35f33ef20c 100644 --- a/OracleFMWInfrastructure/dockerfiles/12.2.1.2/install.file +++ b/OracleFMWInfrastructure/dockerfiles/12.2.1.2/install.file @@ -1,4 +1,4 @@ -# Copyright (c) 2014-2017 Oracle and/or its affiliates. All rights reserved. +# Copyright (c) 2014-2018 Oracle and/or its affiliates. All rights reserved. [ENGINE] #DO NOT CHANGE THIS. diff --git a/OracleFMWInfrastructure/dockerfiles/12.2.1.3/Dockerfile b/OracleFMWInfrastructure/dockerfiles/12.2.1.3/Dockerfile index aeeb76e446..cdcd3addc0 100644 --- a/OracleFMWInfrastructure/dockerfiles/12.2.1.3/Dockerfile +++ b/OracleFMWInfrastructure/dockerfiles/12.2.1.3/Dockerfile @@ -1,22 +1,22 @@ -#Copyright (c) 2014-2017 Oracle and/or its affiliates. All rights reserved. +#Copyright (c) 2014-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. # # ORACLE DOCKERFILES PROJECT # -------------------------- # This is the Dockerfile for Oracle FMW Infrastructure 12.2.1.3 -# +# # HOW TO BUILD THIS IMAGE # ----------------------- # The Oracle FMW Infrastructure image extends the Oracle WebLogic Infrastructure 12.2.1.3 image, you must first build the Oracle WebLogic Infrastructure image. -# Run: +# Run: # $ docker build -f Dockerfile -t oracle/fmw-infrastructure:12.2.1.3 # # IMPORTANT # --------- # The resulting image of this Dockerfile contains a FMW Infra Base Domain. # -# From +# From # ------------------------- FROM oracle/serverjre:8 @@ -25,7 +25,7 @@ FROM oracle/serverjre:8 MAINTAINER Monica Riccelli -# Common environment variables required for this build +# Common environment variables required for this build # ---------------------------------------------------- ENV ORACLE_HOME=/u01/oracle \ SCRIPT_FILE=/u01/oracle/container-scripts/* \ @@ -36,10 +36,10 @@ ENV ORACLE_HOME=/u01/oracle \ PATH=$PATH:/usr/java/default/bin:/u01/oracle/oracle_common/common/bin:/u01/oracle/wlserver/common/bin:/u01/oracle/container-scripts -#USER root +#USER root # Setup subdirectory for FMW install package and container-scripts -# ----------------------------------------------------------------- -RUN mkdir -p /u01 && \ +# ----------------------------------------------------------------- +RUN mkdir -p /u01 && \ chmod a+xr /u01 && \ useradd -b /u01 -d /u01/oracle -m -s /bin/bash oracle && \ mkdir -p /u01/oracle/container-scripts @@ -65,9 +65,9 @@ RUN chown oracle:oracle -R /u01 && \ chown -R oracle:oracle $VOLUME_DIR VOLUME $VOLUME_DIR - -# Install + +# Install # ------------------------------------------------------------ USER oracle RUN cd /u01 && $JAVA_HOME/bin/jar xf /u01/$FMW_PKG && cd - && \ diff --git a/OracleFMWInfrastructure/dockerfiles/12.2.1.3/container-scripts/createInfraDomain.py b/OracleFMWInfrastructure/dockerfiles/12.2.1.3/container-scripts/createInfraDomain.py index b17dd051a3..296a3aa9ad 100644 --- a/OracleFMWInfrastructure/dockerfiles/12.2.1.3/container-scripts/createInfraDomain.py +++ b/OracleFMWInfrastructure/dockerfiles/12.2.1.3/container-scripts/createInfraDomain.py @@ -1,5 +1,5 @@ # -# Copyright (c) 2014-2017 Oracle and/or its affiliates. All rights reserved. +# Copyright (c) 2014-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. # @@ -143,7 +143,7 @@ def extendDomain(self, domainHome, db, dbPrefix, dbPassword): cd('/') for server in self.SERVERS: if not server == 'AdminServer': - setServerGroups(server, serverGroupsToTarget) + setServerGroups(server, serverGroupsToTarget) print "Set CoherenceClusterSystemResource to defaultCoherenceCluster for server:" + server cd('/Servers/' + server) set('CoherenceClusterSystemResource', 'defaultCoherenceCluster') @@ -152,7 +152,7 @@ def extendDomain(self, domainHome, db, dbPrefix, dbPassword): print "Set CoherenceClusterSystemResource to defaultCoherenceCluster for cluster:" + cluster cd('/Cluster/' + cluster) set('CoherenceClusterSystemResource', 'defaultCoherenceCluster') - + print "Set WLS clusters as target of defaultCoherenceCluster:[" + ",".join(self.CLUSTERS) + "]" cd('/CoherenceClusterSystemResource/defaultCoherenceCluster') set('Target', ",".join(self.CLUSTERS)) diff --git a/OracleFMWInfrastructure/dockerfiles/12.2.1.3/container-scripts/createOrStartInfraDomain.sh b/OracleFMWInfrastructure/dockerfiles/12.2.1.3/container-scripts/createOrStartInfraDomain.sh index 500104f1c9..2af33845ca 100644 --- a/OracleFMWInfrastructure/dockerfiles/12.2.1.3/container-scripts/createOrStartInfraDomain.sh +++ b/OracleFMWInfrastructure/dockerfiles/12.2.1.3/container-scripts/createOrStartInfraDomain.sh @@ -1,7 +1,7 @@ #!/bin/bash # # -# Copyright (c) 2014-2017 Oracle and/or its affiliates. All rights reserved. +# Copyright (c) 2014-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. # @@ -39,12 +39,12 @@ trap _term SIGTERM # Set SIGKILL handler trap _kill SIGKILL - + echo "Configuring Domain for first time " echo "If Domain has already been Configured" echo "Start the Admin and Managed Servers " echo "=====================================" - + # Check that the User has passed on all the details needed to configure this image # Settings to call RCU.... echo "CONNECTION_STRING=${CONNECTION_STRING:?"Please set CONNECTION_STRING for connecting to the Database"}" @@ -98,9 +98,9 @@ if [ ! -f ${DOMAIN_HOME}/servers/AdminServer/logs/AdminServer.log ]; then fi # Create Domain only if 1st execution -if [ $ADD_DOMAIN -eq 0 ]; +if [ $ADD_DOMAIN -eq 0 ]; then - + # Auto generate Oracle WebLogic Server admin password if [ -z ${ADMIN_PASSWORD} ] then @@ -112,7 +112,7 @@ then echo " ----> 'weblogic' admin password: $ADMIN_PASSWORD" echo "" fi; - + if [ -z ${DB_SCHEMA_PASSWORD} ] then # Auto generate Oracle Database Schema password @@ -144,8 +144,8 @@ then # Run the RCU to load the schemas into the database /u01/oracle/oracle_common/bin/rcu -silent -createRepository -databaseType ORACLE -connectString $CONNECTION_STRING -dbUser $DB_USERNAME -dbRole sysdba -useSamePasswordForAllSchemaUsers true -selectDependentsForComponents true -schemaPrefix $RCUPREFIX -component MDS -component MDS -component IAU -component IAU_APPEND -component IAU_VIEWER -component OPSS -component WLS -component STB -f < /u01/oracle/pwd.txt >> /u01/oracle/RCU.out retval=$? - - if [ $retval -ne 0 ]; + + if [ $retval -ne 0 ]; then echo "RCU has some error " #RCU was already called once and schemas are in the database @@ -153,41 +153,41 @@ then grep -q "RCU-6016 The specified prefix already exists" "/u01/oracle/RCU.out" if [ $? -eq 0 ] ; then echo "RCU has already loaded schemas into the Database" - echo "RCU Ignore error" - else + echo "RCU Ignore error" + else echo "RCU Loading Failed.. Please check the RCU logs" exit fi fi # cleanup : remove the password file for security - rm -f "/u01/oracle/pwd.txt" + rm -f "/u01/oracle/pwd.txt" fi echo "Domain Configuration Phase" echo "==========================" - + wlst.sh -skipWLSModuleScanning /u01/oracle/container-scripts/createInfraDomain.py -oh $ORACLE_HOME -jh $JAVA_HOME -parent $DOMAIN_ROOT -name $DOMAIN_NAME -user $ADMIN_USER -password $ADMIN_PASSWORD -rcuDb $CONNECTION_STRING -rcuPrefix $RCUPREFIX -rcuSchemaPwd $DB_SCHEMA_PASSWORD retval=$? echo "RetVal from Domain creation $retval" - - if [ $retval -ne 0 ]; + + if [ $retval -ne 0 ]; then echo "Domain Creation Failed.. Please check the Domain Logs" exit fi # Create the security file to start the server(s) without the password prompt - mkdir -p ${DOMAIN_HOME}/servers/AdminServer/security/ - echo "username=weblogic" > ${DOMAIN_HOME}/servers/AdminServer/security/boot.properties - echo "password=$ADMIN_PASSWORD" >> ${DOMAIN_HOME}/servers/AdminServer/security/boot.properties + mkdir -p ${DOMAIN_HOME}/servers/AdminServer/security/ + echo "username=weblogic" > ${DOMAIN_HOME}/servers/AdminServer/security/boot.properties + echo "password=$ADMIN_PASSWORD" >> ${DOMAIN_HOME}/servers/AdminServer/security/boot.properties - mkdir -p ${DOMAIN_HOME}/servers/infra_server1/security/ + mkdir -p ${DOMAIN_HOME}/servers/infra_server1/security/ echo "username=weblogic" > ${DOMAIN_HOME}/servers/infra_server1/security/boot.properties echo "password="$ADMIN_PASSWORD >> ${DOMAIN_HOME}/servers/infra_server1/security/boot.properties - ${DOMAIN_HOME}/bin/setDomainEnv.sh + ${DOMAIN_HOME}/bin/setDomainEnv.sh fi echo "Starting the Admin Server" diff --git a/OracleFMWInfrastructure/dockerfiles/12.2.1.3/container-scripts/startManagedServer.sh b/OracleFMWInfrastructure/dockerfiles/12.2.1.3/container-scripts/startManagedServer.sh index 1860988eec..18da079f48 100644 --- a/OracleFMWInfrastructure/dockerfiles/12.2.1.3/container-scripts/startManagedServer.sh +++ b/OracleFMWInfrastructure/dockerfiles/12.2.1.3/container-scripts/startManagedServer.sh @@ -1,7 +1,7 @@ #!/bin/bash # -# Copyright (c) 2014-2017 Oracle and/or its affiliates. All rights reserved. +# Copyright (c) 2014-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. # diff --git a/OracleFMWInfrastructure/dockerfiles/12.2.1.3/container-scripts/update_listenaddress.py b/OracleFMWInfrastructure/dockerfiles/12.2.1.3/container-scripts/update_listenaddress.py index 00fd7d2c96..9980378e4d 100644 --- a/OracleFMWInfrastructure/dockerfiles/12.2.1.3/container-scripts/update_listenaddress.py +++ b/OracleFMWInfrastructure/dockerfiles/12.2.1.3/container-scripts/update_listenaddress.py @@ -2,7 +2,7 @@ # # Author:swati.mukundan@oracle.com # -# Copyright (c) 2014-2017 Oracle and/or its affiliates. All rights reserved. +# Copyright (c) 2014-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. # diff --git a/OracleFMWInfrastructure/dockerfiles/12.2.1.3/install.file b/OracleFMWInfrastructure/dockerfiles/12.2.1.3/install.file index b83bcab557..35f33ef20c 100644 --- a/OracleFMWInfrastructure/dockerfiles/12.2.1.3/install.file +++ b/OracleFMWInfrastructure/dockerfiles/12.2.1.3/install.file @@ -1,4 +1,4 @@ -# Copyright (c) 2014-2017 Oracle and/or its affiliates. All rights reserved. +# Copyright (c) 2014-2018 Oracle and/or its affiliates. All rights reserved. [ENGINE] #DO NOT CHANGE THIS. diff --git a/OracleFMWInfrastructure/dockerfiles/buildDockerImage.sh b/OracleFMWInfrastructure/dockerfiles/buildDockerImage.sh index 8345b92034..82506859aa 100755 --- a/OracleFMWInfrastructure/dockerfiles/buildDockerImage.sh +++ b/OracleFMWInfrastructure/dockerfiles/buildDockerImage.sh @@ -1,20 +1,20 @@ #!/bin/bash -# +# # Since: October, 2014 # Author: monica.riccelli@oracle.com # Description: script to build a Docker image for FMW Infrastructure -# +# # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER. -# -# Copyright (c) 2014-2015 Oracle and/or its affiliates. All rights reserved. -# +# +# Copyright (c) 2014-2018 Oracle and/or its affiliates. All rights reserved. +# usage() { cat << EOF Usage: buildDockerImage.sh -v [version] [-s] [-c] Builds a Docker Image for Oracle FMW Infrastructure. - + Parameters: -v: version to build. Required. Choose one of: $(for i in $(ls -d */); do echo -n "${i%%/} "; done) @@ -24,7 +24,7 @@ Parameters: LICENSE UPL 1.0 -Copyright (c) 2017 Oracle and/or its affiliates. All rights reserved. +Copyright (c) 2018 Oracle and/or its affiliates. All rights reserved. EOF exit 0 @@ -131,8 +131,8 @@ echo "" if [ $? -eq 0 ]; then cat << EOF - Fusion Middleware Infrastructure Docker Image for version $VERSION is ready to be extended: - + Fusion Middleware Infrastructure Docker Image for version $VERSION is ready to be extended: + --> $IMAGE_NAME Build completed in $BUILD_ELAPSED seconds. @@ -141,4 +141,3 @@ EOF else echo "FMW Infrastructure Docker Image was NOT successfully created. Check the output and correct any reported problems with the docker build operation." fi - diff --git a/OracleFMWInfrastructure/samples/12212-patch/Dockerfile b/OracleFMWInfrastructure/samples/12212-patch/Dockerfile index e521e073b0..80a12eb7ee 100644 --- a/OracleFMWInfrastructure/samples/12212-patch/Dockerfile +++ b/OracleFMWInfrastructure/samples/12212-patch/Dockerfile @@ -1,5 +1,5 @@ # -# Copyright (c) 2014-2017 Oracle and/or its affiliates. All rights reserved. +# Copyright (c) 2014-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. # @@ -15,7 +15,7 @@ # HOW TO BUILD THIS IMAGE # ----------------------- # Put all downloaded files in the same directory as this Dockerfile -# Run: +# Run: # $ sudo docker build -t fmw-infrastructure-12212-psu25871788 . # @@ -35,14 +35,14 @@ ENV PSU_PKG="p25871788_122120_Generic.zip" # -------------------------------- USER root COPY $PSU_PKG /u01/ -RUN chmod 777 /u01/$PSU_PKG +RUN chmod 777 /u01/$PSU_PKG -# Installation of Supplemental Quick Installer +# Installation of Supplemental Quick Installer # -------------------------------------------- USER oracle RUN cd /u01 && $JAVA_HOME/bin/jar xf /u01/$PSU_PKG && cd - && \ cd /u01/25871788 && $ORACLE_HOME/OPatch/opatch apply -silent && \ - rm /u01/$PSU_PKG + rm /u01/$PSU_PKG WORKDIR ${ORACLE_HOME} diff --git a/OracleFMWInfrastructure/samples/12212-patch/README.md b/OracleFMWInfrastructure/samples/12212-patch/README.md index 1d2bb69224..c310be2d90 100644 --- a/OracleFMWInfrastructure/samples/12212-patch/README.md +++ b/OracleFMWInfrastructure/samples/12212-patch/README.md @@ -1,7 +1,7 @@ Example of how to Patch a FMW Infrastructure Image =================================================== -This project offers a Dockerfile that shows how to apply a patch to the FMW Infrastructure image. It extends the Oracle FMW Infrastructure image and applies a PSU patch to the binaries in the image. +This project offers a Dockerfile that shows how to apply a patch to the FMW Infrastructure image. It extends the Oracle FMW Infrastructure image and applies a PSU patch to the binaries in the image. If this is the first time runing a FMW Infrastructure container and the domain has not been created previously you can run an Admin Server and a Managed Server containers from the patched image. If you have containers running from the unpatched FMW Infrastructure image you will need to shut them down before running the patched servers. Start by removing both the Admin Server container and the Managed Server container. Run a new Admin Server and Managed Server container from the patched image. @@ -12,14 +12,14 @@ Then download file p25871788_122120_Generic.zip and place it in the same direct $ docker build -t fmw-infrastructure-12212-psu25871788 . -### Sample FMW Infrastructure Domain +### Sample FMW Infrastructure Domain The image **oracle/fmw-infrastructure:12.2.1.2** will configure a **base_domain** with one Admin Server and a Managed Server with the following settings: * Admin Username: `weblogic` - * Admin Password: `Auto generated` + * Admin Password: `Auto generated` * DB Schema Password: 'Auto generated' - * DB Username: 'sys' - * DB Password: 'Auto Generated at runtime by DB container' + * DB Username: 'sys' + * DB Password: 'Auto Generated at runtime by DB container' * RCU Prefix: 'INFRA6' * Oracle Linux Username: `oracle` * Oracle Linux Password: `welcome1` @@ -27,7 +27,7 @@ The image **oracle/fmw-infrastructure:12.2.1.2** will configure a **base_domain* * Admin Server on port: `7001` * Managed Server on port: `8001` * Production Mode: `production` - + The patched image uses the scripts from the base FMW Infrastructure image to start the Admin Server and Managed Server. Please make reference to the README file in **oracle/docker-images/OracleFMWInfrastructure** for detailed instructions. ## Running the Oracle FMW Infrastructure Domain Docker Image @@ -36,28 +36,28 @@ To run a FMW Infrastructure Domain sample container, you will need the FMW Infra Follow the steps below: 1. Create the docker network for the infra server to run - + $ docker network create -d bridge InfraNET - + 2. Run the Database container to host the RCU schemas - + $ docker run --detach=true --name MYInfraDB --network=InfraNET -p 1377:1521 -p 6500:5500 -e ORACLE_SID=MYInfraDB -e ORACLE_PDB=InfraPDB1 -e ORACLE_PWD= oracle/database:12.2.0.1-ee Verify that the Database is running look at the logs from the run command: - + $ docker logs -f - You should see the string + You should see the string ######################### DATABASE IS READY TO USE! ######################### - The Database password is auto generated, one way to change the DB passcode + The Database password is auto generated, one way to change the DB passcode $ docker exec MYInfraDB ./setPassword.sh - - 3. Start a container to launch the Admin Server. The environment variables used to configure the InfraDomain are defined in infraDomain.env.list file. Call docker run from the **samples/12212-patch** directory where the infraDomain.env.list file is and pass the file name at runtime. To run an Admin Server container call: + + 3. Start a container to launch the Admin Server. The environment variables used to configure the InfraDomain are defined in infraDomain.env.list file. Call docker run from the **samples/12212-patch** directory where the infraDomain.env.list file is and pass the file name at runtime. To run an Admin Server container call: $ docker run -d -p 9001:7001 --network=InfraNET -v $HOST_VOLUME:/u01/oracle/user_projects --name InfraAdminContainer --env-file ./infraDomain.env.list fmw-infrastructure-12212-psu25871788:latest @@ -66,12 +66,12 @@ Where $HOST_VOLUME stands for a directory on the host where you map your domain $ docker inspect --format '{{.NewworkSettings.IPAddress}}' This returns the IPAddress (example xxx.xx.x.x) of the container. Got to your browser and enter http://xxx.xx.x.x:9001/console - + Since the container ports are mapped to host port, you can access using the hostname as well. - + 5. Start a container to launch the Managed Serve. The environment variables used to run the Managed Server image are defined in the file infraserver.env.list. Call docker run from the **samples/12212-patch** directory where the infraserver.env.list file is and pass the file name at runtime. To run a Managed Server container call: $ docker run -d -p 9801:8001 --network=InfraNET --volumes-from InfraAdminContainer --name InfraManagedContainer --env-file ./infraServer.env.list fmw-infrastructure-12212-psu25871788:latest startManagedServer.sh ## Copyright -Copyright (c) 2014-2017 Oracle and/or its affiliates. All rights reserved. +Copyright (c) 2014-2018 Oracle and/or its affiliates. All rights reserved. diff --git a/OracleWebLogic/dockerfiles/12.1.3/Dockerfile.developer b/OracleWebLogic/dockerfiles/12.1.3/Dockerfile.developer index f60a225e34..2dd8c192b3 100644 --- a/OracleWebLogic/dockerfiles/12.1.3/Dockerfile.developer +++ b/OracleWebLogic/dockerfiles/12.1.3/Dockerfile.developer @@ -1,24 +1,24 @@ # LICENSE UPL 1.0 # -# Copyright (c) 2014-2015 Oracle and/or its affiliates. All rights reserved. +# Copyright (c) 2014-2018 Oracle and/or its affiliates. All rights reserved. # # ORACLE DOCKERFILES PROJECT # -------------------------- # This is the Dockerfile for WebLogic 12.1.3 ZIP Distro -# +# # REQUIRED FILES TO BUILD THIS IMAGE # ---------------------------------- -# (1) wls1213_dev_update3.zip -# Download the Developer ZIP Update 3 installer from http://www.oracle.com/technetwork/middleware/weblogic/downloads/wls-for-dev-1703574.html +# (1) wls1213_dev_update3.zip +# Download the Developer ZIP Update 3 installer from http://www.oracle.com/technetwork/middleware/weblogic/downloads/wls-for-dev-1703574.html # # (2) server-jre-8uXX-linux-x64.tar.gz -# Download from http://www.oracle.com/technetwork/java/javase/downloads/server-jre8-downloads-2133154.html +# Download from http://www.oracle.com/technetwork/java/javase/downloads/server-jre8-downloads-2133154.html # # HOW TO BUILD THIS IMAGE # ----------------------- # Put all downloaded files in the same directory as this Dockerfile -# Run: -# $ docker build -t oracle/weblogic:12.1.3-developer . +# Run: +# $ docker build -t oracle/weblogic:12.1.3-developer . # # IMPORTANT # --------- @@ -28,13 +28,13 @@ # # You can go into 'samples/1213-domain' after building the developer install image # and build the domain image, for example: -# +# # $ cd samples/1213-domain # $ docker build -t mywls . # # Pull base image # --------------- -FROM oracle/serverjre:8 +FROM oracle/serverjre:8 # Maintainer # ---------- @@ -53,12 +53,12 @@ ENV ORACLE_HOME=/u01/oracle \ RUN mkdir -p /u01 && \ chmod a+xr /u01 && \ useradd -b /u01 -d /u01/oracle -m -s /bin/bash oracle - + # Environment variables required for this build (do NOT change) # ------------------------------------------------------------- ENV FMW_PKG=wls1213_dev_update3.zip \ - MW_HOME=/u01/oracle - + MW_HOME=/u01/oracle + # Copy packages # ------------- COPY $FMW_PKG /u01/ @@ -76,8 +76,8 @@ RUN $JAVA_HOME/bin/jar xf /u01/$FMW_PKG && \ find $ORACLE_HOME -name "*.sh" -exec chmod a+x {} \; && \ rm /u01/$FMW_PKG -WORKDIR $ORACLE_HOME +WORKDIR $ORACLE_HOME USER oracle -# Define default command to start bash. +# Define default command to start bash. CMD ["bash"] diff --git a/OracleWebLogic/dockerfiles/12.1.3/Dockerfile.generic b/OracleWebLogic/dockerfiles/12.1.3/Dockerfile.generic index f15f2d3fd9..8d009857c2 100644 --- a/OracleWebLogic/dockerfiles/12.1.3/Dockerfile.generic +++ b/OracleWebLogic/dockerfiles/12.1.3/Dockerfile.generic @@ -1,24 +1,24 @@ # LICENSE UPL 1.0 -# -# Copyright (c) 2014-2015 Oracle and/or its affiliates. All rights reserved. -# +# +# Copyright (c) 2014-2018 Oracle and/or its affiliates. All rights reserved. +# # ORACLE DOCKERFILES PROJECT # -------------------------- # This is the Dockerfile for WebLogic 12c (Full) Generic Distribution -# +# # REQUIRED FILES TO BUILD THIS IMAGE # ---------------------------------- # (1) fmw_12.1.3.0.0_wls.jar # Download the Generic installer from http://www.oracle.com/technetwork/middleware/weblogic/downloads/wls-for-dev-1703574.html # # (2) server-jre-8uXX-linux-x64.tar.gz -# Download from http://www.oracle.com/technetwork/java/javase/downloads/server-jre8-downloads-2133154.html +# Download from http://www.oracle.com/technetwork/java/javase/downloads/server-jre8-downloads-2133154.html # # HOW TO BUILD THIS IMAGE # ----------------------- # Put all downloaded files in the same directory as this Dockerfile -# Run: -# $ docker build -t oracle/weblogic:12.1.3 . +# Run: +# $ docker build -t oracle/weblogic:12.1.3 . # # IMPORTANT # --------- @@ -28,14 +28,14 @@ # # You can go into 'samples/1213-domain' after building this Generic image, # update the Dockerfile's FROM entry to point to this image, and build the domain image -# +# # $ cd samples/1213-domain # -- modify Dockerfile FROM to point to this image # $ docker build -t mywls . # # Pull base image # --------------- -FROM oracle/serverjre:8 +FROM oracle/serverjre:8 # Maintainer # ---------- @@ -54,19 +54,19 @@ ENV ORACLE_HOME=/u01/oracle \ RUN mkdir -p /u01 && \ chmod a+xr /u01 && \ useradd -b /u01 -d /u01/oracle -m -s /bin/bash oracle - -ENV FMW_PKG=fmw_12.1.3.0.0_wls.jar + +ENV FMW_PKG=fmw_12.1.3.0.0_wls.jar # Copy packages and files # ----------------------- COPY $FMW_PKG install.file oraInst.loc /u01/ RUN chown oracle:oracle -R /u01 - + USER oracle RUN $JAVA_HOME/bin/java -jar /u01/$FMW_PKG -ignoreSysPrereqs -novalidation -silent -responseFile /u01/install.file -invPtrLoc /u01/oraInst.loc -jreLoc $JAVA_HOME ORACLE_HOME=$ORACLE_HOME INSTALL_TYPE="WebLogic Server" && \ rm /u01/$FMW_PKG /u01/oraInst.loc /u01/install.file WORKDIR $ORACLE_HOME -# Define default command to start bash. +# Define default command to start bash. CMD ["bash"] diff --git a/OracleWebLogic/dockerfiles/12.1.3/install.file b/OracleWebLogic/dockerfiles/12.1.3/install.file index 48413bf7d1..66642ef894 100644 --- a/OracleWebLogic/dockerfiles/12.1.3/install.file +++ b/OracleWebLogic/dockerfiles/12.1.3/install.file @@ -1,4 +1,4 @@ -# Copyright (c) 2014-2015 Oracle and/or its affiliates. All rights reserved. +# Copyright (c) 2014-2018 Oracle and/or its affiliates. All rights reserved. [ENGINE] #DO NOT CHANGE THIS. diff --git a/OracleWebLogic/dockerfiles/12.2.1.1/Dockerfile.developer b/OracleWebLogic/dockerfiles/12.2.1.1/Dockerfile.developer index 04cf1de392..13b293b6e7 100644 --- a/OracleWebLogic/dockerfiles/12.2.1.1/Dockerfile.developer +++ b/OracleWebLogic/dockerfiles/12.2.1.1/Dockerfile.developer @@ -1,24 +1,24 @@ # LICENSE UPL 1.0 # -# Copyright (c) 2014-2015 Oracle and/or its affiliates. All rights reserved. +# Copyright (c) 2014-2018 Oracle and/or its affiliates. All rights reserved. # # ORACLE DOCKERFILES PROJECT # -------------------------- # This is the Dockerfile for WebLogic 12.2.1 Quick Install Distro -# +# # REQUIRED FILES TO BUILD THIS IMAGE # ---------------------------------- -# (1) fmw_12.2.1.1.0_wls_quick_Disk1_1of1.zip -# Download the Developer Quick installer from http://www.oracle.com/technetwork/middleware/weblogic/downloads/wls-for-dev-1703574.html +# (1) fmw_12.2.1.1.0_wls_quick_Disk1_1of1.zip +# Download the Developer Quick installer from http://www.oracle.com/technetwork/middleware/weblogic/downloads/wls-for-dev-1703574.html # # (2) server-jre-8uXX-linux-x64.tar.gz -# Download from http://www.oracle.com/technetwork/java/javase/downloads/server-jre8-downloads-2133154.html +# Download from http://www.oracle.com/technetwork/java/javase/downloads/server-jre8-downloads-2133154.html # # HOW TO BUILD THIS IMAGE # ----------------------- # Put all downloaded files in the same directory as this Dockerfile -# Run: -# $ docker build -t oracle/weblogic:12.2.1.1-developer . +# Run: +# $ docker build -t oracle/weblogic:12.2.1.1-developer . # # IMPORTANT # --------- @@ -38,14 +38,14 @@ MAINTAINER Monica Riccelli ENV ORACLE_HOME=/u01/oracle \ USER_MEM_ARGS="-Djava.security.egd=file:/dev/./urandom" \ PATH=$PATH:/usr/java/default/bin:/u01/oracle/oracle_common/common/bin:/u01/oracle/wlserver/common/bin - + # Setup filesystem and oracle user # Adjust file permissions, go to /u01 as user 'oracle' to proceed with WLS installation -# ------------------------------------------------------------ +# ------------------------------------------------------------ RUN mkdir -p /u01 && \ chmod a+xr /u01 && \ useradd -b /u01 -d /u01/oracle -m -s /bin/bash oracle - + # Copy scripts #------------- COPY container-scripts/createAndStartEmptyDomain.sh container-scripts/create-wls-domain.py /u01/oracle/ @@ -53,29 +53,29 @@ COPY container-scripts/createAndStartEmptyDomain.sh container-scripts/create-wls ENV SCRIPT_FILE=/u01/oracle/createAndStartEmptyDomain.sh \ DOMAIN_NAME="${DOMAIN_NAME:-base_domain}" \ DOMAIN_HOME=/u01/oracle/user_projects/domains/${DOMAIN_NAME:-base_domain} \ - ADMIN_PORT="${ADMIN_PORT:-7001}" + ADMIN_PORT="${ADMIN_PORT:-7001}" # Environment variables required for this build (do NOT change) # ------------------------------------------------------------- ENV FMW_PKG=fmw_12.2.1.1.0_wls_quick_Disk1_1of1.zip \ FMW_JAR=fmw_12.2.1.1.0_wls_quick.jar \ DEBUG_FLAG=true \ - PRODUCTION_MODE=dev - + PRODUCTION_MODE=dev + # Copy packages # ------------- COPY $FMW_PKG install.file oraInst.loc /u01/ RUN chown oracle:oracle -R /u01 && \ chmod +xr $SCRIPT_FILE -# Install +# Install # ------------------------------------------------------------ -USER oracle +USER oracle RUN cd /u01 && $JAVA_HOME/bin/jar xf /u01/$FMW_PKG && cd - && \ $JAVA_HOME/bin/java -jar /u01/$FMW_JAR -invPtrLoc /u01/oraInst.loc -jreLoc $JAVA_HOME -ignoreSysPrereqs -force -novalidation ORACLE_HOME=$ORACLE_HOME && \ rm /u01/$FMW_JAR /u01/$FMW_PKG /u01/oraInst.loc /u01/install.file -WORKDIR ${ORACLE_HOME} +WORKDIR ${ORACLE_HOME} -# Define default command to start script. +# Define default command to start script. CMD ["/u01/oracle/createAndStartEmptyDomain.sh"] diff --git a/OracleWebLogic/dockerfiles/12.2.1.1/Dockerfile.generic b/OracleWebLogic/dockerfiles/12.2.1.1/Dockerfile.generic index b3c0c96427..5553c80836 100644 --- a/OracleWebLogic/dockerfiles/12.2.1.1/Dockerfile.generic +++ b/OracleWebLogic/dockerfiles/12.2.1.1/Dockerfile.generic @@ -1,24 +1,24 @@ # LICENSE UPL 1.0 # -# Copyright (c) 2014-2015 Oracle and/or its affiliates. All rights reserved. +# Copyright (c) 2014-2018 Oracle and/or its affiliates. All rights reserved. # # ORACLE DOCKERFILES PROJECT # -------------------------- # This is the Dockerfile for Oracle WebLogic Server 12.2.1.1 Generic Distro -# +# # REQUIRED FILES TO BUILD THIS IMAGE # ---------------------------------- -# (1) fmw_12.2.1.1.0_wls_Disk1_1of1.zip -# Download the Generic installer from http://www.oracle.com/technetwork/middleware/weblogic/downloads/wls-for-dev-1703574.html +# (1) fmw_12.2.1.1.0_wls_Disk1_1of1.zip +# Download the Generic installer from http://www.oracle.com/technetwork/middleware/weblogic/downloads/wls-for-dev-1703574.html # # (2) server-jre-8uXX-linux-x64.tar.gz -# Download from http://www.oracle.com/technetwork/java/javase/downloads/server-jre8-downloads-2133154.html +# Download from http://www.oracle.com/technetwork/java/javase/downloads/server-jre8-downloads-2133154.html # # HOW TO BUILD THIS IMAGE # ----------------------- # Put all downloaded files in the same directory as this Dockerfile -# Run: -# $ docker build -f Dockerfile.generic -t oracle/weblogic:12.2.1.1-generic . +# Run: +# $ docker build -f Dockerfile.generic -t oracle/weblogic:12.2.1.1-generic . # # IMPORTANT # --------- @@ -38,10 +38,10 @@ MAINTAINER Monica Riccelli ENV ORACLE_HOME=/u01/oracle \ USER_MEM_ARGS="-Djava.security.egd=file:/dev/./urandom" \ PATH=$PATH:/usr/java/default/bin:/u01/oracle/oracle_common/common/bin:/u01/oracle/wlserver/common/bin - + # Setup filesystem and oracle user # Adjust file permissions, go to /u01 as user 'oracle' to proceed with WLS installation -# ------------------------------------------------------------ +# ------------------------------------------------------------ RUN mkdir -p /u01 && \ chmod a+xr /u01 && \ useradd -b /u01 -d /u01/oracle -m -s /bin/bash oracle @@ -49,31 +49,31 @@ RUN mkdir -p /u01 && \ # Copy scripts #------------- COPY container-scripts/createAndStartEmptyDomain.sh container-scripts/create-wls-domain.py /u01/oracle/ - + ENV SCRIPT_FILE=/u01/oracle/createAndStartEmptyDomain.sh \ DOMAIN_NAME="${DOMAIN_NAME:-base_domain}" \ DOMAIN_HOME=/u01/oracle/user_projects/domains/${DOMAIN_NAME:-base_domain} \ - ADMIN_PORT="${ADMIN_PORT:-7001}" - + ADMIN_PORT="${ADMIN_PORT:-7001}" + # Environment variables required for this build (do NOT change) # ------------------------------------------------------------- ENV FMW_PKG=fmw_12.2.1.1.0_wls_Disk1_1of1.zip \ - FMW_JAR=fmw_12.2.1.1.0_wls.jar - + FMW_JAR=fmw_12.2.1.1.0_wls.jar + # Copy packages # ------------- COPY $FMW_PKG install.file oraInst.loc /u01/ RUN chown oracle:oracle -R /u01 && \ chmod +xr $SCRIPT_FILE -# Install +# Install # ------------------------------------------------------------ -USER oracle +USER oracle RUN cd /u01 && $JAVA_HOME/bin/jar xf /u01/$FMW_PKG && cd - && \ $JAVA_HOME/bin/java -jar /u01/$FMW_JAR -silent -responseFile /u01/install.file -invPtrLoc /u01/oraInst.loc -jreLoc $JAVA_HOME -ignoreSysPrereqs -force -novalidation ORACLE_HOME=$ORACLE_HOME INSTALL_TYPE="WebLogic Server" && \ rm /u01/$FMW_JAR /u01/$FMW_PKG /u01/oraInst.loc /u01/install.file -WORKDIR ${ORACLE_HOME} +WORKDIR ${ORACLE_HOME} -# Define default command to start script. +# Define default command to start script. CMD ["/u01/oracle/createAndStartEmptyDomain.sh"] diff --git a/OracleWebLogic/dockerfiles/12.2.1.1/README.md b/OracleWebLogic/dockerfiles/12.2.1.1/README.md index fb0b0a8865..3f6005bcaf 100644 --- a/OracleWebLogic/dockerfiles/12.2.1.1/README.md +++ b/OracleWebLogic/dockerfiles/12.2.1.1/README.md @@ -20,7 +20,7 @@ Before you build, choose which version and distribution you want to build an ima $ sh buildDockerImage.sh Usage: buildDockerImage.sh -v [version] [-d | -g | -i] [-s] Builds a Docker Image for Oracle WebLogic Server. - + Parameters: -v: version to build. Required. Choose : 12.2.1.1 @@ -29,7 +29,7 @@ Before you build, choose which version and distribution you want to build an ima -i: creates image based on 'infrastructure' distribution -c: enables Docker image layer cache during build -s: skips the MD5 check of packages - + * select one distribution only: -d, -g, or -i **IMPORTANT:** the resulting images will have an empty domain (only Admin Server) by default. You must extend the image with your own Dockerfile, and create your domain using WLST. You might take a look at the use case samples. @@ -41,17 +41,17 @@ To give users an idea on how to create a domain from a custom Dockerfile to exte The image **oracle/weblogic:12.2.1.1-developer** will configure a **base_domain** with the following settings: * Admin Username: `weblogic` - * Admin Password: `Auto generated` + * Admin Password: `Auto generated` * Oracle Linux Username: `oracle` * Oracle Linux Password: `welcome1` * WebLogic Server Domain Name: `base_domain` * Admin Server on port: `7001` * Production Mode: `developer` - + **IMPORTANT:** If you intend to run these images in production you must change the Production Mode to production. - -###Admin Password + +### Admin Password On the first startup of the container a random password will be generated for the Administration of the domain. You can find this password in the output line: @@ -67,7 +67,7 @@ The best way to create your own, or extend domains is by using [WebLogic Scripti ## Building the Oracle WebLogic Server Docker Image To try a sample of a WebLogic Server image with a base domain configured, follow the steps below: - 1. Build the **12.2.1.1** image, go into **dockerfiles** and call + 1. Build the **12.2.1.1** image, go into **dockerfiles** and call $ sh buildDockerImage.sh -v 12.2.1.1-d @@ -75,7 +75,7 @@ To try a sample of a WebLogic Server image with a base domain configured, follow $ docker images - 3. Start a container from the image created in step 1: + 3. Start a container from the image created in step 1: $ docker run -d oracle/weblogic:12.2.1.1-developer @@ -83,7 +83,7 @@ To try a sample of a WebLogic Server image with a base domain configured, follow $ docker inspect --format '{{.NewworkSettings.IPAddress}}' This returns the IPAddress (example xxx.xx.x.x) of the container. Got to your browser and enter http://xxx.xx.x.x:7001/console - + ## Choose your Oracle WebLogic Server Distribution This project hosts two to three configurations (depending on Oracle WebLogic Server version) for building Docker images with WebLogic Server 12c. @@ -108,4 +108,4 @@ To download and run Oracle JDK regardless of inside or outside a Docker containe All scripts and files hosted in this project and GitHub [docker/OracleWebLogic](./) repository required to build the Docker images are, unless otherwise noted, released under [UPL 1.0](https://oss.oracle.com/licenses/upl/) license. ## Copyright -Copyright (c) 2014-2016 Oracle and/or its affiliates. All rights reserved. +Copyright (c) 2014-2018 Oracle and/or its affiliates. All rights reserved. diff --git a/OracleWebLogic/dockerfiles/12.2.1.1/container-scripts/create-wls-domain.py b/OracleWebLogic/dockerfiles/12.2.1.1/container-scripts/create-wls-domain.py index d273553a13..c660c68585 100644 --- a/OracleWebLogic/dockerfiles/12.2.1.1/container-scripts/create-wls-domain.py +++ b/OracleWebLogic/dockerfiles/12.2.1.1/container-scripts/create-wls-domain.py @@ -1,4 +1,4 @@ -# Copyright (c) 2014-2015 Oracle and/or its affiliates. All rights reserved. +# Copyright (c) 2014-2018 Oracle and/or its affiliates. All rights reserved. # # WebLogic on Docker Default Domain # @@ -9,7 +9,7 @@ # ============================================== domain_name = os.environ.get("DOMAIN_NAME", "base_domain") admin_port = int(os.environ.get("ADMIN_PORT", "7001")) -admin_pass = "ADMIN_PASSWORD" +admin_pass = "ADMIN_PASSWORD" domain_path = '/u01/oracle/user_projects/domains/%s' % domain_name production_mode = os.environ.get("PRODUCTION_MODE", "prod") diff --git a/OracleWebLogic/dockerfiles/12.2.1.1/container-scripts/createAndStartEmptyDomain.sh b/OracleWebLogic/dockerfiles/12.2.1.1/container-scripts/createAndStartEmptyDomain.sh index c2130a7d2d..71534299e4 100644 --- a/OracleWebLogic/dockerfiles/12.2.1.1/container-scripts/createAndStartEmptyDomain.sh +++ b/OracleWebLogic/dockerfiles/12.2.1.1/container-scripts/createAndStartEmptyDomain.sh @@ -1,6 +1,6 @@ #!/bin/bash # -# Copyright (c) 2014-2015 Oracle and/or its affiliates. All rights reserved. +# Copyright (c) 2014-2018 Oracle and/or its affiliates. All rights reserved. # # If AdminServer.log does not exists, container is starting for 1st time # So it should start NM and also associate with AdminServer @@ -32,7 +32,7 @@ fi # Create Domain only if 1st execution if [ $ADD_DOMAIN -eq 0 ]; then # Auto generate Oracle WebLogic Server admin password -ADMIN_PASSWORD=$(date| md5sum | fold -w 8 | head -n 1) +ADMIN_PASSWORD=$(date| md5sum | fold -w 8 | head -n 1) echo "" echo " Oracle WebLogic Server Auto Generated Empty Domain:" @@ -44,10 +44,10 @@ sed -i -e "s|ADMIN_PASSWORD|$ADMIN_PASSWORD|g" /u01/oracle/create-wls-domain.py # Create an empty domain wlst.sh -skipWLSModuleScanning /u01/oracle/create-wls-domain.py -mkdir -p ${DOMAIN_HOME}/servers/AdminServer/security/ -echo "username=weblogic" > /u01/oracle/user_projects/domains/$DOMAIN_NAME/servers/AdminServer/security/boot.properties -echo "password=$ADMIN_PASSWORD" >> /u01/oracle/user_projects/domains/$DOMAIN_NAME/servers/AdminServer/security/boot.properties -${DOMAIN_HOME}/bin/setDomainEnv.sh +mkdir -p ${DOMAIN_HOME}/servers/AdminServer/security/ +echo "username=weblogic" > /u01/oracle/user_projects/domains/$DOMAIN_NAME/servers/AdminServer/security/boot.properties +echo "password=$ADMIN_PASSWORD" >> /u01/oracle/user_projects/domains/$DOMAIN_NAME/servers/AdminServer/security/boot.properties +${DOMAIN_HOME}/bin/setDomainEnv.sh fi @@ -58,5 +58,3 @@ tail -f ${DOMAIN_HOME}/servers/AdminServer/logs/AdminServer.log & childPID=$! wait $childPID - - diff --git a/OracleWebLogic/dockerfiles/12.2.1.1/install.file b/OracleWebLogic/dockerfiles/12.2.1.1/install.file index 55fd59a875..35f33ef20c 100644 --- a/OracleWebLogic/dockerfiles/12.2.1.1/install.file +++ b/OracleWebLogic/dockerfiles/12.2.1.1/install.file @@ -1,4 +1,4 @@ -# Copyright (c) 2014-2015 Oracle and/or its affiliates. All rights reserved. +# Copyright (c) 2014-2018 Oracle and/or its affiliates. All rights reserved. [ENGINE] #DO NOT CHANGE THIS. diff --git a/OracleWebLogic/dockerfiles/12.2.1.2/Dockerfile.developer b/OracleWebLogic/dockerfiles/12.2.1.2/Dockerfile.developer index c6cc04bd06..838bc03b18 100644 --- a/OracleWebLogic/dockerfiles/12.2.1.2/Dockerfile.developer +++ b/OracleWebLogic/dockerfiles/12.2.1.2/Dockerfile.developer @@ -1,24 +1,24 @@ -#Copyright (c) 2014-2017 Oracle and/or its affiliates. All rights reserved. +#Copyright (c) 2014-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. # # ORACLE DOCKERFILES PROJECT # -------------------------- # This is the Dockerfile for WebLogic 12.2.1.2 Quick Install Distro -# +# # REQUIRED FILES TO BUILD THIS IMAGE # ---------------------------------- -# (1) fmw_12.2.1.2.0_wls_quick_Disk1_1of1.zip -# Download the Developer Quick installer from http://www.oracle.com/technetwork/middleware/weblogic/downloads/wls-for-dev-1703574.html +# (1) fmw_12.2.1.2.0_wls_quick_Disk1_1of1.zip +# Download the Developer Quick installer from http://www.oracle.com/technetwork/middleware/weblogic/downloads/wls-for-dev-1703574.html # # (2) server-jre-8uXX-linux-x64.tar.gz -# Download from http://www.oracle.com/technetwork/java/javase/downloads/server-jre8-downloads-2133154.html +# Download from http://www.oracle.com/technetwork/java/javase/downloads/server-jre8-downloads-2133154.html # # HOW TO BUILD THIS IMAGE # ----------------------- # Put all downloaded files in the same directory as this Dockerfile -# Run: -# $ docker build -t oracle/weblogic:12.2.1.2-developer . +# Run: +# $ docker build -t oracle/weblogic:12.2.1.2-developer . # # IMPORTANT # --------- @@ -39,14 +39,14 @@ ENV ORACLE_HOME=/u01/oracle \ USER_MEM_ARGS="-Djava.security.egd=file:/dev/./urandom" \ SCRIPT_FILE=/u01/oracle/createAndStartEmptyDomain.sh \ PATH=$PATH:/usr/java/default/bin:/u01/oracle/oracle_common/common/bin:/u01/oracle/wlserver/common/bin - + # Setup filesystem and oracle user # Adjust file permissions, go to /u01 as user 'oracle' to proceed with WLS installation -# ------------------------------------------------------------ -RUN mkdir -p /u01 && \ +# ------------------------------------------------------------ +RUN mkdir -p /u01 && \ chmod a+xr /u01 && \ - useradd -b /u01 -d /u01/oracle -m -s /bin/bash oracle - + useradd -b /u01 -d /u01/oracle -m -s /bin/bash oracle + # Copy scripts #------------- COPY container-scripts/createAndStartEmptyDomain.sh container-scripts/create-wls-domain.py /u01/oracle/ @@ -60,29 +60,29 @@ ENV DOMAIN_NAME="${DOMAIN_NAME:-base_domain}" \ ADMIN_NAME="${ADMIN_NAME:-AdminServer}" \ ADMIN_PASSWORD="${ADMIN_PASSWORD:-""}" \ DEBUG_FLAG=true \ - PRODUCTION_MODE=dev - - - + PRODUCTION_MODE=dev + + + # Environment variables required for this build (do NOT change) # ------------------------------------------------------------- ENV FMW_PKG=fmw_12.2.1.2.0_wls_quick_Disk1_1of1.zip \ - FMW_JAR=fmw_12.2.1.2.0_wls_quick.jar - + FMW_JAR=fmw_12.2.1.2.0_wls_quick.jar + # Copy packages # ------------- COPY $FMW_PKG install.file oraInst.loc /u01/ RUN chown oracle:oracle -R /u01 && \ chmod +xr $SCRIPT_FILE -# Install +# Install # ------------------------------------------------------------ -USER oracle +USER oracle RUN cd /u01 && $JAVA_HOME/bin/jar xf /u01/$FMW_PKG && cd - && \ $JAVA_HOME/bin/java -jar /u01/$FMW_JAR -invPtrLoc /u01/oraInst.loc -jreLoc $JAVA_HOME -ignoreSysPrereqs -force -novalidation ORACLE_HOME=$ORACLE_HOME && \ rm /u01/$FMW_JAR /u01/$FMW_PKG /u01/oraInst.loc /u01/install.file -WORKDIR ${ORACLE_HOME} +WORKDIR ${ORACLE_HOME} -# Define default command to start script. -CMD ["/u01/oracle/createAndStartEmptyDomain.sh"] +# Define default command to start script. +CMD ["/u01/oracle/createAndStartEmptyDomain.sh"] diff --git a/OracleWebLogic/dockerfiles/12.2.1.2/Dockerfile.generic b/OracleWebLogic/dockerfiles/12.2.1.2/Dockerfile.generic index 2cf9a58ad5..f0ff34d058 100644 --- a/OracleWebLogic/dockerfiles/12.2.1.2/Dockerfile.generic +++ b/OracleWebLogic/dockerfiles/12.2.1.2/Dockerfile.generic @@ -1,24 +1,24 @@ -#Copyright (c) 2014-2017 Oracle and/or its affiliates. All rights reserved. +#Copyright (c) 2014-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. # # ORACLE DOCKERFILES PROJECT # -------------------------- # This is the Dockerfile for Oracle WebLogic Server 12.2.1.2 Generic Distro -# +# # REQUIRED FILES TO BUILD THIS IMAGE # ---------------------------------- -# (1) fmw_12.2.1.2.0_wls_Disk1_1of1.zip -# Download the Generic installer from http://www.oracle.com/technetwork/middleware/weblogic/downloads/wls-for-dev-1703574.html +# (1) fmw_12.2.1.2.0_wls_Disk1_1of1.zip +# Download the Generic installer from http://www.oracle.com/technetwork/middleware/weblogic/downloads/wls-for-dev-1703574.html # # (2) server-jre-8uXX-linux-x64.tar.gz -# Download from http://www.oracle.com/technetwork/java/javase/downloads/server-jre8-downloads-2133154.html +# Download from http://www.oracle.com/technetwork/java/javase/downloads/server-jre8-downloads-2133154.html # # HOW TO BUILD THIS IMAGE # ----------------------- # Put all downloaded files in the same directory as this Dockerfile -# Run: -# $ docker build -f Dockerfile.generic -t oracle/weblogic:12.2.1.2-generic . +# Run: +# $ docker build -f Dockerfile.generic -t oracle/weblogic:12.2.1.2-generic . # # IMPORTANT # --------- @@ -39,20 +39,20 @@ ENV ORACLE_HOME=/u01/oracle \ USER_MEM_ARGS="-Djava.security.egd=file:/dev/./urandom" \ SCRIPT_FILE=/u01/oracle/createAndStartEmptyDomain.sh \ PATH=$PATH:/usr/java/default/bin:/u01/oracle/oracle_common/common/bin:/u01/oracle/wlserver/common/bin - + # Setup filesystem and oracle user # Adjust file permissions, go to /u01 as user 'oracle' to proceed with WLS installation -# ------------------------------------------------------------ +# ------------------------------------------------------------ RUN mkdir -p /u01 && \ chmod a+xr /u01 && \ useradd -b /u01 -d /u01/oracle -m -s /bin/bash oracle - + # Copy scripts #------------- COPY container-scripts/createAndStartEmptyDomain.sh container-scripts/create-wls-domain.py /u01/oracle/ # Domain and Server environment variables -# ------------------------------------------------------------ +# ------------------------------------------------------------ ENV DOMAIN_NAME="${DOMAIN_NAME:-base_domain}" \ DOMAIN_HOME=/u01/oracle/user_projects/domains/${DOMAIN_NAME:-base_domain} \ ADMIN_PORT="${ADMIN_PORT:-7001}" \ @@ -70,7 +70,7 @@ ENV FMW_PKG=fmw_12.2.1.2.0_wls_Disk1_1of1.zip \ # ------------- COPY $FMW_PKG install.file oraInst.loc /u01/ RUN chown oracle:oracle -R /u01 && \ - chmod +xr $SCRIPT_FILE + chmod +xr $SCRIPT_FILE # Install # ------------------------------------------------------------ diff --git a/OracleWebLogic/dockerfiles/12.2.1.2/README.md b/OracleWebLogic/dockerfiles/12.2.1.2/README.md index 2b51bcd4ba..90ede7d0d2 100644 --- a/OracleWebLogic/dockerfiles/12.2.1.2/README.md +++ b/OracleWebLogic/dockerfiles/12.2.1.2/README.md @@ -20,7 +20,7 @@ Before you build, choose which version and distribution you want to build an ima $ sh buildDockerImage.sh Usage: buildDockerImage.sh -v [version] [-d | -g | -i] [-s] Builds a Docker Image for Oracle WebLogic Server. - + Parameters: -v: version to build. Required. Choose : 12.2.1.2 @@ -29,12 +29,12 @@ Before you build, choose which version and distribution you want to build an ima -i: creates image based on 'infrastructure' distribution -c: enables Docker image layer cache during build -s: skips the MD5 check of packages - + * select one distribution only: -d, -g, or -i - + LICENSE UPL 1.0 - - Copyright (c) 2014-2015 Oracle and/or its affiliates. All rights reserved. + + Copyright (c) 2014-2018 Oracle and/or its affiliates. All rights reserved. **IMPORTANT:** the resulting images will have an empty domain (only Admin Server) by default. You must extend the image with your own Dockerfile, and create your domain using WLST. You might take a look at the use case samples. @@ -45,17 +45,17 @@ To give users an idea on how to create a domain from a custom Dockerfile to exte The image **oracle/weblogic:12.2.1.2-developer** will configure a **base_domain** with the following settings: * Admin Username: `weblogic` - * Admin Password: `Auto generated` + * Admin Password: `Auto generated` * Oracle Linux Username: `oracle` * Oracle Linux Password: `welcome1` * WebLogic Server Domain Name: `base_domain` * Admin Server on port: `7001` * Production Mode: `developer` - + **IMPORTANT:** If you intend to run these images in production you must change the Production Mode to production. - -###Admin Password + +### Admin Password On the first startup of the container a random password will be generated for the Administration of the domain. You can find this password in the output line: @@ -71,7 +71,7 @@ The best way to create your own, or extend domains is by using [WebLogic Scripti ## Building the Oracle WebLogic Server Docker Image To try a sample of a WebLogic Server image with a base domain configured, follow the steps below: - 1. Build the **12.2.1.2** image, go into **dockerfiles** and call + 1. Build the **12.2.1.2** image, go into **dockerfiles** and call $ sh buildDockerImage.sh -v 12.2.1.2-d @@ -79,10 +79,10 @@ To try a sample of a WebLogic Server image with a base domain configured, follow $ docker images - 3. Start a container from the image created in step 1: + 3. Start a container from the image created in step 1: You can override the default values of the following parameters during runtime with the -e option: - * ADMIN_NAME (default: AdminServer) - * ADMIN_PORT (default: 7001) + * ADMIN_NAME (default: AdminServer) + * ADMIN_PORT (default: 7001) * ADMIN_USERNAME (default: weblogic) * ADMIN_PASSWORD (default: Auto Generated) * DOMAIN_NAME (default: base_domain) @@ -96,7 +96,7 @@ To try a sample of a WebLogic Server image with a base domain configured, follow $ docker inspect --format '{{.NewworkSettings.IPAddress}}' This returns the IPAddress (example xxx.xx.x.x) of the container. Got to your browser and enter http://xxx.xx.x.x:8001/console - + ## Choose your Oracle WebLogic Server Distribution This project hosts two to three configurations (depending on Oracle WebLogic Server version) for building Docker images with WebLogic Server 12c. @@ -121,4 +121,4 @@ To download and run Oracle JDK regardless of inside or outside a Docker containe All scripts and files hosted in this project and GitHub [docker/OracleWebLogic](./) repository required to build the Docker images are, unless otherwise noted, released under [UPL 1.0](https://oss.oracle.com/licenses/upl/) license. ## Copyright -Copyright (c) 2014-2017 Oracle and/or its affiliates. All rights reserved. +Copyright (c) 2014-2018 Oracle and/or its affiliates. All rights reserved. diff --git a/OracleWebLogic/dockerfiles/12.2.1.2/container-scripts/create-wls-domain.py b/OracleWebLogic/dockerfiles/12.2.1.2/container-scripts/create-wls-domain.py index b25778cf20..8956294014 100644 --- a/OracleWebLogic/dockerfiles/12.2.1.2/container-scripts/create-wls-domain.py +++ b/OracleWebLogic/dockerfiles/12.2.1.2/container-scripts/create-wls-domain.py @@ -1,4 +1,4 @@ -#Copyright (c) 2014-2017 Oracle and/or its affiliates. All rights reserved. +#Copyright (c) 2014-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. # diff --git a/OracleWebLogic/dockerfiles/12.2.1.2/container-scripts/createAndStartEmptyDomain.sh b/OracleWebLogic/dockerfiles/12.2.1.2/container-scripts/createAndStartEmptyDomain.sh index 03a84e7fde..661ecd367e 100755 --- a/OracleWebLogic/dockerfiles/12.2.1.2/container-scripts/createAndStartEmptyDomain.sh +++ b/OracleWebLogic/dockerfiles/12.2.1.2/container-scripts/createAndStartEmptyDomain.sh @@ -1,6 +1,6 @@ #!/bin/bash # -#Copyright (c) 2014-2017 Oracle and/or its affiliates. All rights reserved. +#Copyright (c) 2014-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. # @@ -53,15 +53,15 @@ if [ -z $ADMIN_PASSWORD ]; then else s=${ADMIN_PASSWORD} echo " ----> 'weblogic' admin password: $s" -fi +fi sed -i -e "s|ADMIN_PASSWORD|$s|g" /u01/oracle/create-wls-domain.py # Create an empty domain wlst.sh -skipWLSModuleScanning /u01/oracle/create-wls-domain.py -mkdir -p ${DOMAIN_HOME}/servers/AdminServer/security/ -echo "username=${ADMIN_USERNAME}" > /u01/oracle/user_projects/domains/$DOMAIN_NAME/servers/AdminServer/security/boot.properties -echo "password=$s" >> /u01/oracle/user_projects/domains/$DOMAIN_NAME/servers/AdminServer/security/boot.properties -${DOMAIN_HOME}/bin/setDomainEnv.sh +mkdir -p ${DOMAIN_HOME}/servers/AdminServer/security/ +echo "username=${ADMIN_USERNAME}" > /u01/oracle/user_projects/domains/$DOMAIN_NAME/servers/AdminServer/security/boot.properties +echo "password=$s" >> /u01/oracle/user_projects/domains/$DOMAIN_NAME/servers/AdminServer/security/boot.properties +${DOMAIN_HOME}/bin/setDomainEnv.sh fi @@ -72,5 +72,3 @@ tail -f ${DOMAIN_HOME}/servers/AdminServer/logs/AdminServer.log & childPID=$! wait $childPID - - diff --git a/OracleWebLogic/dockerfiles/12.2.1.2/install.file b/OracleWebLogic/dockerfiles/12.2.1.2/install.file index 55fd59a875..35f33ef20c 100644 --- a/OracleWebLogic/dockerfiles/12.2.1.2/install.file +++ b/OracleWebLogic/dockerfiles/12.2.1.2/install.file @@ -1,4 +1,4 @@ -# Copyright (c) 2014-2015 Oracle and/or its affiliates. All rights reserved. +# Copyright (c) 2014-2018 Oracle and/or its affiliates. All rights reserved. [ENGINE] #DO NOT CHANGE THIS. diff --git a/OracleWebLogic/dockerfiles/12.2.1.3/Dockerfile.developer b/OracleWebLogic/dockerfiles/12.2.1.3/Dockerfile.developer index 19ea53b236..86c4c1777e 100644 --- a/OracleWebLogic/dockerfiles/12.2.1.3/Dockerfile.developer +++ b/OracleWebLogic/dockerfiles/12.2.1.3/Dockerfile.developer @@ -1,24 +1,24 @@ -#Copyright (c) 2014-2017 Oracle and/or its affiliates. All rights reserved. +#Copyright (c) 2014-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. # # ORACLE DOCKERFILES PROJECT # -------------------------- # This is the Dockerfile for WebLogic 12.2.1.3 Quick Install Distro -# +# # REQUIRED FILES TO BUILD THIS IMAGE # ---------------------------------- -# (1) fmw_12.2.1.3.0_wls_quick_Disk1_1of1.zip -# Download the Developer Quick installer from http://www.oracle.com/technetwork/middleware/weblogic/downloads/wls-for-dev-1703574.html +# (1) fmw_12.2.1.3.0_wls_quick_Disk1_1of1.zip +# Download the Developer Quick installer from http://www.oracle.com/technetwork/middleware/weblogic/downloads/wls-for-dev-1703574.html # # (2) server-jre-8uXX-linux-x64.tar.gz -# Download from http://www.oracle.com/technetwork/java/javase/downloads/server-jre8-downloads-2133154.html +# Download from http://www.oracle.com/technetwork/java/javase/downloads/server-jre8-downloads-2133154.html # # HOW TO BUILD THIS IMAGE # ----------------------- # Put all downloaded files in the same directory as this Dockerfile -# Run: -# $ docker build -t oracle/weblogic:12.2.1.3-developer . +# Run: +# $ docker build -t oracle/weblogic:12.2.1.3-developer . # # IMPORTANT # --------- @@ -39,14 +39,14 @@ ENV ORACLE_HOME=/u01/oracle \ USER_MEM_ARGS="-Djava.security.egd=file:/dev/./urandom" \ SCRIPT_FILE=/u01/oracle/createAndStartEmptyDomain.sh \ PATH=$PATH:/usr/java/default/bin:/u01/oracle/oracle_common/common/bin:/u01/oracle/wlserver/common/bin - + # Setup filesystem and oracle user # Adjust file permissions, go to /u01 as user 'oracle' to proceed with WLS installation -# ------------------------------------------------------------ -RUN mkdir -p /u01 && \ +# ------------------------------------------------------------ +RUN mkdir -p /u01 && \ chmod a+xr /u01 && \ - useradd -b /u01 -d /u01/oracle -m -s /bin/bash oracle - + useradd -b /u01 -d /u01/oracle -m -s /bin/bash oracle + # Copy scripts #------------- COPY container-scripts/createAndStartEmptyDomain.sh container-scripts/create-wls-domain.py /u01/oracle/ @@ -60,29 +60,29 @@ ENV DOMAIN_NAME="${DOMAIN_NAME:-base_domain}" \ ADMIN_NAME="${ADMIN_NAME:-AdminServer}" \ ADMIN_PASSWORD="${ADMIN_PASSWORD:-""}" \ DEBUG_FLAG=true \ - PRODUCTION_MODE=dev - - - + PRODUCTION_MODE=dev + + + # Environment variables required for this build (do NOT change) # ------------------------------------------------------------- ENV FMW_PKG=fmw_12.2.1.3.0_wls_quick_Disk1_1of1.zip \ - FMW_JAR=fmw_12.2.1.3.0_wls_quick.jar - + FMW_JAR=fmw_12.2.1.3.0_wls_quick.jar + # Copy packages # ------------- COPY $FMW_PKG install.file oraInst.loc /u01/ RUN chown oracle:oracle -R /u01 && \ chmod +xr $SCRIPT_FILE -# Install +# Install # ------------------------------------------------------------ -USER oracle +USER oracle RUN cd /u01 && $JAVA_HOME/bin/jar xf /u01/$FMW_PKG && cd - && \ $JAVA_HOME/bin/java -jar /u01/$FMW_JAR -invPtrLoc /u01/oraInst.loc -jreLoc $JAVA_HOME -ignoreSysPrereqs -force -novalidation ORACLE_HOME=$ORACLE_HOME && \ rm /u01/$FMW_JAR /u01/$FMW_PKG /u01/oraInst.loc /u01/install.file -WORKDIR ${ORACLE_HOME} +WORKDIR ${ORACLE_HOME} -# Define default command to start script. -CMD ["/u01/oracle/createAndStartEmptyDomain.sh"] +# Define default command to start script. +CMD ["/u01/oracle/createAndStartEmptyDomain.sh"] diff --git a/OracleWebLogic/dockerfiles/12.2.1.3/Dockerfile.generic b/OracleWebLogic/dockerfiles/12.2.1.3/Dockerfile.generic index e728371069..fb895ec55c 100644 --- a/OracleWebLogic/dockerfiles/12.2.1.3/Dockerfile.generic +++ b/OracleWebLogic/dockerfiles/12.2.1.3/Dockerfile.generic @@ -1,24 +1,24 @@ -#Copyright (c) 2014-2017 Oracle and/or its affiliates. All rights reserved. +#Copyright (c) 2014-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. # # ORACLE DOCKERFILES PROJECT # -------------------------- # This is the Dockerfile for Oracle WebLogic Server 12.2.1.3 Generic Distro -# +# # REQUIRED FILES TO BUILD THIS IMAGE # ---------------------------------- -# (1) fmw_12.2.1.3.0_wls_Disk1_1of1.zip -# Download the Generic installer from http://www.oracle.com/technetwork/middleware/weblogic/downloads/wls-for-dev-1703574.html +# (1) fmw_12.2.1.3.0_wls_Disk1_1of1.zip +# Download the Generic installer from http://www.oracle.com/technetwork/middleware/weblogic/downloads/wls-for-dev-1703574.html # # (2) server-jre-8uXX-linux-x64.tar.gz -# Download from http://www.oracle.com/technetwork/java/javase/downloads/server-jre8-downloads-2133154.html +# Download from http://www.oracle.com/technetwork/java/javase/downloads/server-jre8-downloads-2133154.html # # HOW TO BUILD THIS IMAGE # ----------------------- # Put all downloaded files in the same directory as this Dockerfile -# Run: -# $ docker build -f Dockerfile.generic -t oracle/weblogic:12.2.1.3-generic . +# Run: +# $ docker build -f Dockerfile.generic -t oracle/weblogic:12.2.1.3-generic . # # IMPORTANT # --------- @@ -39,20 +39,20 @@ ENV ORACLE_HOME=/u01/oracle \ USER_MEM_ARGS="-Djava.security.egd=file:/dev/./urandom" \ SCRIPT_FILE=/u01/oracle/createAndStartEmptyDomain.sh \ PATH=$PATH:/usr/java/default/bin:/u01/oracle/oracle_common/common/bin:/u01/oracle/wlserver/common/bin - + # Setup filesystem and oracle user # Adjust file permissions, go to /u01 as user 'oracle' to proceed with WLS installation -# ------------------------------------------------------------ +# ------------------------------------------------------------ RUN mkdir -p /u01 && \ chmod a+xr /u01 && \ useradd -b /u01 -d /u01/oracle -m -s /bin/bash oracle - + # Copy scripts #------------- COPY container-scripts/createAndStartEmptyDomain.sh container-scripts/create-wls-domain.py /u01/oracle/ # Domain and Server environment variables -# ------------------------------------------------------------ +# ------------------------------------------------------------ ENV DOMAIN_NAME="${DOMAIN_NAME:-base_domain}" \ DOMAIN_HOME=/u01/oracle/user_projects/domains/${DOMAIN_NAME:-base_domain} \ ADMIN_PORT="${ADMIN_PORT:-7001}" \ @@ -70,7 +70,7 @@ ENV FMW_PKG=fmw_12.2.1.3.0_wls_Disk1_1of1.zip \ # ------------- COPY $FMW_PKG install.file oraInst.loc /u01/ RUN chown oracle:oracle -R /u01 && \ - chmod +xr $SCRIPT_FILE + chmod +xr $SCRIPT_FILE # Install # ------------------------------------------------------------ diff --git a/OracleWebLogic/dockerfiles/12.2.1.3/README.md b/OracleWebLogic/dockerfiles/12.2.1.3/README.md index 005aeb3e89..f90e915b2d 100644 --- a/OracleWebLogic/dockerfiles/12.2.1.3/README.md +++ b/OracleWebLogic/dockerfiles/12.2.1.3/README.md @@ -4,7 +4,7 @@ These Docker configurations have been used to create the Oracle WebLogic Server The certification of Oracle WebLogic Server on Docker does not require the use of any file presented in this repository. Customers and users are welcome to use them as starters, and customize, tweak, or create from scratch, new scripts and Dockerfiles. -For more information on the certification, please see the [Oracle WebLogic Server on Docker Certification Whitepaper](http://www.oracle.com/technetwork/middleware/weblogic/overview/weblogic-server-docker-containers-2491959.pdf) and [The WebLogic Server Blog](https://blogs.oracle.com/WebLogicServer/) for updates. +For more information on the certification, please see the [Oracle WebLogic Server on Docker certification whitepaper](http://www.oracle.com/technetwork/middleware/weblogic/overview/weblogic-server-docker-containers-2491959.pdf) and [The WebLogic Server Blog](https://blogs.oracle.com/WebLogicServer/) for updates. ## How to build and run This project offers sample Dockerfiles for Oracle WebLogic Server 12cR2 (12.2.1.3). It provides at least one Dockerfile for the 'developer' distribution, a second Dockerfile for the 'generic' distribution, and a third Dockerfile for the 'infrastructure' distribution. To assist in building the images, you can use the [`buildDockerImage.sh`](dockerfiles/buildDockerImage.sh) script. See below for instructions and usage. @@ -34,12 +34,12 @@ Before you build, select the version and distribution for which you want to buil LICENSE UPL 1.0 - Copyright (c) 2014-2015 Oracle and/or its affiliates. All rights reserved. + Copyright (c) 2014-2018 Oracle and/or its affiliates. All rights reserved. **IMPORTANT:** The resulting images will have an empty domain (Administration Server only), by default. You must extend the image with your own Dockerfile, and create your domain using WLST. You might take a look at the use case samples. ## Samples for Oracle WebLogic Server domain creation -To give users an idea of how to create a domain from a custom Dockerfile, to extend the WebLogic Server image, we provide a few samples for 12c versions of the developer distribution. For an example, we provide samples to create a `12.2.1.3 medrec` domain. +To give users an idea of how to create a domain from a custom Dockerfile to extend the WebLogic Server image, we provide a few samples for 12c versions of the developer distribution. For an example, we provide samples to create a `12.2.1.3 medrec` domain. ### Sample installation and base domain for Oracle WebLogic Server 12.2.1.3 The image `oracle/weblogic:12.2.1.3-developer` will configure a `base_domain` with the following settings: @@ -52,21 +52,21 @@ The image `oracle/weblogic:12.2.1.3-developer` will configure a `base_domain` wi * Admin Server on port: `7001` * Production Mode: `developer` -**IMPORTANT:** If you intend to run these images in production, you must change the Production Mode to production. +**IMPORTANT:** If you intend to run these images in production, you must change the Production Mode to `production`. ### Admin password -On the first startup of the container, a random password will be generated for the Administration of the domain. You can find this password in the output line: +On the first startup of the container, a random password will be generated for the administration of the domain. You can find this password in the output line: `Oracle WebLogic Server auto generated Admin password:` -If you need to find the password at a later time, grep for `password` in the Docker logs generated during the startup of the container. To look at the Docker container logs run: +If you need to find the password at a later time, grep for `password` in the Docker logs generated during the startup of the container. To look at the Docker container logs, run: $ docker logs --details ### Write your own Oracle WebLogic Server domain with WLST -The best way to create your own, or extend domains, is by using [WebLogic Scripting Tool](https://docs.oracle.com/middleware/1221/cross/wlsttasks.htm). You can find an example of a WLST script to create domains at [`create-wls-domain.py`](dockerfiles/12.2.1.3/container-scripts/create-wls-domain.py). You may want to tune this script with your own setup to create datasources and connection pools, security realms, deploy artifacts, and so on. You can also extend images and override an existing domain, or create a new one with WLST. +The best way to create your own, or extend domains, is by using the [WebLogic Scripting Tool](https://docs.oracle.com/middleware/1221/cross/wlsttasks.htm). You can find an example of a WLST script to create domains at [`create-wls-domain.py`](dockerfiles/12.2.1.3/container-scripts/create-wls-domain.py). You may want to tune this script with your own setup to create datasources and connection pools, security realms, deploy artifacts, and so on. You can also extend images and override an existing domain, or create a new one with WLST. ## Building the Oracle WebLogic Server Docker image To try a sample of a WebLogic Server image with a base domain configured, follow the steps below: @@ -75,11 +75,11 @@ To try a sample of a WebLogic Server image with a base domain configured, follow `$ sh buildDockerImage.sh -v 12.2.1.3-d` - 2. Verify you now have this image in place with: + 2. Verify that you now have this image in place with: `$ docker images` - 3. Start a container from the image created in step 1: + 3. Start a container from the image created in step 1. You can override the default values of the following parameters during runtime with the `-e` option: * `ADMIN_NAME` (default: `AdminServer`) * `ADMIN_PORT` (default: `7001`) @@ -96,7 +96,7 @@ To try a sample of a WebLogic Server image with a base domain configured, follow `$ docker inspect --format '{{.NetworkSettings.IPAddress}}' ` - This returns the IP address (example `xxx.xx.x.x`) of the container. Go to your browser and enter `http://xxx.xx.x.x:7001/console` + This returns the IP address of the container (for example, `xxx.xx.x.x`). Go to your browser and enter `http://xxx.xx.x.x:7001/console` ## Choose your Oracle WebLogic Server distribution diff --git a/OracleWebLogic/dockerfiles/12.2.1.3/container-scripts/create-wls-domain.py b/OracleWebLogic/dockerfiles/12.2.1.3/container-scripts/create-wls-domain.py index b25778cf20..8956294014 100644 --- a/OracleWebLogic/dockerfiles/12.2.1.3/container-scripts/create-wls-domain.py +++ b/OracleWebLogic/dockerfiles/12.2.1.3/container-scripts/create-wls-domain.py @@ -1,4 +1,4 @@ -#Copyright (c) 2014-2017 Oracle and/or its affiliates. All rights reserved. +#Copyright (c) 2014-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. # diff --git a/OracleWebLogic/dockerfiles/12.2.1.3/container-scripts/createAndStartEmptyDomain.sh b/OracleWebLogic/dockerfiles/12.2.1.3/container-scripts/createAndStartEmptyDomain.sh index 03a84e7fde..661ecd367e 100755 --- a/OracleWebLogic/dockerfiles/12.2.1.3/container-scripts/createAndStartEmptyDomain.sh +++ b/OracleWebLogic/dockerfiles/12.2.1.3/container-scripts/createAndStartEmptyDomain.sh @@ -1,6 +1,6 @@ #!/bin/bash # -#Copyright (c) 2014-2017 Oracle and/or its affiliates. All rights reserved. +#Copyright (c) 2014-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. # @@ -53,15 +53,15 @@ if [ -z $ADMIN_PASSWORD ]; then else s=${ADMIN_PASSWORD} echo " ----> 'weblogic' admin password: $s" -fi +fi sed -i -e "s|ADMIN_PASSWORD|$s|g" /u01/oracle/create-wls-domain.py # Create an empty domain wlst.sh -skipWLSModuleScanning /u01/oracle/create-wls-domain.py -mkdir -p ${DOMAIN_HOME}/servers/AdminServer/security/ -echo "username=${ADMIN_USERNAME}" > /u01/oracle/user_projects/domains/$DOMAIN_NAME/servers/AdminServer/security/boot.properties -echo "password=$s" >> /u01/oracle/user_projects/domains/$DOMAIN_NAME/servers/AdminServer/security/boot.properties -${DOMAIN_HOME}/bin/setDomainEnv.sh +mkdir -p ${DOMAIN_HOME}/servers/AdminServer/security/ +echo "username=${ADMIN_USERNAME}" > /u01/oracle/user_projects/domains/$DOMAIN_NAME/servers/AdminServer/security/boot.properties +echo "password=$s" >> /u01/oracle/user_projects/domains/$DOMAIN_NAME/servers/AdminServer/security/boot.properties +${DOMAIN_HOME}/bin/setDomainEnv.sh fi @@ -72,5 +72,3 @@ tail -f ${DOMAIN_HOME}/servers/AdminServer/logs/AdminServer.log & childPID=$! wait $childPID - - diff --git a/OracleWebLogic/dockerfiles/12.2.1.3/install.file b/OracleWebLogic/dockerfiles/12.2.1.3/install.file index 55fd59a875..35f33ef20c 100644 --- a/OracleWebLogic/dockerfiles/12.2.1.3/install.file +++ b/OracleWebLogic/dockerfiles/12.2.1.3/install.file @@ -1,4 +1,4 @@ -# Copyright (c) 2014-2015 Oracle and/or its affiliates. All rights reserved. +# Copyright (c) 2014-2018 Oracle and/or its affiliates. All rights reserved. [ENGINE] #DO NOT CHANGE THIS. diff --git a/OracleWebLogic/dockerfiles/12.2.1/Dockerfile.developer b/OracleWebLogic/dockerfiles/12.2.1/Dockerfile.developer index c1cabc1726..c37db591b4 100644 --- a/OracleWebLogic/dockerfiles/12.2.1/Dockerfile.developer +++ b/OracleWebLogic/dockerfiles/12.2.1/Dockerfile.developer @@ -1,24 +1,24 @@ # LICENSE UPL 1.0 # -# Copyright (c) 2014-2015 Oracle and/or its affiliates. All rights reserved. +# Copyright (c) 2014-2018 Oracle and/or its affiliates. All rights reserved. # # ORACLE DOCKERFILES PROJECT # -------------------------- # This is the Dockerfile for WebLogic 12.2.1 Quick Install Distro -# +# # REQUIRED FILES TO BUILD THIS IMAGE # ---------------------------------- -# (1) fmw_12.2.1.0.0_wls_quick_Disk1_1of1.zip -# Download the Developer Quick installer from http://www.oracle.com/technetwork/middleware/weblogic/downloads/wls-for-dev-1703574.html +# (1) fmw_12.2.1.0.0_wls_quick_Disk1_1of1.zip +# Download the Developer Quick installer from http://www.oracle.com/technetwork/middleware/weblogic/downloads/wls-for-dev-1703574.html # # (2) server-jre-8uXX-linux-x64.tar.gz -# Download from http://www.oracle.com/technetwork/java/javase/downloads/server-jre8-downloads-2133154.html +# Download from http://www.oracle.com/technetwork/java/javase/downloads/server-jre8-downloads-2133154.html # # HOW TO BUILD THIS IMAGE # ----------------------- # Put all downloaded files in the same directory as this Dockerfile -# Run: -# $ docker build -t oracle/weblogic:12.2.1-developer . +# Run: +# $ docker build -t oracle/weblogic:12.2.1-developer . # # IMPORTANT # --------- @@ -28,7 +28,7 @@ # # You can go into 'samples/1221-domain' after building the developer install image # and build the domain image, for example: -# +# # $ cd samples/1221-domain # $ docker build -t mywls . # @@ -59,13 +59,13 @@ ENV FMW_PKG=fmw_12.2.1.0.0_wls_quick_Disk1_1of1.zip \ FMW_JAR=fmw_12.2.1.0.0_wls_quick.jar \ DEBUG_FLAG=true\ PRODUCTION_MODE=dev - + # Copy packages # ------------- COPY $FMW_PKG install.file oraInst.loc /u01/ RUN chown oracle:oracle -R /u01 - + # Install #------------------------------------------------------------- USER oracle @@ -73,7 +73,7 @@ RUN cd /u01 && $JAVA_HOME/bin/jar xf /u01/$FMW_PKG && cd - && \ $JAVA_HOME/bin/java -jar /u01/$FMW_JAR -invPtrLoc /u01/oraInst.loc -jreLoc $JAVA_HOME -ignoreSysPrereqs -force -novalidation ORACLE_HOME=$ORACLE_HOME && \ rm /u01/$FMW_JAR /u01/$FMW_PKG /u01/oraInst.loc /u01/install.file -WORKDIR $ORACLE_HOME +WORKDIR $ORACLE_HOME -# Define default command to start bash. +# Define default command to start bash. CMD ["bash"] diff --git a/OracleWebLogic/dockerfiles/12.2.1/Dockerfile.generic b/OracleWebLogic/dockerfiles/12.2.1/Dockerfile.generic index 38d9d6450e..ae54ee7f5e 100644 --- a/OracleWebLogic/dockerfiles/12.2.1/Dockerfile.generic +++ b/OracleWebLogic/dockerfiles/12.2.1/Dockerfile.generic @@ -1,24 +1,24 @@ # LICENSE UPL 1.0 # -# Copyright (c) 2014-2015 Oracle and/or its affiliates. All rights reserved. +# Copyright (c) 2014-2018 Oracle and/or its affiliates. All rights reserved. # # ORACLE DOCKERFILES PROJECT # -------------------------- # This is the Dockerfile for WebLogic 12.2.1 Generic Distro -# +# # REQUIRED FILES TO BUILD THIS IMAGE # ---------------------------------- -# (1) fmw_12.2.1.0.0_wls_Disk1_1of1.zip -# Download the Generic installer from http://www.oracle.com/technetwork/middleware/weblogic/downloads/wls-for-dev-1703574.html +# (1) fmw_12.2.1.0.0_wls_Disk1_1of1.zip +# Download the Generic installer from http://www.oracle.com/technetwork/middleware/weblogic/downloads/wls-for-dev-1703574.html # # (2) server-jre-8uXX-linux-x64.tar.gz -# Download from http://www.oracle.com/technetwork/java/javase/downloads/server-jre8-downloads-2133154.html +# Download from http://www.oracle.com/technetwork/java/javase/downloads/server-jre8-downloads-2133154.html # # HOW TO BUILD THIS IMAGE # ----------------------- # Put all downloaded files in the same directory as this Dockerfile -# Run: -# $ docker build -f Dockerfile.generic -t oracle/weblogic:12.2.1-generic . +# Run: +# $ docker build -f Dockerfile.generic -t oracle/weblogic:12.2.1-generic . # # IMPORTANT # --------- @@ -28,7 +28,7 @@ # # You can go into 'samples/1221-domain' after building the Generic install image # and build the domain image, for example: -# +# # $ cd samples/1221-domain # $ docker build -t mywls . # @@ -47,7 +47,7 @@ MAINTAINER Bruno Borges ENV ORACLE_HOME=/u01/oracle \ USER_MEM_ARGS="-Djava.security.egd=file:/dev/./urandom" \ PATH=$PATH:/usr/java/default/bin:/u01/oracle/oracle_common/common/bin - + # Setup filesystem and oracle user # Adjust file permissions, go to /u01 as user 'oracle' to proceed with WLS installation # ------------------------------------------------------------ @@ -58,7 +58,7 @@ RUN mkdir -p /u01 && \ # Environment variables required for this build (do NOT change) # ------------------------------------------------------------- ENV FMW_PKG=fmw_12.2.1.0.0_wls_Disk1_1of1.zip \ - FMW_JAR=fmw_12.2.1.0.0_wls.jar + FMW_JAR=fmw_12.2.1.0.0_wls.jar # Copy packages # ------------- @@ -72,7 +72,7 @@ RUN cd /u01 && $JAVA_HOME/bin/jar xf /u01/$FMW_PKG && cd - && \ $JAVA_HOME/bin/java -jar /u01/$FMW_JAR -silent -responseFile /u01/install.file -invPtrLoc /u01/oraInst.loc -jreLoc $JAVA_HOME -ignoreSysPrereqs -force -novalidation ORACLE_HOME=$ORACLE_HOME INSTALL_TYPE="WebLogic Server" && \ rm /u01/$FMW_JAR /u01/$FMW_PKG /u01/oraInst.loc /u01/install.file -WORKDIR $ORACLE_HOME +WORKDIR $ORACLE_HOME -# Define default command to start bash. +# Define default command to start bash. CMD ["bash"] diff --git a/OracleWebLogic/dockerfiles/12.2.1/Dockerfile.infrastructure b/OracleWebLogic/dockerfiles/12.2.1/Dockerfile.infrastructure index 9eada5fe67..079a4dd84c 100644 --- a/OracleWebLogic/dockerfiles/12.2.1/Dockerfile.infrastructure +++ b/OracleWebLogic/dockerfiles/12.2.1/Dockerfile.infrastructure @@ -1,24 +1,24 @@ # LICENSE UPL 1.0 # -# Copyright (c) 2014-2015 Oracle and/or its affiliates. All rights reserved. +# Copyright (c) 2014-2018 Oracle and/or its affiliates. All rights reserved. # # ORACLE DOCKERFILES PROJECT # -------------------------- # This is the Dockerfile for WebLogic 12.2.1 Generic Distro -# +# # REQUIRED FILES TO BUILD THIS IMAGE # ---------------------------------- -# (1) fmw_12.2.1.0.0_infrastructure_Disk1_1of1.zip -# Download the Generic installer from http://www.oracle.com/technetwork/middleware/weblogic/downloads/wls-for-dev-1703574.html +# (1) fmw_12.2.1.0.0_infrastructure_Disk1_1of1.zip +# Download the Generic installer from http://www.oracle.com/technetwork/middleware/weblogic/downloads/wls-for-dev-1703574.html # # (2) server-jre-8uXX-linux-x64.tar.gz -# Download from http://www.oracle.com/technetwork/java/javase/downloads/server-jre8-downloads-2133154.html +# Download from http://www.oracle.com/technetwork/java/javase/downloads/server-jre8-downloads-2133154.html # # HOW TO BUILD THIS IMAGE # ----------------------- # Put all downloaded files in the same directory as this Dockerfile -# Run: -# $ docker build -t oracle/weblogic:12.2.1-generic . +# Run: +# $ docker build -t oracle/weblogic:12.2.1-generic . # # IMPORTANT # --------- @@ -28,7 +28,7 @@ # # You can go into 'samples/1221-domain' after building the Generic install image # and build the domain image, for example: -# +# # $ cd samples/1221-domain # $ docker build -t mywls . # @@ -47,7 +47,7 @@ MAINTAINER Bruno Borges ENV ORACLE_HOME=/u01/oracle \ USER_MEM_ARGS="-Djava.security.egd=file:/dev/./urandom" \ PATH=$PATH:/usr/java/default/bin:/u01/oracle/oracle_common/common/bin - + # Setup filesystem and oracle user # Adjust file permissions, go to /u01 as user 'oracle' to proceed with WLS installation # ------------------------------------------------------------ @@ -58,8 +58,8 @@ RUN mkdir -p /u01 && \ # Environment variables required for this build (do NOT change) # ------------------------------------------------------------- ENV FMW_PKG=fmw_12.2.1.0.0_infrastructure_Disk1_1of1.zip \ - FMW_JAR=fmw_12.2.1.0.0_infrastructure.jar - + FMW_JAR=fmw_12.2.1.0.0_infrastructure.jar + # Copy packages # ------------- COPY $FMW_PKG install.file oraInst.loc /u01/ @@ -74,7 +74,7 @@ RUN cd /u01 && $JAVA_HOME/bin/jar xf /u01/$FMW_PKG && cd - && \ rm /u01/$FMW_JAR /u01/$FMW_PKG /u01/oraInst.loc /u01/install.file USER oracle -WORKDIR $ORACLE_HOME +WORKDIR $ORACLE_HOME -# Define default command to start bash. +# Define default command to start bash. CMD ["bash"] diff --git a/OracleWebLogic/dockerfiles/buildDockerImage.sh b/OracleWebLogic/dockerfiles/buildDockerImage.sh index ed87593882..aed6f262e0 100755 --- a/OracleWebLogic/dockerfiles/buildDockerImage.sh +++ b/OracleWebLogic/dockerfiles/buildDockerImage.sh @@ -1,20 +1,20 @@ #!/bin/bash -# +# # Since: October, 2014 # Author: bruno.borges@oracle.com # Description: script to build a Docker image for WebLogic -# +# # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER. -# -# Copyright (c) 2014-2015 Oracle and/or its affiliates. All rights reserved. -# +# +# Copyright (c) 2014-2018 Oracle and/or its affiliates. All rights reserved. +# usage() { cat << EOF Usage: buildDockerImage.sh -v [version] [-d | -g | -i] [-s] [-c] Builds a Docker Image for Oracle WebLogic. - + Parameters: -v: version to build. Required. Choose one of: $(for i in $(ls -d */); do echo -n "${i%%/} "; done) @@ -28,7 +28,7 @@ Parameters: LICENSE UPL 1.0 -Copyright (c) 2014-2015 Oracle and/or its affiliates. All rights reserved. +Copyright (c) 2014-2018 Oracle and/or its affiliates. All rights reserved. EOF exit 0 @@ -152,8 +152,8 @@ echo "" if [ $? -eq 0 ]; then cat << EOF - WebLogic Docker Image for '$DISTRIBUTION' version $VERSION is ready to be extended: - + WebLogic Docker Image for '$DISTRIBUTION' version $VERSION is ready to be extended: + --> $IMAGE_NAME Build completed in $BUILD_ELAPSED seconds. @@ -162,4 +162,3 @@ EOF else echo "WebLogic Docker Image was NOT successfully created. Check the output and correct any reported problems with the docker build operation." fi - diff --git a/OracleWebLogic/samples/1213-domain/Dockerfile b/OracleWebLogic/samples/1213-domain/Dockerfile index b1c42c9627..faf747a124 100644 --- a/OracleWebLogic/samples/1213-domain/Dockerfile +++ b/OracleWebLogic/samples/1213-domain/Dockerfile @@ -1,6 +1,6 @@ # LICENSE UPL 1.0 # -# Copyright (c) 2014-2015 Oracle and/or its affiliates. All rights reserved. +# Copyright (c) 2014-2018 Oracle and/or its affiliates. All rights reserved. # # ORACLE DOCKERFILES PROJECT # -------------------------- @@ -8,16 +8,16 @@ # # The 'base-domain' created here has Java EE 7 APIs enabled by default: # - JAX-RS 2.0 shared lib deployed -# - JPA 2.1, +# - JPA 2.1, # - WebSockets and JSON-P # -# Util scripts are copied into the image enabling users to plug NodeManager +# Util scripts are copied into the image enabling users to plug NodeManager # magically into the AdminServer running on another container as a Machine. # # HOW TO BUILD THIS IMAGE # ----------------------- # Put all downloaded files in the same directory as this Dockerfile -# Run: +# Run: # $ sudo docker build -t 1213-domain --build-arg ADMIN_PASSWORD=welcome1 . # @@ -52,17 +52,17 @@ COPY container-scripts/* /u01/oracle/ WORKDIR /u01/oracle RUN /u01/oracle/wlst /u01/oracle/create-wls-domain.py && \ mkdir -p /u01/oracle/user_projects/domains/base_domain/servers/AdminServer/security && \ - echo "username=weblogic" > /u01/oracle/user_projects/domains/base_domain/servers/AdminServer/security/boot.properties && \ + echo "username=weblogic" > /u01/oracle/user_projects/domains/base_domain/servers/AdminServer/security/boot.properties && \ echo "password=$ADMIN_PASSWORD" >> /u01/oracle/user_projects/domains/base_domain/servers/AdminServer/security/boot.properties && \ - echo ". /u01/oracle/user_projects/domains/base_domain/bin/setDomainEnv.sh" >> /u01/oracle/.bashrc && \ + echo ". /u01/oracle/user_projects/domains/base_domain/bin/setDomainEnv.sh" >> /u01/oracle/.bashrc && \ echo "export PATH=$PATH:/u01/oracle/wlserver/common/bin:/u01/oracle/user_projects/domains/base_domain/bin" >> /u01/oracle/.bashrc && \ cp /u01/oracle/commEnv.sh /u01/oracle/wlserver/common/bin/commEnv.sh && \ - rm /u01/oracle/create-wls-domain.py /u01/oracle/jaxrs2-template.jar + rm /u01/oracle/create-wls-domain.py /u01/oracle/jaxrs2-template.jar # Expose Node Manager default port, and also default http/https ports for admin console EXPOSE $NM_PORT $ADMIN_PORT $MS_PORT -WORKDIR $DOMAIN_HOME +WORKDIR $DOMAIN_HOME -# Define default command to start bash. +# Define default command to start bash. CMD ["startWebLogic.sh"] diff --git a/OracleWebLogic/samples/1213-domain/container-scripts/add-machine.py b/OracleWebLogic/samples/1213-domain/container-scripts/add-machine.py index a98d539414..56840eb733 100644 --- a/OracleWebLogic/samples/1213-domain/container-scripts/add-machine.py +++ b/OracleWebLogic/samples/1213-domain/container-scripts/add-machine.py @@ -1,4 +1,4 @@ -# Copyright (c) 2014-2016 Oracle and/or its affiliates. All rights reserved. +# Copyright (c) 2014-2018 Oracle and/or its affiliates. All rights reserved. # # Script to create and add NodeManager automatically to the domain's AdminServer running on '$ADMIN_HOST'. # diff --git a/OracleWebLogic/samples/1213-domain/container-scripts/add-server.py b/OracleWebLogic/samples/1213-domain/container-scripts/add-server.py index c9b22b072f..45fa847871 100644 --- a/OracleWebLogic/samples/1213-domain/container-scripts/add-server.py +++ b/OracleWebLogic/samples/1213-domain/container-scripts/add-server.py @@ -1,4 +1,4 @@ -# Copyright (c) 2014-2016 Oracle and/or its affiliates. All rights reserved. +# Copyright (c) 2014-2018 Oracle and/or its affiliates. All rights reserved. # # Script to create and add a Managed Server automatically to the domain's AdminServer running on 'wlsadmin'. # diff --git a/OracleWebLogic/samples/1213-domain/container-scripts/commEnv.sh b/OracleWebLogic/samples/1213-domain/container-scripts/commEnv.sh index 36ccb24e9f..077eaa7481 100755 --- a/OracleWebLogic/samples/1213-domain/container-scripts/commEnv.sh +++ b/OracleWebLogic/samples/1213-domain/container-scripts/commEnv.sh @@ -1,4 +1,4 @@ -# Copyright (c) 2014-2015 Oracle and/or its affiliates. All rights reserved. +# Copyright (c) 2014-2018 Oracle and/or its affiliates. All rights reserved. # # Modified commEnv.sh to enable JPA 2.1 support by default on this WLS installation # ========================= diff --git a/OracleWebLogic/samples/1213-domain/container-scripts/create-wls-domain.py b/OracleWebLogic/samples/1213-domain/container-scripts/create-wls-domain.py index 5eda33734d..ebc31a81e8 100644 --- a/OracleWebLogic/samples/1213-domain/container-scripts/create-wls-domain.py +++ b/OracleWebLogic/samples/1213-domain/container-scripts/create-wls-domain.py @@ -1,4 +1,4 @@ -# Copyright (c) 2014-2015 Oracle and/or its affiliates. All rights reserved. +# Copyright (c) 2014-2018 Oracle and/or its affiliates. All rights reserved. # # WebLogic on Docker Default Domain # diff --git a/OracleWebLogic/samples/1213-domain/container-scripts/createMachine.sh b/OracleWebLogic/samples/1213-domain/container-scripts/createMachine.sh index 0a8122ebe5..0dd0fdd672 100755 --- a/OracleWebLogic/samples/1213-domain/container-scripts/createMachine.sh +++ b/OracleWebLogic/samples/1213-domain/container-scripts/createMachine.sh @@ -1,6 +1,6 @@ #!/bin/bash # -# Copyright (c) 2014-2015 Oracle and/or its affiliates. All rights reserved. +# Copyright (c) 2014-2018 Oracle and/or its affiliates. All rights reserved. # # If log.nm does not exists, container is starting for 1st time diff --git a/OracleWebLogic/samples/1213-domain/container-scripts/createServer.sh b/OracleWebLogic/samples/1213-domain/container-scripts/createServer.sh index f8b918903c..0f699fc4b3 100755 --- a/OracleWebLogic/samples/1213-domain/container-scripts/createServer.sh +++ b/OracleWebLogic/samples/1213-domain/container-scripts/createServer.sh @@ -1,6 +1,6 @@ #!/bin/bash # -# Copyright (c) 2014-2015 Oracle and/or its affiliates. All rights reserved. +# Copyright (c) 2014-2018 Oracle and/or its affiliates. All rights reserved. # # If log.nm does not exists, container is starting for 1st time diff --git a/OracleWebLogic/samples/1221-appdeploy/Dockerfile b/OracleWebLogic/samples/1221-appdeploy/Dockerfile index 0815b9da18..d6dbd35963 100644 --- a/OracleWebLogic/samples/1221-appdeploy/Dockerfile +++ b/OracleWebLogic/samples/1221-appdeploy/Dockerfile @@ -1,7 +1,7 @@ # LICENSE UPL 1.0 # -# Copyright (c) 2015 Oracle and/or its affiliates. All rights reserved. -# +# Copyright (c) 2018 Oracle and/or its affiliates. All rights reserved. +# # ORACLE DOCKERFILES PROJECT # -------------------------- # This Dockerfile extends the Oracle WebLogic image built under 1221-domain with tag name '1221-domain' @@ -11,13 +11,13 @@ # # HOW TO BUILD THIS IMAGE # ----------------------- -# Run: +# Run: # $ docker build -t 1221-appdeploy . # # Pull base image # --------------- -FROM 1221-domain +FROM 1221-domain # Maintainer # ---------- diff --git a/OracleWebLogic/samples/1221-appdeploy/README.md b/OracleWebLogic/samples/1221-appdeploy/README.md index 4d054d5362..f8ba1cb8a5 100644 --- a/OracleWebLogic/samples/1221-appdeploy/README.md +++ b/OracleWebLogic/samples/1221-appdeploy/README.md @@ -2,7 +2,7 @@ Example of Image with WLS Domain ================================ This Dockerfile extends the Oracle WebLogic image built under 1221-domain with tag name '1221-domain' -It will deploy during Docker image build phase, using a WLST Offline script, any package defined in APP_PKG_FILE located in APP_PKG_LOCATION into the DOMAIN_HOME with name defined in APP_NAME +It will deploy during Docker image build phase, using a WLST Offline script, any package defined in APP_PKG_FILE located in APP_PKG_LOCATION into the DOMAIN_HOME with name defined in APP_NAME # How to build and run First make sure you have built sample image inside **1221-domain**. Now to build this sample, run: @@ -16,8 +16,8 @@ To start the containerized Admin Server, run: To start a containerized Managed Server to self-register with the Admin Server above, run: $ docker run -d --link wlsadmin:wlsadmin -p 7002:7002 1221-appdeploy createServer.sh - + To access the sample application, go to **http://localhost:7001/sample**. # Copyright -Copyright (c) 2015 Oracle and/or its affiliates. All rights reserved. +Copyright (c) 2018 Oracle and/or its affiliates. All rights reserved. diff --git a/OracleWebLogic/samples/1221-appdeploy/container-scripts/app-deploy.py b/OracleWebLogic/samples/1221-appdeploy/container-scripts/app-deploy.py index cfb87e1277..217c1576a7 100644 --- a/OracleWebLogic/samples/1221-appdeploy/container-scripts/app-deploy.py +++ b/OracleWebLogic/samples/1221-appdeploy/container-scripts/app-deploy.py @@ -1,4 +1,4 @@ -# Copyright (c) 2015 Oracle and/or its affiliates. All rights reserved. +# Copyright (c) 2018 Oracle and/or its affiliates. All rights reserved. # # WLST Offline for deploying an application under APP_NAME packaged in APP_PKG_FILE located in APP_PKG_LOCATION # It will read the domain under DOMAIN_HOME by default @@ -8,7 +8,7 @@ # import os -# Deployment Information +# Deployment Information domainhome = os.environ.get('DOMAIN_HOME', '/u01/oracle/user_projects/domains/base_domain') admin_name = os.environ.get('ADMIN_NAME', 'AdminServer') appname = os.environ.get('APP_NAME', 'sample') @@ -26,7 +26,7 @@ app = create(appname, 'AppDeployment') app.setSourcePath(appdir + '/' + apppkg) app.setStagingMode('nostage') - + # Assign application to AdminServer # ================================= assign('AppDeployment', appname, 'Target', admin_name) diff --git a/OracleWebLogic/samples/1221-docker-compose/docker-compose.yml b/OracleWebLogic/samples/1221-docker-compose/docker-compose.yml index 514e11ead2..d1de4cb2a2 100644 --- a/OracleWebLogic/samples/1221-docker-compose/docker-compose.yml +++ b/OracleWebLogic/samples/1221-docker-compose/docker-compose.yml @@ -1,7 +1,7 @@ -# Copyright (c) 2016 Oracle and/or its affiliates. All rights reserved. +# Copyright (c) 2018 Oracle and/or its affiliates. All rights reserved. # # Example of using Docker Compose to deploy a WebLogic Cluster from image '1221-domain' -# +# # This Docker Compose file will only work with Docker 1.10+ and Compose 1.6+ # # To run, call: @@ -13,7 +13,7 @@ # To scale Node Managers only instead, call: # $ docker-compose scale nodemanager=2 # -# Author: Bruno Borges +# Author: Bruno Borges # # Note: If scaling dozens of instances of managed server at once, you may face a StuckThreadMaxTime # @@ -36,14 +36,14 @@ services: image: &image 1221-appdeploy container_name: wlsadmin networks: - - *network + - *network # Deploys a container running a Managed Server and a Node Manager to control MS from AdminServer managedserver: image: *image command: createServer.sh networks: - - *network + - *network depends_on: - *admin @@ -52,7 +52,7 @@ services: image: *image command: createMachine.sh networks: - - *network + - *network depends_on: - *admin @@ -60,9 +60,8 @@ services: webtier: image: 1221-webtier-apache networks: - - *network + - *network environment: - WEBLOGIC_CLUSTER="managedserver:7002" links: - managedserver - diff --git a/OracleWebLogic/samples/1221-domain-with-resources/Dockerfile b/OracleWebLogic/samples/1221-domain-with-resources/Dockerfile index cc3c59f991..0ca735bc96 100644 --- a/OracleWebLogic/samples/1221-domain-with-resources/Dockerfile +++ b/OracleWebLogic/samples/1221-domain-with-resources/Dockerfile @@ -1,7 +1,7 @@ # LICENSE UPL 1.0 # -# Copyright (c) 2015 Oracle and/or its affiliates. All rights reserved. -# +# Copyright (c) 2018 Oracle and/or its affiliates. All rights reserved. +# # ORACLE DOCKERFILES PROJECT # -------------------------- # This Dockerfile extends the Oracle WebLogic sample 1221-domain @@ -11,13 +11,13 @@ # # HOW TO BUILD THIS IMAGE # ----------------------- -# Run: +# Run: # $ docker build -t 1221-domain-with-resources . # # Pull base image # --------------- -FROM 1221-domain +FROM 1221-domain # Maintainer # ---------- diff --git a/OracleWebLogic/samples/1221-domain-with-resources/README.md b/OracleWebLogic/samples/1221-domain-with-resources/README.md index 911789feb6..e981c039b6 100644 --- a/OracleWebLogic/samples/1221-domain-with-resources/README.md +++ b/OracleWebLogic/samples/1221-domain-with-resources/README.md @@ -2,10 +2,10 @@ Example of Image with WLS Domain ================================ This Dockerfile extends the Oracle WebLogic image built under 1221-domain with tag name '1221-domain' -WLST Offline script are used during Docker image build phase to deploy the +WLST Offline script are used during Docker image build phase to deploy the - JDBC Data Source (Derby database information is picked up from the datasource.properties file) -- JMS artifacts (JMS Server, Queue etc). +- JMS artifacts (JMS Server, Queue etc). # How to build and run First make sure you have built sample image inside **1221-domain**. Now to build this sample, run: @@ -24,4 +24,4 @@ When configured to do JMS Persistance the persistent store should be mapped to a # Copyright -Copyright (c) 2015 Oracle and/or its affiliates. All rights reserved. +Copyright (c) 2018 Oracle and/or its affiliates. All rights reserved. diff --git a/OracleWebLogic/samples/1221-domain-with-resources/container-scripts/ds-deploy.py b/OracleWebLogic/samples/1221-domain-with-resources/container-scripts/ds-deploy.py index 8015e27fa7..49769fd95e 100644 --- a/OracleWebLogic/samples/1221-domain-with-resources/container-scripts/ds-deploy.py +++ b/OracleWebLogic/samples/1221-domain-with-resources/container-scripts/ds-deploy.py @@ -1,4 +1,4 @@ -# Copyright (c) 2015 Oracle and/or its affiliates. All rights reserved. +# Copyright (c) 2018 Oracle and/or its affiliates. All rights reserved. # # WLST Offline for deploying an application under APP_NAME packaged in APP_PKG_FILE located in APP_PKG_LOCATION # It will read the domain under DOMAIN_HOME by default @@ -8,7 +8,7 @@ # import os -# Deployment Information +# Deployment Information domainname = os.environ.get('DOMAIN_NAME', 'base_domain') domainhome = os.environ.get('DOMAIN_HOME', '/u01/oracle/user_projects/domains/' + domainname) cluster_name = os.environ.get("CLUSTER_NAME", "DockerCluster") @@ -18,18 +18,18 @@ # =========================== readDomain(domainhome) -# Create Datasource +# Create Datasource # ================== create(dsname, 'JDBCSystemResource') cd('/JDBCSystemResource/' + dsname + '/JdbcResource/' + dsname) cmo.setName(dsname) - + cd('/JDBCSystemResource/' + dsname + '/JdbcResource/' + dsname) create('myJdbcDataSourceParams','JDBCDataSourceParams') cd('JDBCDataSourceParams/NO_NAME_0') set('JNDIName', java.lang.String(dsjndiname)) set('GlobalTransactionsProtocol', java.lang.String('None')) - + cd('/JDBCSystemResource/' + dsname + '/JdbcResource/' + dsname) create('myJdbcDriverParams','JDBCDriverParams') cd('JDBCDriverParams/NO_NAME_0') @@ -37,7 +37,7 @@ set('URL', dsurl) set('PasswordEncrypted', dspassword) set('UseXADataSourceInterface', 'false') - + print 'create JDBCDriverParams Properties' create('myProperties','Properties') cd('Properties/NO_NAME_0') diff --git a/OracleWebLogic/samples/1221-domain-with-resources/container-scripts/jms-deploy.py b/OracleWebLogic/samples/1221-domain-with-resources/container-scripts/jms-deploy.py index 4939947500..315e9665df 100644 --- a/OracleWebLogic/samples/1221-domain-with-resources/container-scripts/jms-deploy.py +++ b/OracleWebLogic/samples/1221-domain-with-resources/container-scripts/jms-deploy.py @@ -1,4 +1,4 @@ -# Copyright (c) 2015 Oracle and/or its affiliates. All rights reserved. +# Copyright (c) 2018 Oracle and/or its affiliates. All rights reserved. # # WLST Offline for deploying an application under APP_NAME packaged in APP_PKG_FILE located in APP_PKG_LOCATION # It will read the domain under DOMAIN_HOME by default @@ -8,7 +8,7 @@ # import os -# Deployment Information +# Deployment Information domainname = os.environ.get('DOMAIN_NAME', 'base_domain') admin_name = os.environ.get('ADMIN_NAME', 'AdminServer') domainhome = os.environ.get('DOMAIN_HOME', '/u01/oracle/user_projects/domains/' + domainname) @@ -40,7 +40,7 @@ cd('/JMSServers/DockerJMSServer') set('PersistentStore', 'DockerFileStore') -print('FileStore_name : [%s]' % getMBean('/FileStores/DockerFileStore')) +print('FileStore_name : [%s]' % getMBean('/FileStores/DockerFileStore')) cd('/') assign('JMSServer', 'DockerJMSServer', 'Target', admin_name) @@ -60,7 +60,7 @@ cd('/JMSSystemResource/DockerJMSSystemResource') create('DockerQueueSubDeployment', 'SubDeployment') -# Target resources to the servers +# Target resources to the servers # =============================== cd('/') assign('JMSSystemResource.SubDeployment', 'DockerJMSSystemResource.DockerQueueSubDeployment', 'Target', 'DockerJMSServer') diff --git a/OracleWebLogic/samples/1221-domain/Dockerfile b/OracleWebLogic/samples/1221-domain/Dockerfile index 312502601d..ad00219774 100644 --- a/OracleWebLogic/samples/1221-domain/Dockerfile +++ b/OracleWebLogic/samples/1221-domain/Dockerfile @@ -1,18 +1,18 @@ # LICENSE UPL 1.0 # -# Copyright (c) 2014-2015 Oracle and/or its affiliates. All rights reserved. +# Copyright (c) 2014-2018 Oracle and/or its affiliates. All rights reserved. # # ORACLE DOCKERFILES PROJECT # -------------------------- # This Dockerfile extends the Oracle WebLogic image by creating a sample domain. # -# Util scripts are copied into the image enabling users to plug NodeManager +# Util scripts are copied into the image enabling users to plug NodeManager # automatically into the AdminServer running on another container. # # HOW TO BUILD THIS IMAGE # ----------------------- # Put all downloaded files in the same directory as this Dockerfile -# Run: +# Run: # $ sudo docker build -t 1221-domain --build-arg ADMIN_PASSWORD=welcome1 . # # Pull base image @@ -61,12 +61,12 @@ RUN /u01/oracle/wlst /u01/oracle/create-wls-domain.py && \ mkdir -p /u01/oracle/user_projects/domains/$DOMAIN_NAME/servers/AdminServer/security && \ echo "username=weblogic" > /u01/oracle/user_projects/domains/$DOMAIN_NAME/servers/AdminServer/security/boot.properties && \ echo "password=$ADMIN_PASSWORD" >> /u01/oracle/user_projects/domains/$DOMAIN_NAME/servers/AdminServer/security/boot.properties && \ - echo ". /u01/oracle/user_projects/domains/$DOMAIN_NAME/bin/setDomainEnv.sh" >> /u01/oracle/.bashrc + echo ". /u01/oracle/user_projects/domains/$DOMAIN_NAME/bin/setDomainEnv.sh" >> /u01/oracle/.bashrc -# Expose Node Manager default port, and also default for admin and managed server +# Expose Node Manager default port, and also default for admin and managed server EXPOSE $NM_PORT $ADMIN_PORT $MS_PORT $DEBUG_PORT WORKDIR $DOMAIN_HOME -# Define default command to start bash. +# Define default command to start bash. CMD ["startWebLogic.sh"] diff --git a/OracleWebLogic/samples/1221-domain/README.md b/OracleWebLogic/samples/1221-domain/README.md index cc2994dd62..75a9d29c98 100644 --- a/OracleWebLogic/samples/1221-domain/README.md +++ b/OracleWebLogic/samples/1221-domain/README.md @@ -22,4 +22,4 @@ The above scenario from this sample will give you a WebLogic domain with a clust You may create more containerized Managed Servers by calling the `docker` command above for `createServer.sh` as long you link properly with the Admin Server. For an example of multihost enviornment, check the sample `1221-multihost`. # Copyright -Copyright (c) 2014-2016 Oracle and/or its affiliates. All rights reserved. +Copyright (c) 2014-2018 Oracle and/or its affiliates. All rights reserved.8 diff --git a/OracleWebLogic/samples/1221-domain/container-scripts/add-machine.py b/OracleWebLogic/samples/1221-domain/container-scripts/add-machine.py index 3390b97691..b5ddc9b459 100644 --- a/OracleWebLogic/samples/1221-domain/container-scripts/add-machine.py +++ b/OracleWebLogic/samples/1221-domain/container-scripts/add-machine.py @@ -1,4 +1,4 @@ -# Copyright (c) 2014-2016 Oracle and/or its affiliates. All rights reserved. +# Copyright (c) 2014-2018 Oracle and/or its affiliates. All rights reserved. # # Script to create and add NodeManager automatically to the domain's AdminServer running on '$ADMIN_HOST'. # diff --git a/OracleWebLogic/samples/1221-domain/container-scripts/add-server.py b/OracleWebLogic/samples/1221-domain/container-scripts/add-server.py index 6cc3f5051e..8cdafed78b 100644 --- a/OracleWebLogic/samples/1221-domain/container-scripts/add-server.py +++ b/OracleWebLogic/samples/1221-domain/container-scripts/add-server.py @@ -1,4 +1,4 @@ -# Copyright (c) 2014-2016 Oracle and/or its affiliates. All rights reserved. +# Copyright (c) 2014-2018 Oracle and/or its affiliates. All rights reserved. # # Script to create and add a Managed Server automatically to the domain's AdminServer running on 'wlsadmin'. # diff --git a/OracleWebLogic/samples/1221-domain/container-scripts/create-wls-domain.py b/OracleWebLogic/samples/1221-domain/container-scripts/create-wls-domain.py index 8970956d6e..2ccca4ec4e 100644 --- a/OracleWebLogic/samples/1221-domain/container-scripts/create-wls-domain.py +++ b/OracleWebLogic/samples/1221-domain/container-scripts/create-wls-domain.py @@ -1,4 +1,4 @@ -# Copyright (c) 2014-2015 Oracle and/or its affiliates. All rights reserved. +# Copyright (c) 2014-2018 Oracle and/or its affiliates. All rights reserved. # # WebLogic on Docker Default Domain # diff --git a/OracleWebLogic/samples/1221-domain/container-scripts/createMachine.sh b/OracleWebLogic/samples/1221-domain/container-scripts/createMachine.sh index 0a8122ebe5..0dd0fdd672 100755 --- a/OracleWebLogic/samples/1221-domain/container-scripts/createMachine.sh +++ b/OracleWebLogic/samples/1221-domain/container-scripts/createMachine.sh @@ -1,6 +1,6 @@ #!/bin/bash # -# Copyright (c) 2014-2015 Oracle and/or its affiliates. All rights reserved. +# Copyright (c) 2014-2018 Oracle and/or its affiliates. All rights reserved. # # If log.nm does not exists, container is starting for 1st time diff --git a/OracleWebLogic/samples/1221-domain/container-scripts/createServer.sh b/OracleWebLogic/samples/1221-domain/container-scripts/createServer.sh index f8b918903c..0f699fc4b3 100755 --- a/OracleWebLogic/samples/1221-domain/container-scripts/createServer.sh +++ b/OracleWebLogic/samples/1221-domain/container-scripts/createServer.sh @@ -1,6 +1,6 @@ #!/bin/bash # -# Copyright (c) 2014-2015 Oracle and/or its affiliates. All rights reserved. +# Copyright (c) 2014-2018 Oracle and/or its affiliates. All rights reserved. # # If log.nm does not exists, container is starting for 1st time diff --git a/OracleWebLogic/samples/1221-medrec/Dockerfile b/OracleWebLogic/samples/1221-medrec/Dockerfile index 31338020c3..e80ff50f02 100644 --- a/OracleWebLogic/samples/1221-medrec/Dockerfile +++ b/OracleWebLogic/samples/1221-medrec/Dockerfile @@ -1,21 +1,21 @@ # LICENSE UPL 1.0 # -# Copyright (c) 2015 Oracle and/or its affiliates. All rights reserved. +# Copyright (c) 2018 Oracle and/or its affiliates. All rights reserved. # # ORACLE DOCKERFILES PROJECT # -------------------------- -# This Dockerfile extends the Oracle WebLogic image by installing the Supplemental package of WebLogic which -# includes extra samples of Java EE, Coherence applications, and Multitenant domains. +# This Dockerfile extends the Oracle WebLogic image by installing the Supplemental package of WebLogic which +# includes extra samples of Java EE, Coherence applications, and Multitenant domains. # # REQUIRED FILES TO BUILD THIS IMAGE # ---------------------------------- # (1) fmw_12.2.1.0.0_wls_supplemental_quick_Disk1_1of1.zip -# Download the Developer Quick installer from http://www.oracle.com/technetwork/middleware/weblogic/downloads/wls-for-dev-1703574.html +# Download the Developer Quick installer from http://www.oracle.com/technetwork/middleware/weblogic/downloads/wls-for-dev-1703574.html # # HOW TO BUILD THIS IMAGE # ----------------------- # Put all downloaded files in the same directory as this Dockerfile -# Run: +# Run: # $ sudo docker build -t 1221-medrec . # @@ -40,12 +40,12 @@ ENV FMW_PKG="fmw_12.2.1.0.0_wls_supplemental_quick_Disk1_1of1.zip" \ # -------------------------------- COPY $FMW_PKG weblogic.properties startSample.sh ./ -# Installation of Supplemental Quick Installer +# Installation of Supplemental Quick Installer # -------------------------------------------- RUN jar xvf $FMW_PKG && \ java -jar $(ls -1 *.jar) ORACLE_HOME=$ORACLE_HOME && \ mkdir -p /u01/oracle/wlserver/samples/server/medrec/ && \ - mv weblogic.properties startSample.sh /u01/oracle/wlserver/samples/server/medrec/ && \ + mv weblogic.properties startSample.sh /u01/oracle/wlserver/samples/server/medrec/ && \ rm $FMW_PKG $(ls -1 *.jar) WORKDIR $ORACLE_HOME/wlserver/samples/server/medrec diff --git a/OracleWebLogic/samples/1221-medrec/README.md b/OracleWebLogic/samples/1221-medrec/README.md index c88101a25f..9c747509a1 100644 --- a/OracleWebLogic/samples/1221-medrec/README.md +++ b/OracleWebLogic/samples/1221-medrec/README.md @@ -3,7 +3,7 @@ Example of Image with WLS Domain This Dockerfile extends the Oracle WebLogic image by installing the Supplemental package of WebLogic which includes extra samples of Java EE, Coherence applications, and Multitenant domains. # How to build and run -First make sure you have built **oracle/weblogic:12.2.1-developer**. +First make sure you have built **oracle/weblogic:12.2.1-developer**. Then download file [fmw_12.2.1.0.0_wls_supplemental_quick_Disk1_1of1.zip](http://www.oracle.com/technetwork/middleware/weblogic/downloads/wls-for-dev-1703574.html) and place it next to this README. @@ -24,4 +24,4 @@ To see other options, visit the [Supplemental Quick Installer README file](http: $ docker run -d -p 7001:7001 1221-medrec mt.single.server.sample # Copyright -Copyright (c) 2015 Oracle and/or its affiliates. All rights reserved. +Copyright (c) 2018 Oracle and/or its affiliates. All rights reserved. diff --git a/OracleWebLogic/samples/1221-medrec/startSample.sh b/OracleWebLogic/samples/1221-medrec/startSample.sh index 77acc9829a..2ab52425f7 100755 --- a/OracleWebLogic/samples/1221-medrec/startSample.sh +++ b/OracleWebLogic/samples/1221-medrec/startSample.sh @@ -1,6 +1,6 @@ #!/bin/sh # -# Copyright (c) 2015 Oracle and/or its affiliates. All rights reserved. +# Copyright (c) 2018 Oracle and/or its affiliates. All rights reserved. # sample=$1 WORK_DIR=/u01/oracle/wlserver/samples/server/medrec/ diff --git a/OracleWebLogic/samples/1221-medrec/weblogic.properties b/OracleWebLogic/samples/1221-medrec/weblogic.properties index 1127b90155..d7ee161d5b 100644 --- a/OracleWebLogic/samples/1221-medrec/weblogic.properties +++ b/OracleWebLogic/samples/1221-medrec/weblogic.properties @@ -1,4 +1,4 @@ -# Copyright (c) 2015 Oracle and/or its affiliates. All rights reserved. +# Copyright (c) 2018 Oracle and/or its affiliates. All rights reserved. # # Weblogic info diff --git a/OracleWebLogic/samples/1221-multihost/README.md b/OracleWebLogic/samples/1221-multihost/README.md index b8029ab2b1..d83b7aea49 100644 --- a/OracleWebLogic/samples/1221-multihost/README.md +++ b/OracleWebLogic/samples/1221-multihost/README.md @@ -16,4 +16,4 @@ This sample demonstrates how to create a cluster of WebLogic on a multihost netw Enjoy multihost WebLogic on Docker. # Copyright -Copyright (c) 2015 Oracle and/or its affiliates. All rights reserved. +Copyright (c) 2018 Oracle and/or its affiliates. All rights reserved. diff --git a/OracleWebLogic/samples/1221-multihost/bootstrap.sh b/OracleWebLogic/samples/1221-multihost/bootstrap.sh index cfcaa0002c..1ca0d608fe 100755 --- a/OracleWebLogic/samples/1221-multihost/bootstrap.sh +++ b/OracleWebLogic/samples/1221-multihost/bootstrap.sh @@ -1,9 +1,9 @@ #!/bin/sh -# -# Copyright (c) 2015 Oracle and/or its affiliates. All rights reserved. +# +# Copyright (c) 2018 Oracle and/or its affiliates. All rights reserved. # # Author: Bruno Borges -# +# echo "Bootstraping the required elements for Docker Machine and Swarm ..." echo "" @@ -11,7 +11,7 @@ echo "" # Booting up a Docker Machine instance to orchestrate Multihost Network (with Consul and Registry) echo "Creating Multihost Orchestrator Machine ..." -docker-machine create -d virtualbox --engine-insecure-registry 127.0.0.1:5000 $orchestrator +docker-machine create -d virtualbox --engine-insecure-registry 127.0.0.1:5000 $orchestrator eval "$(docker-machine env $orchestrator)" # update variables @@ -42,7 +42,7 @@ docker network create --driver overlay $network # Save existing defined image to a file to be loaded later into the registry created above eval "$(docker-machine env -u)" -docker save $image > _tmp_docker.img +docker save $image > _tmp_docker.img # Load, tag, and publish the image set in setenv.sh eval "$(docker-machine env $orchestrator)" diff --git a/OracleWebLogic/samples/1221-multihost/create-container.sh b/OracleWebLogic/samples/1221-multihost/create-container.sh index 82db70fb19..bcde8b5a82 100755 --- a/OracleWebLogic/samples/1221-multihost/create-container.sh +++ b/OracleWebLogic/samples/1221-multihost/create-container.sh @@ -1,7 +1,7 @@ #!/bin/sh # -# Copyright (c) 2015 Oracle and/or its affiliates. All rights reserved. -# +# Copyright (c) 2018 Oracle and/or its affiliates. All rights reserved. +# # Author: Bruno Borges # . ./setenv.sh diff --git a/OracleWebLogic/samples/1221-multihost/create-machine.sh b/OracleWebLogic/samples/1221-multihost/create-machine.sh index 8d9541610c..96c5e48336 100755 --- a/OracleWebLogic/samples/1221-multihost/create-machine.sh +++ b/OracleWebLogic/samples/1221-multihost/create-machine.sh @@ -1,7 +1,7 @@ #!/bin/sh # -# Copyright (c) 2015 Oracle and/or its affiliates. All rights reserved. -# +# Copyright (c) 2018 Oracle and/or its affiliates. All rights reserved. +# # Author: Bruno Borges # . ./setenv.sh diff --git a/OracleWebLogic/samples/1221-multihost/destroy-all-machines.sh b/OracleWebLogic/samples/1221-multihost/destroy-all-machines.sh index 21ac40deed..256007aa4a 100755 --- a/OracleWebLogic/samples/1221-multihost/destroy-all-machines.sh +++ b/OracleWebLogic/samples/1221-multihost/destroy-all-machines.sh @@ -1,6 +1,6 @@ #!/bin/sh # -# Copyright (c) 2015 Oracle and/or its affiliates. All rights reserved. +# Copyright (c) 2018 Oracle and/or its affiliates. All rights reserved. # . ./setenv.sh diff --git a/OracleWebLogic/samples/1221-multihost/setenv.sh b/OracleWebLogic/samples/1221-multihost/setenv.sh index 40a64bb372..bf356c43ed 100755 --- a/OracleWebLogic/samples/1221-multihost/setenv.sh +++ b/OracleWebLogic/samples/1221-multihost/setenv.sh @@ -1,4 +1,4 @@ -# Copyright (c) 2015 Oracle and/or its affiliates. All rights reserved. +# Copyright (c) 2018 Oracle and/or its affiliates. All rights reserved. prefix=weblogic orchestrator=$prefix-orchestrator orchestrator_address=$(docker-machine ip $orchestrator) diff --git a/OracleWebLogic/samples/1221-multihost/start-webtier.sh b/OracleWebLogic/samples/1221-multihost/start-webtier.sh index 418570f2ca..ad1f759e37 100755 --- a/OracleWebLogic/samples/1221-multihost/start-webtier.sh +++ b/OracleWebLogic/samples/1221-multihost/start-webtier.sh @@ -1,9 +1,9 @@ #!/bin/sh -# -# Copyright (c) 2015 Oracle and/or its affiliates. All rights reserved. +# +# Copyright (c) 2018 Oracle and/or its affiliates. All rights reserved. # # Author: Monica Riccelli -# +# echo "Creating the Apache WebTier to load balance requests to a WLS cluster for Multi Host Environment ..." echo "" machine=$1 @@ -21,7 +21,7 @@ else echo "Running webtier container with iconfig to instance $name on specific Docker Machine $machine ..." fi -# Get Managed Server Container IP Address running on machine +# Get Managed Server Container IP Address running on machine eval "$(docker-machine env $swarm $machine)" for HOST in $(docker ps -a --format "{{.Names}}" | grep -i weblogic-instance ) @@ -36,9 +36,9 @@ wlscluster=$(echo $wlscluster | sed 's/.$//') # Save existing defined image to a file to be loaded later into the registry created above eval "$(docker-machine env -u)" -docker save $webtierimage > _tmp_docker.img +docker save $webtierimage > _tmp_docker.img -# Load, tag, and publish the webtier image +# Load, tag, and publish the webtier image eval "$(docker-machine env $orchestrator)" docker load -i _tmp_docker.img && rm _tmp_docker.img docker tag $webtierimage 127.0.0.1:5000/$webtierimage @@ -56,4 +56,3 @@ echo "" echo "WebTier Container now running in $prefix-master." echo "" echo "You may now access the sample application deployed to the DockerCluster http://$(docker-machine ip $prefix-master):80/sample" - diff --git a/OracleWebLogic/samples/12211-medrec/Dockerfile b/OracleWebLogic/samples/12211-medrec/Dockerfile index f9b42653bc..7220525caf 100644 --- a/OracleWebLogic/samples/12211-medrec/Dockerfile +++ b/OracleWebLogic/samples/12211-medrec/Dockerfile @@ -1,21 +1,21 @@ # LICENSE UPL 1.0 # -# Copyright (c) 2015 Oracle and/or its affiliates. All rights reserved. +# Copyright (c) 2018 Oracle and/or its affiliates. All rights reserved. # # ORACLE DOCKERFILES PROJECT # -------------------------- -# This Dockerfile extends the Oracle WebLogic image by installing the Supplemental package of WebLogic which -# includes extra samples of Java EE, Coherence applications, and Multitenant domains. +# This Dockerfile extends the Oracle WebLogic image by installing the Supplemental package of WebLogic which +# includes extra samples of Java EE, Coherence applications, and Multitenant domains. # # REQUIRED FILES TO BUILD THIS IMAGE # ---------------------------------- # (1) fmw_12.2.1.1.0_wls_supplemental_quick_Disk1_1of1.zip -# Download the Developer Quick installer from http://www.oracle.com/technetwork/middleware/weblogic/downloads/wls-for-dev-1703574.html +# Download the Developer Quick installer from http://www.oracle.com/technetwork/middleware/weblogic/downloads/wls-for-dev-1703574.html # # HOW TO BUILD THIS IMAGE # ----------------------- # Put all downloaded files in the same directory as this Dockerfile -# Run: +# Run: # $ sudo docker build -t 12211-medrec . # @@ -31,18 +31,18 @@ MAINTAINER Monica Riccelli # ------------------------------------------------------------- ENV FMW_PKG="fmw_12.2.1.1.0_wls_supplemental_quick_Disk1_1of1.zip" \ FMW_JAR="fmw_12.2.1.1.0_wls_supplemental_quick.jar" \ - MW_HOME="$ORACLE_HOME" \ + 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" # Copy supplemental package and scripts # -------------------------------- COPY $FMW_PKG startSample.sh /u01/ -# Installation of Supplemental Quick Installer +# Installation of Supplemental Quick Installer # -------------------------------------------- RUN cd /u01 && $JAVA_HOME/bin/jar xf /u01/$FMW_PKG && cd - && \ - chown oracle:oracle -R /u01 && \ - echo oracle:oracle | chpasswd && \ + chown oracle:oracle -R /u01 && \ + echo oracle:oracle | chpasswd && \ su -c "$JAVA_HOME/bin/java -jar /u01/$FMW_JAR ORACLE_HOME=$ORACLE_HOME" - oracle && \ mv /u01/startSample.sh /u01/oracle/wlserver/samples/server/ && \ rm /u01/$FMW_PKG /u01/$FMW_JAR diff --git a/OracleWebLogic/samples/12211-medrec/README.md b/OracleWebLogic/samples/12211-medrec/README.md index 528fa6b85f..5af3c10dca 100644 --- a/OracleWebLogic/samples/12211-medrec/README.md +++ b/OracleWebLogic/samples/12211-medrec/README.md @@ -3,7 +3,7 @@ Example of Image with WLS Domain This Dockerfile extends the Oracle WebLogic image by installing the Supplemental package of WebLogic which includes the MedRec WLS sample. # How to build and run -First make sure you have built **oracle/weblogic:12.2.1.1-developer**. +First make sure you have built **oracle/weblogic:12.2.1.1-developer**. Then download file [fmw_12.2.1.1.0_wls_supplemental_quick_Disk1_1of1.zip](http://www.oracle.com/technetwork/middleware/weblogic/downloads/wls-for-dev-1703574.html) and place it next to this README. @@ -20,4 +20,4 @@ When you run the container a MedRec domain is created and the server started. To http://localhost:7011/medrec # Copyright -Copyright (c) 2015 Oracle and/or its affiliates. All rights reserved. +Copyright (c) 2018 Oracle and/or its affiliates. All rights reserved. diff --git a/OracleWebLogic/samples/12211-medrec/startSample.sh b/OracleWebLogic/samples/12211-medrec/startSample.sh index 00cfb8735a..e60e9f8752 100755 --- a/OracleWebLogic/samples/12211-medrec/startSample.sh +++ b/OracleWebLogic/samples/12211-medrec/startSample.sh @@ -1,9 +1,9 @@ #!/bin/sh # -# Copyright (c) 2015 Oracle and/or its affiliates. All rights reserved. +# Copyright (c) 2018 Oracle and/or its affiliates. All rights reserved. # -# Define default command to create medrec domain +# Define default command to create medrec domain USERNAME=${USERNAME:-weblogic} PASSWORD=${PASSWORD:-welcome1} ${ORACLE_HOME}/wlserver/samples/server/run_samples.sh "${USERNAME}" "${PASSWORD}" diff --git a/OracleWebLogic/samples/12211-patch/Dockerfile b/OracleWebLogic/samples/12211-patch/Dockerfile index db3f8c05cf..8ba9e54177 100644 --- a/OracleWebLogic/samples/12211-patch/Dockerfile +++ b/OracleWebLogic/samples/12211-patch/Dockerfile @@ -1,6 +1,6 @@ # LICENSE UPL 1.0 # -# Copyright (c) 2015 Oracle and/or its affiliates. All rights reserved. +# Copyright (c) 2018 Oracle and/or its affiliates. All rights reserved. # # ORACLE DOCKERFILES PROJECT # -------------------------- @@ -14,7 +14,7 @@ # HOW TO BUILD THIS IMAGE # ----------------------- # Put all downloaded files in the same directory as this Dockerfile -# Run: +# Run: # $ sudo docker build -t 12211-psu24286152 . # @@ -28,18 +28,18 @@ MAINTAINER Monica Riccelli # Environment variables required for this build (do NOT change) # ------------------------------------------------------------- -ENV PSU_PKG="p24286152_122110_Generic.zip" +ENV PSU_PKG="p24286152_122110_Generic.zip" # Copy supplemental package and scripts # -------------------------------- COPY $PSU_PKG /u01/ -# Installation of Supplemental Quick Installer +# Installation of Supplemental Quick Installer # -------------------------------------------- USER oracle RUN cd /u01 && $JAVA_HOME/bin/jar xf /u01/$PSU_PKG && cd - && \ cd /u01/24286152 && $ORACLE_HOME/OPatch/opatch apply -silent - oracle && \ - rm /u01/$PSU_PKG + rm /u01/$PSU_PKG WORKDIR ${ORACLE_HOME} diff --git a/OracleWebLogic/samples/12211-patch/README.md b/OracleWebLogic/samples/12211-patch/README.md index 44679c6097..dcb079d65b 100644 --- a/OracleWebLogic/samples/12211-patch/README.md +++ b/OracleWebLogic/samples/12211-patch/README.md @@ -3,7 +3,7 @@ Example of Image with WLS Domain This Dockerfile extends the Oracle WebLogic image by applying a PSU patch. # How to build and run -First make sure you have built **oracle/weblogic:12.2.1.1-developer**. +First make sure you have built **oracle/weblogic:12.2.1.1-developer**. Then download file [p24286152_122110_Generic.zip](http://support.oracle.com) and place it next to this README. @@ -24,4 +24,4 @@ Go to your browser and start the Adminsitration console by running: Extend this patched image to create a domain image and start WebLogic Servers running in containers. # Copyright -Copyright (c) 2015 Oracle and/or its affiliates. All rights reserved. +Copyright (c) 2018 Oracle and/or its affiliates. All rights reserved. diff --git a/OracleWebLogic/samples/12212-domain-online-config/Dockerfile b/OracleWebLogic/samples/12212-domain-online-config/Dockerfile index 0b4bd8f9d5..2973d3da68 100755 --- a/OracleWebLogic/samples/12212-domain-online-config/Dockerfile +++ b/OracleWebLogic/samples/12212-domain-online-config/Dockerfile @@ -1,6 +1,6 @@ # LICENSE UPL 1.0 # -# Copyright (c) 2017 Oracle and/or its affiliates. All rights reserved. +# Copyright (c) 2018 Oracle and/or its affiliates. All rights reserved. # # ORACLE DOCKERFILES PROJECT # -------------------------- @@ -13,7 +13,7 @@ # HOW TO BUILD THIS IMAGE # ----------------------- # Put all downloaded files in the same directory as this Dockerfile -# Run: +# Run: # $ sudo docker build -t 12212-domain-resources-online -f Dockerfile . # @@ -36,12 +36,11 @@ COPY container-scripts/* /u01/oracle/ RUN chmod +xr /u01/oracle/jms-wlst-online-config.sh && \ chown oracle:oracle -R /u01/oracle - + # Default directory creation, Admin Server boot # --------------------------------------------- USER oracle RUN . $ORACLE_HOME/wlserver/server/bin/setWLSEnv.sh && \ cd /u01/oracle && \ - ./jms-wlst-online-config.sh - + ./jms-wlst-online-config.sh diff --git a/OracleWebLogic/samples/12212-domain-online-config/README.md b/OracleWebLogic/samples/12212-domain-online-config/README.md index f3c4894819..50e0c9dd55 100644 --- a/OracleWebLogic/samples/12212-domain-online-config/README.md +++ b/OracleWebLogic/samples/12212-domain-online-config/README.md @@ -2,9 +2,9 @@ Example of Image with WLS Domain ================================ This Dockerfile extends the Oracle WebLogic image built under 12212-domain with tag name '12212-domain' -WLST Online script are used during Docker image build phase to deploy the +WLST Online script are used during Docker image build phase to deploy the -- JMS artifacts (JMS Server, Queue etc). +- JMS artifacts (JMS Server, Queue etc). # How to build and run First make sure you have built sample image inside **12212-domain**. Now to build this sample, run: @@ -23,4 +23,4 @@ To start a containerized Managed Server to self-register with the Admin Server a # Copyright -Copyright (c) 2015 Oracle and/or its affiliates. All rights reserved. +Copyright (c) 2018 Oracle and/or its affiliates. All rights reserved. diff --git a/OracleWebLogic/samples/12212-domain-online-config/container-scripts/jms-config.properties b/OracleWebLogic/samples/12212-domain-online-config/container-scripts/jms-config.properties index 1731e151f9..5904b76a0b 100755 --- a/OracleWebLogic/samples/12212-domain-online-config/container-scripts/jms-config.properties +++ b/OracleWebLogic/samples/12212-domain-online-config/container-scripts/jms-config.properties @@ -6,14 +6,14 @@ migratabletarget.name=JMSMigratableTarget jms.server.name=myJMSServer store.name=myFileStore store.path=/u01/oracle/user_projects/domains/base_domain/FileStore - + # 3 - SystemModule Details system.module.name=mySystemModule - + # 4 - ConnectionFactory Details connection.factory.name=myJMSConnectionFactory connection.factory.jndi.name=jndi.myJMSConnectionFactory - + # 5 - SubDeployment, Queue & Topic Details sub.deployment.name=mySubDeployment queue.name=myDistributedQueue diff --git a/OracleWebLogic/samples/12212-domain/Dockerfile b/OracleWebLogic/samples/12212-domain/Dockerfile index 4107bc9256..f2cdf8e6f9 100644 --- a/OracleWebLogic/samples/12212-domain/Dockerfile +++ b/OracleWebLogic/samples/12212-domain/Dockerfile @@ -1,4 +1,4 @@ -#Copyright (c) 2014-2017 Oracle and/or its affiliates. All rights reserved. +#Copyright (c) 2014-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. # @@ -6,13 +6,13 @@ # -------------------------- # This Dockerfile extends the Oracle WebLogic image by creating a sample domain. # -# Util scripts are copied into the image enabling users to plug NodeManager +# Util scripts are copied into the image enabling users to plug NodeManager # automatically into the AdminServer running on another container. # # HOW TO BUILD THIS IMAGE # ----------------------- # Put all downloaded files in the same directory as this Dockerfile -# Run: +# Run: # $ sudo docker build -t 12212-domain # # Pull base image @@ -23,7 +23,7 @@ FROM oracle/weblogic:12.2.1.2-developer # ---------- MAINTAINER Monica Riccelli -# WLS Configuration +# WLS Configuration # --------------------------- ENV ADMIN_HOST="wlsadmin" \ NM_PORT="5556" \ @@ -46,21 +46,21 @@ ENV DOMAIN_NAME="${DOMAIN_NAME:-base_domain}" \ ADMIN_PASSWORD="${ADMIN_PASSWORD:-""}" \ CLUSTER_NAME="${CLUSTER_NAME:-DockerCluster}" \ DEBUG_FLAG=true \ - PRODUCTION_MODE=dev + PRODUCTION_MODE=dev # Add files required to build this image COPY container-scripts/* /u01/oracle/ #Create directory where domain will be written to -RUN mkdir -p $PRE_DOMAIN_HOME && \ +RUN mkdir -p $PRE_DOMAIN_HOME && \ chmod a+xr $PRE_DOMAIN_HOME && \ chown oracle:oracle -R $PRE_DOMAIN_HOME -# Expose Node Manager default port, and also default for admin and managed server +# Expose Node Manager default port, and also default for admin and managed server EXPOSE $NM_PORT $ADMIN_PORT $MS_PORT $DEBUG_PORT USER oracle WORKDIR $ORACLE_HOME -# Define default command to start bash. +# Define default command to start bash. CMD ["/u01/oracle/createAndStartWLSDomain.sh"] diff --git a/OracleWebLogic/samples/12212-domain/README.md b/OracleWebLogic/samples/12212-domain/README.md index 27032ef314..0912b7745b 100644 --- a/OracleWebLogic/samples/12212-domain/README.md +++ b/OracleWebLogic/samples/12212-domain/README.md @@ -18,7 +18,7 @@ If you need to find the password at a later time, grep for "password" in the Doc ### How to Build and Run -**NOTE:** First make sure you have built **oracle/weblogic:12.2.1.2-developer**. +**NOTE:** First make sure you have built **oracle/weblogic:12.2.1.2-developer**. You can define the following environment variables at docker runtime using the -e option in the command line or defining them in the domain.properties file. These enviromental variables need to be set for the Admin Server as well as for the Managed Servers. @@ -50,7 +50,7 @@ To build this sample, run: $ docker build -t 12212-domain . -**Important** The domain directory needs to be externalized by using Data Volumes (-v option). The Admin Server as well as the Managed Servers need to read/write to the same DOMAIN_HOME. +**Important** The domain directory needs to be externalized by using Data Volumes (-v option). The Admin Server as well as the Managed Servers need to read/write to the same DOMAIN_HOME. To start the containerized Admin Server, run @@ -69,4 +69,4 @@ The above scenario from this sample will give you a WebLogic domain with a clust You may create more containerized Managed Servers by calling the `docker` command above for `createServer.sh` as long you link properly with the Admin Server. For an example of multihost enviornment, check the sample `1221-multihost`. # Copyright -Copyright (c) 2014-2017 Oracle and/or its affiliates. All rights reserved. +Copyright (c) 2014-2018 Oracle and/or its affiliates. All rights reserved. diff --git a/OracleWebLogic/samples/12212-domain/build.sh b/OracleWebLogic/samples/12212-domain/build.sh index f7411e1b03..a8d4a78774 100755 --- a/OracleWebLogic/samples/12212-domain/build.sh +++ b/OracleWebLogic/samples/12212-domain/build.sh @@ -1,7 +1,7 @@ #!/bin/sh # -#Copyright (c) 2014-2017 Oracle and/or its affiliates. All rights reserved. +#Copyright (c) 2014-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. # -docker build -t 12212-domain . +docker build -t 12212-domain . diff --git a/OracleWebLogic/samples/12212-domain/container-scripts/add-machine.py b/OracleWebLogic/samples/12212-domain/container-scripts/add-machine.py index 790788bf41..aec875ffcf 100644 --- a/OracleWebLogic/samples/12212-domain/container-scripts/add-machine.py +++ b/OracleWebLogic/samples/12212-domain/container-scripts/add-machine.py @@ -1,4 +1,4 @@ -#Copyright (c) 2014-2017 Oracle and/or its affiliates. All rights reserved. +#Copyright (c) 2014-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. # diff --git a/OracleWebLogic/samples/12212-domain/container-scripts/add-server.py b/OracleWebLogic/samples/12212-domain/container-scripts/add-server.py index 607b3d2d7d..64f4712885 100644 --- a/OracleWebLogic/samples/12212-domain/container-scripts/add-server.py +++ b/OracleWebLogic/samples/12212-domain/container-scripts/add-server.py @@ -1,4 +1,4 @@ -#Copyright (c) 2014-2017 Oracle and/or its affiliates. All rights reserved. +#Copyright (c) 2014-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. # diff --git a/OracleWebLogic/samples/12212-domain/container-scripts/commonfuncs.py b/OracleWebLogic/samples/12212-domain/container-scripts/commonfuncs.py index e7990c84ed..72b7608cdb 100644 --- a/OracleWebLogic/samples/12212-domain/container-scripts/commonfuncs.py +++ b/OracleWebLogic/samples/12212-domain/container-scripts/commonfuncs.py @@ -1,4 +1,4 @@ -#Copyright (c) 2014-2017 Oracle and/or its affiliates. All rights reserved. +#Copyright (c) 2014-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. # diff --git a/OracleWebLogic/samples/12212-domain/container-scripts/create-wls-domain.py b/OracleWebLogic/samples/12212-domain/container-scripts/create-wls-domain.py index 1952b92aa2..e9f5cd102a 100644 --- a/OracleWebLogic/samples/12212-domain/container-scripts/create-wls-domain.py +++ b/OracleWebLogic/samples/12212-domain/container-scripts/create-wls-domain.py @@ -1,4 +1,4 @@ -#Copyright (c) 2014-2017 Oracle and/or its affiliates. All rights reserved. +#Copyright (c) 2014-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. # diff --git a/OracleWebLogic/samples/12212-domain/container-scripts/createAndStartWLSDomain.sh b/OracleWebLogic/samples/12212-domain/container-scripts/createAndStartWLSDomain.sh index 65f390f04d..ed00aa78a2 100755 --- a/OracleWebLogic/samples/12212-domain/container-scripts/createAndStartWLSDomain.sh +++ b/OracleWebLogic/samples/12212-domain/container-scripts/createAndStartWLSDomain.sh @@ -1,6 +1,6 @@ #!/bin/bash # -#Copyright (c) 2014-2017 Oracle and/or its affiliates. All rights reserved. +#Copyright (c) 2014-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. # @@ -37,15 +37,15 @@ if [ -z $ADMIN_PASSWORD ]; then else s=${ADMIN_PASSWORD} echo " ----> 'weblogic' admin password: $s" -fi +fi sed -i -e "s|ADMIN_PASSWORD|$s|g" /u01/oracle/create-wls-domain.py # Create an empty domain wlst.sh -skipWLSModuleScanning /u01/oracle/create-wls-domain.py -mkdir -p ${DOMAIN_HOME}/servers/AdminServer/security/ -echo "username=${ADMIN_USERNAME}" > /u01/oracle/user_projects/domains/$DOMAIN_NAME/servers/AdminServer/security/boot.properties -echo "password=$s" >> /u01/oracle/user_projects/domains/$DOMAIN_NAME/servers/AdminServer/security/boot.properties -${DOMAIN_HOME}/bin/setDomainEnv.sh +mkdir -p ${DOMAIN_HOME}/servers/AdminServer/security/ +echo "username=${ADMIN_USERNAME}" > /u01/oracle/user_projects/domains/$DOMAIN_NAME/servers/AdminServer/security/boot.properties +echo "password=$s" >> /u01/oracle/user_projects/domains/$DOMAIN_NAME/servers/AdminServer/security/boot.properties +${DOMAIN_HOME}/bin/setDomainEnv.sh fi @@ -56,5 +56,3 @@ tail -f ${DOMAIN_HOME}/servers/AdminServer/logs/AdminServer.log & childPID=$! wait $childPID - - diff --git a/OracleWebLogic/samples/12212-domain/container-scripts/createMachine.sh b/OracleWebLogic/samples/12212-domain/container-scripts/createMachine.sh index a69631c190..0a3aba248d 100755 --- a/OracleWebLogic/samples/12212-domain/container-scripts/createMachine.sh +++ b/OracleWebLogic/samples/12212-domain/container-scripts/createMachine.sh @@ -1,6 +1,6 @@ #!/bin/bash # -#Copyright (c) 2014-2017 Oracle and/or its affiliates. All rights reserved. +#Copyright (c) 2014-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. # diff --git a/OracleWebLogic/samples/12212-domain/container-scripts/createServer.sh b/OracleWebLogic/samples/12212-domain/container-scripts/createServer.sh index dba22d2947..748a16ce90 100755 --- a/OracleWebLogic/samples/12212-domain/container-scripts/createServer.sh +++ b/OracleWebLogic/samples/12212-domain/container-scripts/createServer.sh @@ -1,6 +1,6 @@ #!/bin/bash # -#Copyright (c) 2014-2017 Oracle and/or its affiliates. All rights reserved. +#Copyright (c) 2014-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. # @@ -71,4 +71,4 @@ if [ $ADD_SERVER -eq 1 ]; then fi # print log -tail -f /u01/oracle/log_$MS_NAME.nm $DOMAIN_HOME/servers/$MS_NAME/logs/*.out \ No newline at end of file +tail -f /u01/oracle/log_$MS_NAME.nm $DOMAIN_HOME/servers/$MS_NAME/logs/*.out diff --git a/OracleWebLogic/samples/12212-domain/container-scripts/waitForAdminServer.sh b/OracleWebLogic/samples/12212-domain/container-scripts/waitForAdminServer.sh index f4b1a34901..e95a65c504 100755 --- a/OracleWebLogic/samples/12212-domain/container-scripts/waitForAdminServer.sh +++ b/OracleWebLogic/samples/12212-domain/container-scripts/waitForAdminServer.sh @@ -1,6 +1,6 @@ #!/bin/bash -# -#Copyright (c) 2014-2017 Oracle and/or its affiliates. All rights reserved. +# +#Copyright (c) 2014-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. # diff --git a/OracleWebLogic/samples/12212-medrec/Dockerfile b/OracleWebLogic/samples/12212-medrec/Dockerfile index b3e934a7de..613dd1c888 100644 --- a/OracleWebLogic/samples/12212-medrec/Dockerfile +++ b/OracleWebLogic/samples/12212-medrec/Dockerfile @@ -1,21 +1,21 @@ # LICENSE UPL 1.0 # -# Copyright (c) 2015 Oracle and/or its affiliates. All rights reserved. +# Copyright (c) 2018 Oracle and/or its affiliates. All rights reserved. # # ORACLE DOCKERFILES PROJECT # -------------------------- -# This Dockerfile extends the Oracle WebLogic image by installing the Supplemental package of WebLogic which -# includes extra samples of Java EE, Coherence applications, and Multitenant domains. +# This Dockerfile extends the Oracle WebLogic image by installing the Supplemental package of WebLogic which +# includes extra samples of Java EE, Coherence applications, and Multitenant domains. # # REQUIRED FILES TO BUILD THIS IMAGE # ---------------------------------- # (1) fmw_12.2.1.2.0_wls_supplemental_quick_Disk1_1of1.zip -# Download the Developer Quick installer from http://www.oracle.com/technetwork/middleware/weblogic/downloads/wls-for-dev-1703574.html +# Download the Developer Quick installer from http://www.oracle.com/technetwork/middleware/weblogic/downloads/wls-for-dev-1703574.html # # HOW TO BUILD THIS IMAGE # ----------------------- # Put all downloaded files in the same directory as this Dockerfile -# Run: +# Run: # $ sudo docker build -t 12212-medrec . # @@ -31,7 +31,7 @@ MAINTAINER Monica Riccelli # ------------------------------------------------------------- ENV FMW_PKG="fmw_12.2.1.2.0_wls_supplemental_quick_Disk1_1of1.zip" \ FMW_JAR="fmw_12.2.1.2.0_wls_supplemental_quick.jar" \ - MW_HOME="$ORACLE_HOME" \ + 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" # Copy supplemental package and scripts @@ -39,9 +39,9 @@ ENV FMW_PKG="fmw_12.2.1.2.0_wls_supplemental_quick_Disk1_1of1.zip" \ COPY $FMW_PKG /u01/ USER root COPY startSample.sh /u01/oracle/ -RUN chmod +xr /u01/oracle/startSample.sh +RUN chmod +xr /u01/oracle/startSample.sh -# Installation of Supplemental Quick Installer +# Installation of Supplemental Quick Installer # -------------------------------------------- USER oracle RUN cd /u01 && $JAVA_HOME/bin/jar xf /u01/$FMW_PKG && cd - && \ @@ -50,7 +50,7 @@ RUN cd /u01 && $JAVA_HOME/bin/jar xf /u01/$FMW_PKG && cd - && \ mv /u01/oracle/startSample.sh /u01/oracle/wlserver/samples/server/ && \ rm /u01/$FMW_PKG /u01/$FMW_JAR -USER root +USER root RUN chmod +xr /u01/oracle/wlserver/samples/server/*.sh WORKDIR $ORACLE_HOME/wlserver/samples/server diff --git a/OracleWebLogic/samples/12212-medrec/README.md b/OracleWebLogic/samples/12212-medrec/README.md index 3081ab62f3..95af903153 100644 --- a/OracleWebLogic/samples/12212-medrec/README.md +++ b/OracleWebLogic/samples/12212-medrec/README.md @@ -3,7 +3,7 @@ Example of Image with WLS Domain This Dockerfile extends the Oracle WebLogic image by installing the Supplemental package of WebLogic which includes the MedRec WLS sample. # How to build and run -First make sure you have built **oracle/weblogic:12.2.1.2-developer**. +First make sure you have built **oracle/weblogic:12.2.1.2-developer**. Then download file [fmw_12.2.1.2.0_wls_supplemental_quick_Disk1_1of1.zip](http://www.oracle.com/technetwork/middleware/weblogic/downloads/wls-for-dev-1703574.html) and place it next to this README. @@ -20,4 +20,4 @@ When you run the container a MedRec domain is created and the server started. To http://localhost:7011/medrec # Copyright -Copyright (c) 2015 Oracle and/or its affiliates. All rights reserved. +Copyright (c) 2018 Oracle and/or its affiliates. All rights reserved. diff --git a/OracleWebLogic/samples/12212-medrec/startSample.sh b/OracleWebLogic/samples/12212-medrec/startSample.sh index 00cfb8735a..e60e9f8752 100644 --- a/OracleWebLogic/samples/12212-medrec/startSample.sh +++ b/OracleWebLogic/samples/12212-medrec/startSample.sh @@ -1,9 +1,9 @@ #!/bin/sh # -# Copyright (c) 2015 Oracle and/or its affiliates. All rights reserved. +# Copyright (c) 2018 Oracle and/or its affiliates. All rights reserved. # -# Define default command to create medrec domain +# Define default command to create medrec domain USERNAME=${USERNAME:-weblogic} PASSWORD=${PASSWORD:-welcome1} ${ORACLE_HOME}/wlserver/samples/server/run_samples.sh "${USERNAME}" "${PASSWORD}" diff --git a/OracleWebLogic/samples/12212-msiserver/Dockerfile b/OracleWebLogic/samples/12212-msiserver/Dockerfile index 38aa1341f2..8342c25c64 100644 --- a/OracleWebLogic/samples/12212-msiserver/Dockerfile +++ b/OracleWebLogic/samples/12212-msiserver/Dockerfile @@ -1,6 +1,6 @@ # LICENSE UPL 1.0 # -# Copyright (c) 2017 Oracle and/or its affiliates. All rights reserved. +# Copyright (c) 2018 Oracle and/or its affiliates. All rights reserved. # # ORACLE DOCKERFILES PROJECT # -------------------------- @@ -12,7 +12,7 @@ # # HOW TO BUILD THIS IMAGE # ----------------------- -# Run: +# Run: # $ sudo docker build -t 12212-msiserver . # diff --git a/OracleWebLogic/samples/12212-msiserver/Dockerfile.addapp b/OracleWebLogic/samples/12212-msiserver/Dockerfile.addapp index 8447063bda..b9705f6d07 100644 --- a/OracleWebLogic/samples/12212-msiserver/Dockerfile.addapp +++ b/OracleWebLogic/samples/12212-msiserver/Dockerfile.addapp @@ -1,6 +1,6 @@ # LICENSE UPL 1.0 # -# Copyright (c) 2017 Oracle and/or its affiliates. All rights reserved. +# Copyright (c) 2018 Oracle and/or its affiliates. All rights reserved. # # ORACLE DOCKERFILES PROJECT # -------------------------- @@ -32,10 +32,10 @@ MAINTAINER Aseem Bajaj ARG name=summercamps ARG source=apps/summercamps.ear ARG simple_filename=summercamps.ear - + # Environment variables required for this build (do NOT change) # ------------------------------------------------------------- -ENV MW_HOME="$ORACLE_HOME" \ +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" # Copy scripts diff --git a/OracleWebLogic/samples/12212-msiserver/README.md b/OracleWebLogic/samples/12212-msiserver/README.md index 8ccb2438fd..4005eb7f84 100644 --- a/OracleWebLogic/samples/12212-msiserver/README.md +++ b/OracleWebLogic/samples/12212-msiserver/README.md @@ -9,7 +9,7 @@ not need to be updated for configuration or deployments, this image can be used running a admin server or node manager ## How to build and run the base image -First make sure you have built **oracle/weblogic:12.2.1.2-developer**. +First make sure you have built **oracle/weblogic:12.2.1.2-developer**. Next, to build the base msi image, run: @@ -57,7 +57,7 @@ can be built with configurable number of managed servers using NUMBER_OF_MS argu domain_name may be used to identify the name of generated domain that gets packed into MSI image. Default value msi-sample #### domains_dir -domains_dir may be used identify the directory under $ORACLE_HOME where the domain home directory is created. Default value wlserver/samples/domains +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 ms_port may be used to configure port of the managed server, default is 8011 @@ -205,4 +205,4 @@ $ curl http://localhost:8011/ Note, the docker version used for this example is 17.03, and the rolling back in Docker 17.04 and higher should be automatic. -Copyright (c) 2017 Oracle and/or its affiliates. All rights reserved. +Copyright (c) 2018 Oracle and/or its affiliates. All rights reserved. diff --git a/OracleWebLogic/samples/12212-oradb-medrec/Dockerfile b/OracleWebLogic/samples/12212-oradb-medrec/Dockerfile index 135841f65c..da4cf1bfb5 100644 --- a/OracleWebLogic/samples/12212-oradb-medrec/Dockerfile +++ b/OracleWebLogic/samples/12212-oradb-medrec/Dockerfile @@ -1,21 +1,21 @@ # LICENSE UPL 1.0 # -# Copyright (c) 2015 Oracle and/or its affiliates. All rights reserved. +# Copyright (c) 2018 Oracle and/or its affiliates. All rights reserved. # # ORACLE DOCKERFILES PROJECT # -------------------------- -# This Dockerfile extends the Oracle WebLogic image by installing the Supplemental package of WebLogic which -# includes extra samples of Java EE, Coherence applications, and Multitenant domains. +# This Dockerfile extends the Oracle WebLogic image by installing the Supplemental package of WebLogic which +# includes extra samples of Java EE, Coherence applications, and Multitenant domains. # # REQUIRED FILES TO BUILD THIS IMAGE # ---------------------------------- # (1) fmw_12.2.1.2.0_wls_supplemental_quick_Disk1_1of1.zip -# Download the Developer Quick installer from http://www.oracle.com/technetwork/middleware/weblogic/downloads/wls-for-dev-1703574.html +# Download the Developer Quick installer from http://www.oracle.com/technetwork/middleware/weblogic/downloads/wls-for-dev-1703574.html # # HOW TO BUILD THIS IMAGE # ----------------------- # Put all downloaded files in the same directory as this Dockerfile -# Run: +# Run: # $ sudo docker build -t 12212-oradb-medrec . # @@ -31,7 +31,7 @@ MAINTAINER Monica Riccelli # ------------------------------------------------------------- ENV FMW_PKG="fmw_12.2.1.2.0_wls_supplemental_quick_Disk1_1of1.zip" \ FMW_JAR="fmw_12.2.1.2.0_wls_supplemental_quick.jar" \ - MW_HOME="$ORACLE_HOME" \ + 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" # Copy supplemental package and scripts @@ -39,9 +39,9 @@ ENV FMW_PKG="fmw_12.2.1.2.0_wls_supplemental_quick_Disk1_1of1.zip" \ COPY $FMW_PKG /u01/ USER root COPY container-scripts/* /u01/oracle/ -RUN chmod +xr /u01/oracle/startSample.sh +RUN chmod +xr /u01/oracle/startSample.sh -# Installation of Supplemental Quick Installer +# Installation of Supplemental Quick Installer # -------------------------------------------- USER oracle RUN cd /u01 && $JAVA_HOME/bin/jar xf /u01/$FMW_PKG && cd - && \ @@ -50,7 +50,7 @@ RUN cd /u01 && $JAVA_HOME/bin/jar xf /u01/$FMW_PKG && cd - && \ mv /u01/oracle/startSample.sh /u01/oracle/wlserver/samples/server/ && \ rm /u01/$FMW_PKG /u01/$FMW_JAR -USER root +USER root RUN chmod +xr /u01/oracle/wlserver/samples/server/*.sh WORKDIR $ORACLE_HOME/wlserver/samples/server diff --git a/OracleWebLogic/samples/12212-oradb-medrec/README.md b/OracleWebLogic/samples/12212-oradb-medrec/README.md index 7146461cf8..1d7e006ed2 100644 --- a/OracleWebLogic/samples/12212-oradb-medrec/README.md +++ b/OracleWebLogic/samples/12212-oradb-medrec/README.md @@ -3,7 +3,7 @@ Example of Image with WLS Domain This Dockerfile extends the Oracle WebLogic image by installing the Supplemental package of WebLogic which includes the MedRec WLS sample. # How to build and run -First make sure you have built **oracle/weblogic:12.2.1.2-developer**. +First make sure you have built **oracle/weblogic:12.2.1.2-developer**. Then download file [fmw_12.2.1.2.0_wls_supplemental_quick_Disk1_1of1.zip](http://www.oracle.com/technetwork/middleware/weblogic/downloads/wls-for-dev-1703574.html) and place it next to this README. @@ -22,4 +22,4 @@ When you run the container a MedRec domain is created and the server started. To http://localhost:7011/medrec # Copyright -Copyright (c) 2015 Oracle and/or its affiliates. All rights reserved. +Copyright (c) 2018 Oracle and/or its affiliates. All rights reserved. diff --git a/OracleWebLogic/samples/12212-oradb-medrec/container-scripts/medrec-ds-deploy.py b/OracleWebLogic/samples/12212-oradb-medrec/container-scripts/medrec-ds-deploy.py index d79367be31..37401570a9 100644 --- a/OracleWebLogic/samples/12212-oradb-medrec/container-scripts/medrec-ds-deploy.py +++ b/OracleWebLogic/samples/12212-oradb-medrec/container-scripts/medrec-ds-deploy.py @@ -1,4 +1,4 @@ -# Copyright (c) 2015 Oracle and/or its affiliates. All rights reserved. +# Copyright (c) 2018 Oracle and/or its affiliates. All rights reserved. # # WLST Offline for deploying an application under APP_NAME packaged in APP_PKG_FILE located in APP_PKG_LOCATION # It will read the domain under DOMAIN_HOME by default @@ -13,18 +13,18 @@ # =========================== readDomain(domainhome) -# Create Datasource +# Create Datasource # ================== cd('/JDBCSystemResource/' + dsname + '/JdbcResource/' + dsname) cmo.setName(dsname) - + cd('/JDBCSystemResource/' + dsname + '/JdbcResource/' + dsname) cd('JDBCDriverParams/NO_NAME_0') set('DriverName', dsdriver) set('URL', dsurl) set('PasswordEncrypted', dspassword) set('UseXADataSourceInterface', 'false') - + print 'create JDBCDriverParams User Properties' cd('Properties/NO_NAME_0') cd('Property/user') diff --git a/OracleWebLogic/samples/12212-oradb-medrec/container-scripts/startSample.sh b/OracleWebLogic/samples/12212-oradb-medrec/container-scripts/startSample.sh index e757e24df5..f19887bdb1 100644 --- a/OracleWebLogic/samples/12212-oradb-medrec/container-scripts/startSample.sh +++ b/OracleWebLogic/samples/12212-oradb-medrec/container-scripts/startSample.sh @@ -1,13 +1,12 @@ #!/bin/sh # -# Copyright (c) 2015 Oracle and/or its affiliates. All rights reserved. +# Copyright (c) 2018 Oracle and/or its affiliates. All rights reserved. # -# Define default command to create medrec domain +# Define default command to create medrec domain USERNAME=${USERNAME:-weblogic} PASSWORD=${PASSWORD:-welcome1} ${ORACLE_HOME}/wlserver/samples/server/run_samples.sh "${USERNAME}" "${PASSWORD}" -wlst.sh -loadProperties /u01/oracle/oradatasource.properties /u01/oracle/medrec-ds-deploy.py +wlst.sh -loadProperties /u01/oracle/oradatasource.properties /u01/oracle/medrec-ds-deploy.py ${ORACLE_HOME}/wlserver/samples/domains/medrec/startWebLogic.sh - diff --git a/OracleWebLogic/samples/12212-oradb-wlsstore/Dockerfile b/OracleWebLogic/samples/12212-oradb-wlsstore/Dockerfile index 99e646a9d1..d118a626cf 100644 --- a/OracleWebLogic/samples/12212-oradb-wlsstore/Dockerfile +++ b/OracleWebLogic/samples/12212-oradb-wlsstore/Dockerfile @@ -1,14 +1,14 @@ # -# Copyright (c) 2014-2017 Oracle and/or its affiliates. All rights reserved. +# Copyright (c) 2014-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. # # ORACLE DOCKERFILES PROJECT # -------------------------- -# This Dockerfile extends the Oracle WebLogic image in DockerStore +# This Dockerfile extends the Oracle WebLogic image in DockerStore # configures a Data Source using WLST online to connect to an Oracle DB -# container from DockerStore +# container from DockerStore # # REQUIRED FILES TO BUILD THIS IMAGE # ---------------------------------- @@ -16,7 +16,7 @@ # HOW TO BUILD THIS IMAGE # ----------------------- # Put all downloaded files in the same directory as this Dockerfile -# Run: +# Run: # $ sudo docker build -t 12212-oradb-wlsstore . # @@ -30,7 +30,7 @@ MAINTAINER Monica Riccelli # Environment variables required for this build (do NOT change) # ------------------------------------------------------------- -ENV MW_HOME="$ORACLE_HOME" \ +ENV MW_HOME="$ORACLE_HOME" \ DOMAIN_HOME=/u01/oracle/user_projects/domains/base_domain \ PATH=$PATH:/u01/oracle:$DOMAIN_HOME @@ -47,13 +47,13 @@ USER root COPY container-scripts/* /u01/oracle/ RUN chmod +xr /u01/oracle/*.sh -# Installation of Supplemental Quick Installer +# Installation of Supplemental Quick Installer # -------------------------------------------- USER oracle RUN cd /u01/oracle && \ ./ds-wlst-online-config.sh && \ wlst /u01/oracle/app-deploy.py - + EXPOSE $ADMIN_PORT WORKDIR $DOMAIN_HOME diff --git a/OracleWebLogic/samples/12212-oradb-wlsstore/README.md b/OracleWebLogic/samples/12212-oradb-wlsstore/README.md index e3bf726c96..0276a7aa6b 100644 --- a/OracleWebLogic/samples/12212-oradb-wlsstore/README.md +++ b/OracleWebLogic/samples/12212-oradb-wlsstore/README.md @@ -5,7 +5,7 @@ This Dockerfile extends the Oracle WebLogic install image from the DockerStore c ## How to build and run Pull the WebLogic install image from the DockerStore at https://store.docker.com/images/oracle-weblogic-server-12c. - $ docker pull store/oracle/weblogic:12.2.1.2 + $ docker pull store/oracle/weblogic:12.2.1.2 To run this sample you will need both the WebLogic container and an Oracle Database container. Pull the Oracle Database image from the Docker Store or the Oracle Container Registry. @@ -16,13 +16,13 @@ Follow the steps below: Create the docker network for the WLS and Database containers to run $ docker network create -d bridge SampleNET - -## Run the Database container + +## Run the Database container To create a database container, use the environment file below to set the database name, password, domain and feature bundle. The example environment file env.txt is: DB_SID=InfraDB DB_PDB=InfraPDB1 - DB_DOMAIN=us.oracle.com + DB_DOMAIN=us.oracle.com DB_BUNDLE=basic $ docker run -d --name InfraDB --network=SampleNET -p 1521:1521 -p 5500:5500 --env-file env.txt -it --shm-size="8g" container-registry.oracle.com/database/enterprise:12.2.0.1 @@ -30,9 +30,9 @@ To create a database container, use the environment file below to set the databa Verify that the Database is running and healthy, the STATUS field shows (healthy) in the output of docker ps. - The Database is created with the default password 'Oradoc_db1', to change the database password you must use sqlplus. To run sqlplus pull the Oracle Instant Client from the Oracle Container Registry or the Docker Store, and run a sqlplus container with the following command: + The Database is created with the default password 'Oradoc_db1', to change the database password you must use sqlplus. To run sqlplus pull the Oracle Instant Client from the Oracle Container Registry or the Docker Store, and run a sqlplus container with the following command: - $ docker run -ti --network=SampleNET --rm store/oracle/database-instantclient:12.2.0.1 sqlplus sys/Oradoc_db1@InfraDB:1521/InfraDB.us.oracle.com AS SYSDBA + $ docker run -ti --network=SampleNET --rm store/oracle/database-instantclient:12.2.0.1 sqlplus sys/Oradoc_db1@InfraDB:1521/InfraDB.us.oracle.com AS SYSDBA SQL> alter user system identified by MYDBPasswd container=all; @@ -42,7 +42,7 @@ To run the DDL that creates the tables needed by the application, copy createSch Run sqlplus to run the DDL - $docker exec -ti InfraDB /u01/app/oracle/product/12.2.0/dbhome_1/bin/sqlplus system/MYDBPasswd@InfraDB:1521/InfraPDB1.us.oracle.com @/u01/app/oracle/createSchema.sql + $docker exec -ti InfraDB /u01/app/oracle/product/12.2.0/dbhome_1/bin/sqlplus system/MYDBPasswd@InfraDB:1521/InfraPDB1.us.oracle.com @/u01/app/oracle/createSchema.sql ## Build the WebLogic image @@ -66,8 +66,7 @@ Invoke from your browser http://localhost:7001/auction ## Copyright - Copyright (c) 2014-2017 Oracle and/or its affiliates. All rights reserved. + Copyright (c) 2014-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. - diff --git a/OracleWebLogic/samples/12212-oradb-wlsstore/build.sh b/OracleWebLogic/samples/12212-oradb-wlsstore/build.sh index 1ab6d31af1..59a9a983ea 100755 --- a/OracleWebLogic/samples/12212-oradb-wlsstore/build.sh +++ b/OracleWebLogic/samples/12212-oradb-wlsstore/build.sh @@ -1,5 +1,5 @@ #!/bin/sh -# Copyright (c) 2014-2017 Oracle and/or its affiliates. All rights reserved. +# Copyright (c) 2014-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. diff --git a/OracleWebLogic/samples/12212-oradb-wlsstore/container-scripts/app-deploy.py b/OracleWebLogic/samples/12212-oradb-wlsstore/container-scripts/app-deploy.py index 6f089ee3b8..a571875f22 100644 --- a/OracleWebLogic/samples/12212-oradb-wlsstore/container-scripts/app-deploy.py +++ b/OracleWebLogic/samples/12212-oradb-wlsstore/container-scripts/app-deploy.py @@ -1,4 +1,4 @@ -# Copyright (c) 2017 Oracle and/or its affiliates. All rights reserved. +# Copyright (c) 2018 Oracle and/or its affiliates. All rights reserved. # # WLST Offline for deploying an application under APP_NAME packaged in APP_PKG_FILE located in APP_PKG_LOCATION # It will read the domain under DOMAIN_HOME by default @@ -7,7 +7,7 @@ # import os -# Deployment Information +# Deployment Information domainhome = os.environ.get('DOMAIN_HOME', '/u01/oracle/user_projects/domains/base_domain') admin_name = os.environ.get('ADMIN_NAME', 'AdminServer') appname = os.environ.get('APP_NAME', 'auction') @@ -24,7 +24,7 @@ app = create(appname, 'AppDeployment') app.setSourcePath(appdir + '/' + apppkg) app.setStagingMode('nostage') - + # Assign application to AdminServer # ================================= assign('AppDeployment', appname, 'Target', admin_name) diff --git a/OracleWebLogic/samples/12212-oradb-wlsstore/container-scripts/create-wls-domain.py b/OracleWebLogic/samples/12212-oradb-wlsstore/container-scripts/create-wls-domain.py index a1d061565d..40c5020439 100644 --- a/OracleWebLogic/samples/12212-oradb-wlsstore/container-scripts/create-wls-domain.py +++ b/OracleWebLogic/samples/12212-oradb-wlsstore/container-scripts/create-wls-domain.py @@ -1,4 +1,4 @@ -# Copyright (c) 2014-2017 Oracle and/or its affiliates. All rights reserved. +# Copyright (c) 2014-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. diff --git a/OracleWebLogic/samples/12212-oradb-wlsstore/container-scripts/createDomainAndStartAdmin.sh b/OracleWebLogic/samples/12212-oradb-wlsstore/container-scripts/createDomainAndStartAdmin.sh index 2e5046a79b..0a617ff759 100755 --- a/OracleWebLogic/samples/12212-oradb-wlsstore/container-scripts/createDomainAndStartAdmin.sh +++ b/OracleWebLogic/samples/12212-oradb-wlsstore/container-scripts/createDomainAndStartAdmin.sh @@ -1,6 +1,6 @@ #!/bin/bash # -#Copyright (c) 2014-2017 Oracle and/or its affiliates. All rights reserved. +#Copyright (c) 2014-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. # @@ -34,15 +34,15 @@ if [ -z $ADMIN_PASSWORD ]; then else s=${ADMIN_PASSWORD} echo " ----> 'weblogic' admin password: $s" -fi +fi sed -i -e "s|ADMIN_PASSWORD|$s|g" /u01/oracle/create-wls-domain.py # Create an empty domain wlst.sh -skipWLSModuleScanning /u01/oracle/create-wls-domain.py -mkdir -p ${DOMAIN_HOME}/servers/AdminServer/security/ -echo "username=${ADMIN_USERNAME}" > /u01/oracle/user_projects/domains/$DOMAIN_NAME/servers/AdminServer/security/boot.properties -echo "password=$s" >> /u01/oracle/user_projects/domains/$DOMAIN_NAME/servers/AdminServer/security/boot.properties -${DOMAIN_HOME}/bin/setDomainEnv.sh +mkdir -p ${DOMAIN_HOME}/servers/AdminServer/security/ +echo "username=${ADMIN_USERNAME}" > /u01/oracle/user_projects/domains/$DOMAIN_NAME/servers/AdminServer/security/boot.properties +echo "password=$s" >> /u01/oracle/user_projects/domains/$DOMAIN_NAME/servers/AdminServer/security/boot.properties +${DOMAIN_HOME}/bin/setDomainEnv.sh fi @@ -53,5 +53,3 @@ tail -f ${DOMAIN_HOME}/servers/AdminServer/logs/AdminServer.log & childPID=$! wait $childPID - - diff --git a/OracleWebLogic/samples/12212-oradb-wlsstore/container-scripts/ds-deploy.py b/OracleWebLogic/samples/12212-oradb-wlsstore/container-scripts/ds-deploy.py index 678a3ee40f..b79401b764 100644 --- a/OracleWebLogic/samples/12212-oradb-wlsstore/container-scripts/ds-deploy.py +++ b/OracleWebLogic/samples/12212-oradb-wlsstore/container-scripts/ds-deploy.py @@ -1,8 +1,8 @@ -# Copyright (c) 2014-2017 Oracle and/or its affiliates. All rights reserved. +# Copyright (c) 2014-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. ## -# WLST Online for deploying a Data Source +# WLST Online for deploying a Data Source # It will read the domain under DOMAIN_HOME by default # # author: Monica Riccelli @@ -43,7 +43,7 @@ edit() startEdit() -# Create Datasource +# Create Datasource # ================== print 'Create Data Source' cd('/') @@ -75,7 +75,7 @@ activate() -print 'Targeting DS to the AdminServer' +print 'Targeting DS to the AdminServer' startEdit() cd ('/JDBCSystemResources/'+ dsname) diff --git a/OracleWebLogic/samples/12212-oradb-wlsstore/container-scripts/ds-wlst-online-config.sh b/OracleWebLogic/samples/12212-oradb-wlsstore/container-scripts/ds-wlst-online-config.sh index 5e5a5263cc..d33c4d2779 100755 --- a/OracleWebLogic/samples/12212-oradb-wlsstore/container-scripts/ds-wlst-online-config.sh +++ b/OracleWebLogic/samples/12212-oradb-wlsstore/container-scripts/ds-wlst-online-config.sh @@ -1,5 +1,5 @@ #! /bin/bash -# Copyright (c) 2014-2017 Oracle and/or its affiliates. All rights reserved. +# Copyright (c) 2014-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. @@ -62,4 +62,4 @@ check_wls "started" localhost $ADMIN_PORT 2 #WLST online to configure DataSource echo 'Doing WLST Online' cd /u01/oracle -wlst -loadProperties /u01/oracle/oradatasource.properties /u01/oracle/ds-deploy.py +wlst -loadProperties /u01/oracle/oradatasource.properties /u01/oracle/ds-deploy.py diff --git a/OracleWebLogic/samples/12212-oradb-wlsstore/container-scripts/oradatasource.properties b/OracleWebLogic/samples/12212-oradb-wlsstore/container-scripts/oradatasource.properties index 96c8f50831..9182ebb574 100644 --- a/OracleWebLogic/samples/12212-oradb-wlsstore/container-scripts/oradatasource.properties +++ b/OracleWebLogic/samples/12212-oradb-wlsstore/container-scripts/oradatasource.properties @@ -1,4 +1,4 @@ -# Copyright (c) 2014-2017 Oracle and/or its affiliates. All rights reserved. +# Copyright (c) 2014-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. diff --git a/OracleWebLogic/samples/12212-oradb-wlsstore/container-scripts/wlst b/OracleWebLogic/samples/12212-oradb-wlsstore/container-scripts/wlst index 29833b7bc8..14a20d58aa 100755 --- a/OracleWebLogic/samples/12212-oradb-wlsstore/container-scripts/wlst +++ b/OracleWebLogic/samples/12212-oradb-wlsstore/container-scripts/wlst @@ -1,5 +1,5 @@ #!/bin/sh -# Copyright (c) 2014-2017 Oracle and/or its affiliates. All rights reserved. +# Copyright (c) 2014-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. diff --git a/OracleWebLogic/samples/12213-domain/Dockerfile b/OracleWebLogic/samples/12213-domain/Dockerfile index 717f843f76..fb1bafcfb7 100644 --- a/OracleWebLogic/samples/12213-domain/Dockerfile +++ b/OracleWebLogic/samples/12213-domain/Dockerfile @@ -1,4 +1,4 @@ -#Copyright (c) 2014-2017 Oracle and/or its affiliates. All rights reserved. +#Copyright (c) 2014-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. # @@ -6,13 +6,13 @@ # -------------------------- # This Dockerfile extends the Oracle WebLogic image by creating a sample domain. # -# Util scripts are copied into the image enabling users to plug NodeManager +# Util scripts are copied into the image enabling users to plug NodeManager # automatically into the AdminServer running on another container. # # HOW TO BUILD THIS IMAGE # ----------------------- # Put all downloaded files in the same directory as this Dockerfile -# Run: +# Run: # $ sudo docker build -t 12213-domain # # Pull base image @@ -23,7 +23,7 @@ FROM oracle/weblogic:12.2.1.3-developer # ---------- MAINTAINER Monica Riccelli -# WLS Configuration +# WLS Configuration # --------------------------- ENV ADMIN_HOST="wlsadmin" \ NM_PORT="5556" \ @@ -46,25 +46,25 @@ ENV DOMAIN_NAME="${DOMAIN_NAME:-base_domain}" \ ADMIN_PASSWORD="${ADMIN_PASSWORD:-""}" \ CLUSTER_NAME="${CLUSTER_NAME:-DockerCluster}" \ DEBUG_FLAG=true \ - PRODUCTION_MODE=dev + PRODUCTION_MODE=dev # Add files required to build this image COPY container-scripts/* /u01/oracle/ #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 && \ +RUN chmod +xw /u01/oracle/*.sh && \ + chmod +xw /u01/oracle/*.py && \ + mkdir -p $PRE_DOMAIN_HOME && \ chmod a+xr $PRE_DOMAIN_HOME && \ chown -R oracle:oracle $PRE_DOMAIN_HOME VOLUME $PRE_DOMAIN_HOME -# Expose Node Manager default port, and also default for admin and managed server +# Expose Node Manager default port, and also default for admin and managed server EXPOSE $NM_PORT $ADMIN_PORT $MS_PORT $DEBUG_PORT USER oracle WORKDIR $ORACLE_HOME -# Define default command to start bash. +# Define default command to start bash. CMD ["/u01/oracle/createAndStartWLSDomain.sh"] diff --git a/OracleWebLogic/samples/12213-domain/build.sh b/OracleWebLogic/samples/12213-domain/build.sh index ab5af7cfcf..2401972505 100755 --- a/OracleWebLogic/samples/12213-domain/build.sh +++ b/OracleWebLogic/samples/12213-domain/build.sh @@ -1,7 +1,7 @@ #!/bin/sh # -#Copyright (c) 2014-2017 Oracle and/or its affiliates. All rights reserved. +#Copyright (c) 2014-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. # -docker build -t 12213-domain . +docker build -t 12213-domain . diff --git a/OracleWebLogic/samples/12213-domain/container-scripts/add-machine.py b/OracleWebLogic/samples/12213-domain/container-scripts/add-machine.py index 790788bf41..aec875ffcf 100644 --- a/OracleWebLogic/samples/12213-domain/container-scripts/add-machine.py +++ b/OracleWebLogic/samples/12213-domain/container-scripts/add-machine.py @@ -1,4 +1,4 @@ -#Copyright (c) 2014-2017 Oracle and/or its affiliates. All rights reserved. +#Copyright (c) 2014-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. # diff --git a/OracleWebLogic/samples/12213-domain/container-scripts/add-server.py b/OracleWebLogic/samples/12213-domain/container-scripts/add-server.py index c98a5b50ff..9c2259e5d2 100644 --- a/OracleWebLogic/samples/12213-domain/container-scripts/add-server.py +++ b/OracleWebLogic/samples/12213-domain/container-scripts/add-server.py @@ -1,4 +1,4 @@ -#Copyright (c) 2014-2017 Oracle and/or its affiliates. All rights reserved. +#Copyright (c) 2014-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. # diff --git a/OracleWebLogic/samples/12213-domain/container-scripts/commonfuncs.py b/OracleWebLogic/samples/12213-domain/container-scripts/commonfuncs.py index e7990c84ed..72b7608cdb 100644 --- a/OracleWebLogic/samples/12213-domain/container-scripts/commonfuncs.py +++ b/OracleWebLogic/samples/12213-domain/container-scripts/commonfuncs.py @@ -1,4 +1,4 @@ -#Copyright (c) 2014-2017 Oracle and/or its affiliates. All rights reserved. +#Copyright (c) 2014-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. # diff --git a/OracleWebLogic/samples/12213-domain/container-scripts/create-wls-domain.py b/OracleWebLogic/samples/12213-domain/container-scripts/create-wls-domain.py index 1952b92aa2..e9f5cd102a 100644 --- a/OracleWebLogic/samples/12213-domain/container-scripts/create-wls-domain.py +++ b/OracleWebLogic/samples/12213-domain/container-scripts/create-wls-domain.py @@ -1,4 +1,4 @@ -#Copyright (c) 2014-2017 Oracle and/or its affiliates. All rights reserved. +#Copyright (c) 2014-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. # diff --git a/OracleWebLogic/samples/12213-domain/container-scripts/createAndStartWLSDomain.sh b/OracleWebLogic/samples/12213-domain/container-scripts/createAndStartWLSDomain.sh index 65f390f04d..ed00aa78a2 100755 --- a/OracleWebLogic/samples/12213-domain/container-scripts/createAndStartWLSDomain.sh +++ b/OracleWebLogic/samples/12213-domain/container-scripts/createAndStartWLSDomain.sh @@ -1,6 +1,6 @@ #!/bin/bash # -#Copyright (c) 2014-2017 Oracle and/or its affiliates. All rights reserved. +#Copyright (c) 2014-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. # @@ -37,15 +37,15 @@ if [ -z $ADMIN_PASSWORD ]; then else s=${ADMIN_PASSWORD} echo " ----> 'weblogic' admin password: $s" -fi +fi sed -i -e "s|ADMIN_PASSWORD|$s|g" /u01/oracle/create-wls-domain.py # Create an empty domain wlst.sh -skipWLSModuleScanning /u01/oracle/create-wls-domain.py -mkdir -p ${DOMAIN_HOME}/servers/AdminServer/security/ -echo "username=${ADMIN_USERNAME}" > /u01/oracle/user_projects/domains/$DOMAIN_NAME/servers/AdminServer/security/boot.properties -echo "password=$s" >> /u01/oracle/user_projects/domains/$DOMAIN_NAME/servers/AdminServer/security/boot.properties -${DOMAIN_HOME}/bin/setDomainEnv.sh +mkdir -p ${DOMAIN_HOME}/servers/AdminServer/security/ +echo "username=${ADMIN_USERNAME}" > /u01/oracle/user_projects/domains/$DOMAIN_NAME/servers/AdminServer/security/boot.properties +echo "password=$s" >> /u01/oracle/user_projects/domains/$DOMAIN_NAME/servers/AdminServer/security/boot.properties +${DOMAIN_HOME}/bin/setDomainEnv.sh fi @@ -56,5 +56,3 @@ tail -f ${DOMAIN_HOME}/servers/AdminServer/logs/AdminServer.log & childPID=$! wait $childPID - - diff --git a/OracleWebLogic/samples/12213-domain/container-scripts/createMachine.sh b/OracleWebLogic/samples/12213-domain/container-scripts/createMachine.sh index 5051ee93d6..6a00900ed0 100755 --- a/OracleWebLogic/samples/12213-domain/container-scripts/createMachine.sh +++ b/OracleWebLogic/samples/12213-domain/container-scripts/createMachine.sh @@ -1,6 +1,6 @@ #!/bin/bash # -#Copyright (c) 2014-2017 Oracle and/or its affiliates. All rights reserved. +#Copyright (c) 2014-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. # diff --git a/OracleWebLogic/samples/12213-domain/container-scripts/createServer.sh b/OracleWebLogic/samples/12213-domain/container-scripts/createServer.sh index 9345bd08de..acec7b75af 100755 --- a/OracleWebLogic/samples/12213-domain/container-scripts/createServer.sh +++ b/OracleWebLogic/samples/12213-domain/container-scripts/createServer.sh @@ -1,6 +1,6 @@ #!/bin/bash # -#Copyright (c) 2014-2017 Oracle and/or its affiliates. All rights reserved. +#Copyright (c) 2014-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. # diff --git a/OracleWebLogic/samples/12213-domain/container-scripts/waitForAdminServer.sh b/OracleWebLogic/samples/12213-domain/container-scripts/waitForAdminServer.sh index f4b1a34901..e95a65c504 100755 --- a/OracleWebLogic/samples/12213-domain/container-scripts/waitForAdminServer.sh +++ b/OracleWebLogic/samples/12213-domain/container-scripts/waitForAdminServer.sh @@ -1,6 +1,6 @@ #!/bin/bash -# -#Copyright (c) 2014-2017 Oracle and/or its affiliates. All rights reserved. +# +#Copyright (c) 2014-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. # diff --git a/OracleWebLogic/samples/12213-webtier-apache/README.md b/OracleWebLogic/samples/12213-webtier-apache/README.md index 2f17a0d091..bdb47eba7f 100644 --- a/OracleWebLogic/samples/12213-webtier-apache/README.md +++ b/OracleWebLogic/samples/12213-webtier-apache/README.md @@ -53,7 +53,7 @@ Start an Apache container by calling: $ docker run -d --name apache -e WEBLOGIC_HOST= -e WEBLOGIC_PORT=7001 -p 80:80 12213-apache -Now you can access the WebLogic Administration Console under `http://localhost/console` (default to port 80) instead of using port 7001. You can access the Console from a remote machine using the WebLgoic Administration Server's `` instead of `localhost`. +Now you can access the WebLogic Administration Console under `http://localhost/console` (default to port 80) instead of using port 7001. You can access the Console from a remote machine using the WebLogic Administration Server's `` instead of `localhost`. ## Provide Your Own Apache Plugin Configuration If you want to start the Apache container with some pre-specified `mod_weblogic` configuration: diff --git a/OracleWebLogic/samples/clean-up-docker.sh b/OracleWebLogic/samples/clean-up-docker.sh index 270d2828d4..a8790b87bc 100755 --- a/OracleWebLogic/samples/clean-up-docker.sh +++ b/OracleWebLogic/samples/clean-up-docker.sh @@ -4,7 +4,7 @@ # # Use `docker-cleanup -n` for a dry run to see what would be deleted. # -# Copyright (c) 2014-2015 Oracle and/or its affiliates. All rights reserved. +# Copyright (c) 2014-2018 Oracle and/or its affiliates. All rights reserved. untagged_containers() { # Print containers using untagged images: $1 is used with awk's print: 0=line, 1=column 1. diff --git a/OracleWebLogic/samples/rm-containers.sh b/OracleWebLogic/samples/rm-containers.sh index 779e704afd..84505120a5 100755 --- a/OracleWebLogic/samples/rm-containers.sh +++ b/OracleWebLogic/samples/rm-containers.sh @@ -1,6 +1,6 @@ #!/bin/bash # -# Copyright (c) 2014-2015 Oracle and/or its affiliates. All rights reserved. +# Copyright (c) 2014-2018 Oracle and/or its affiliates. All rights reserved. # docker stop $(docker ps -a -q) docker rm $(docker ps -a -q) diff --git a/OracleWebLogic/samples/wls-K8s/README.md b/OracleWebLogic/samples/wls-K8s/README.md index 83d723acfb..5072694a72 100644 --- a/OracleWebLogic/samples/wls-K8s/README.md +++ b/OracleWebLogic/samples/wls-K8s/README.md @@ -14,7 +14,7 @@ As part of this sample we have developed a WLS Exporter which formats the WLS Ru ##How to Build and Run -**NOTE:** Our instructions are based on running this sample in Minikube but it will run on any Kubernetes environment. Make sure you have minikube installed, and have built **oracle/weblogic:12.2.1.3-developer**. +**NOTE:** Our instructions are based on running this sample in Minikube but it will run on any Kubernetes environment. Make sure you have minikube installed, and have built **oracle/weblogic:12.2.1.3-developer**. 1. Build the WebLogic 12.2.1.3 domain image in this sample: @@ -41,7 +41,7 @@ As part of this sample we have developed a WLS Exporter which formats the WLS Ru 5. Start minikube and set ``` - $ minikube start + $ minikube start $ eval $(minikube docker-env) ``` @@ -56,7 +56,7 @@ As part of this sample we have developed a WLS Exporter which formats the WLS Ru $ cd .. ``` -8. Start the WLS Admin Server and Managed Servers. +8. Start the WLS Admin Server and Managed Servers. ``` $ kubectl create -f k8s/wls-admin-webhook.yml $ kubectl create -f k8s/wls-stateful.yml @@ -66,7 +66,7 @@ As part of this sample we have developed a WLS Exporter which formats the WLS Ru ``` $ kubectl get pods ``` - + You should see one Admin Server and two Managed Servers, looking something like: ``` NAME READY STATUS RESTARTS AGE @@ -80,21 +80,21 @@ As part of this sample we have developed a WLS Exporter which formats the WLS Ru 10. Verify that you can reach the managed servers The servers are accessible on the minikube IP address, usually 168.192.99.100. To verify that address: - + ``` $ minikube ip 192.168.99.100 ``` - + Then use your browser to view one of the managed servers at `http://192.168.99.100:30011/memoryloadapp/` If you refresh it, its instance name should vary between `ms-0` and `ms-1`. - + 11. Log into the admin console - 0. Browse to `http://192.168.99.100:30001/console/` and log in using the credentials passed in as build arguments when building the wls-12213-domain + 0. Browse to `http://192.168.99.100:30001/console/` and log in using the credentials passed in as build arguments when building the wls-12213-domain 1. Under **Domain Structure** click *Environment* and then *Servers* - 2. You should see 2 managed servers RUNNING, and 3 more SHUTDOWN - + 2. You should see 2 managed servers RUNNING, and 3 more SHUTDOWN + 12. Start Prometheus to monitor the managed servers: ``` $ kubectl create -f prometheus/prometheus-kubernetes.yml @@ -129,7 +129,7 @@ As part of this sample we have developed a WLS Exporter which formats the WLS Ru 15. Observe the response to scaling up ``` - $ kubectl scale statefulset ms --replicas=3 + $ kubectl scale statefulset ms --replicas=3 ``` `kubectl get pods` should now show ms-0, ms-1, ms-2 and wls-admin-server-0. Also, @@ -150,15 +150,15 @@ As part of this sample we have developed a WLS Exporter which formats the WLS Ru 1. Browse to `http://192.168.99.100:30011/opensessionapp` 2. Within a minute or two, a new ms-1 instance will be created, and show up in all of the above ways to view it. - - **Note**: The WLDF smart rule configured for this demo monitors the OpenSessionsCurrentCount of the + + **Note**: The WLDF smart rule configured for this demo monitors the OpenSessionsCurrentCount of the WebAppComponentRuntimeMBean for ApplicationRuntime called "OpenSessionApp". It will trigger a REST action when the average number of opened sessions >= 0.01 on 5% or more of the servers in a WebLogic cluster called - "DockerCluster", computed over the last ten seconds, sampled every second. The REST action invokes a webhook + "DockerCluster", computed over the last ten seconds, sampled every second. The REST action invokes a webhook that scales up the statefulset named "ms" by one. The WLDF rule is configured with a 1 minute alarm, so it will not trigger another action within 1 minute. After that same step can repeat again and again to continue scaling up. - 3. Connect to Grafana to check the collected metrics for OpenSessionCount in the + 3. Connect to Grafana to check the collected metrics for OpenSessionCount in the graph "Open Sessions Current Count" 18. Clean up by shutting down the services. Shutting down the WLS instances can take some time. @@ -170,16 +170,16 @@ As part of this sample we have developed a WLS Exporter which formats the WLS Ru ``` *Troubleshooting* - - if something is not working as expected, sometimes just shutting down minikube and + - if something is not working as expected, sometimes just shutting down minikube and starting it back up again will fix the problem: ``` minikube stop minikube start ``` - + - it might be helpful to check the log(s) to see if everything is starting up successfully, *e.g.*, ``` $ kubectl logs -f wls-admin-server-0 -c wls-admin-server ``` ##COPYRIGHT -Copyright (c) 2014-2017 Oracle and/or its affiliates. All rights reserved. +Copyright (c) 2014-2018 Oracle and/or its affiliates. All rights reserved. diff --git a/OracleWebLogic/samples/wls-K8s/wls-12213-domain/Dockerfile b/OracleWebLogic/samples/wls-K8s/wls-12213-domain/Dockerfile index 28dee3da42..c58cedf6f3 100755 --- a/OracleWebLogic/samples/wls-K8s/wls-12213-domain/Dockerfile +++ b/OracleWebLogic/samples/wls-K8s/wls-12213-domain/Dockerfile @@ -1,4 +1,4 @@ -#Copyright (c) 2014-2017 Oracle and/or its affiliates. All rights reserved. +#Copyright (c) 2014-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. # @@ -6,13 +6,13 @@ # -------------------------- # This Dockerfile extends the Oracle WebLogic image by creating a sample domain. # -# Util scripts are copied into the image enabling users to plug NodeManager +# Util scripts are copied into the image enabling users to plug NodeManager # automatically into the AdminServer running on another container. # # HOW TO BUILD THIS IMAGE # ----------------------- # Put all downloaded files in the same directory as this Dockerfile -# Run: +# Run: # docker build --build-arg ADMIN_PASSWORD= --build-arg ADMIN_USER= -t wls-12213-domain . # $ sudo docker build -t 12213-domain # @@ -25,9 +25,9 @@ MAINTAINER Monica Riccelli # Build time arguments # -------------------- -ARG number_of_ms=5 -ARG ADMIN_PASS -ARG ADMIN_USER +ARG number_of_ms=5 +ARG ADMIN_PASS +ARG ADMIN_USER # Environment variables required for this build (do NOT change) @@ -41,7 +41,7 @@ ENV MW_HOME="$ORACLE_HOME" \ DEFAULT_MS_NAME=ms-0 \ MSNAME_PREFIX=ms- \ DNS_DOMAIN_NAME=wls-subdomain \ - WLST="$ORACLE_HOME/oracle_common/common/bin/wlst.sh" + WLST="$ORACLE_HOME/oracle_common/common/bin/wlst.sh" # Copy scripts # -------------------------------- diff --git a/OracleWebLogic/samples/wls-K8s/wls-12213-domain/Dockerfile.adddemoapps b/OracleWebLogic/samples/wls-K8s/wls-12213-domain/Dockerfile.adddemoapps index 446fda6746..071b062a26 100644 --- a/OracleWebLogic/samples/wls-K8s/wls-12213-domain/Dockerfile.adddemoapps +++ b/OracleWebLogic/samples/wls-K8s/wls-12213-domain/Dockerfile.adddemoapps @@ -1,5 +1,5 @@ # -#Copyright (c) 2014-2017 Oracle and/or its affiliates. All rights reserved. +#Copyright (c) 2014-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. # @@ -11,7 +11,7 @@ # HOW TO BUILD THIS IMAGE # ----------------------- # Run the following command for the sample application included in this directory. -# $ docker build -t wls-12213-oow-demo-domain -f Dockerfile.adddemoapps . +# $ docker build -t wls-12213-oow-demo-domain -f Dockerfile.adddemoapps . # # Pull base image @@ -49,4 +49,3 @@ RUN . $ORACLE_HOME/wlserver/server/bin/setWLSEnv.sh && \ # Copy WLDF Resource configuration # ---------------------------------------------------------------- COPY wldf-config/*.xml $DOMAINS_DIR/$DOMAIN_NAME/config/diagnostics/ - diff --git a/OracleWebLogic/samples/wls-K8s/wls-12213-domain/Dockerfile.webhook b/OracleWebLogic/samples/wls-K8s/wls-12213-domain/Dockerfile.webhook index 80c09b47b6..6ac7891463 100644 --- a/OracleWebLogic/samples/wls-K8s/wls-12213-domain/Dockerfile.webhook +++ b/OracleWebLogic/samples/wls-K8s/wls-12213-domain/Dockerfile.webhook @@ -1,10 +1,10 @@ -#Copyright (c) 2014-2017 Oracle and/or its affiliates. All rights reserved. +#Copyright (c) 2014-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. # # ORACLE DOCKERFILES PROJECT # -------------------------- -# This Dockerfile to create Webhook image +# This Dockerfile to create Webhook image # # HOW TO BUILD THIS IMAGE # ----------------------- @@ -31,4 +31,3 @@ RUN apk add --update curl jq && \ rm -rf /var/cache/apk/* CMD ["-verbose", "-hooks=/etc/webhook/hooks.json", "-hotreload"] - diff --git a/OracleWebLogic/samples/wls-K8s/wls-12213-domain/container-scripts/add-app-to-domain.py b/OracleWebLogic/samples/wls-K8s/wls-12213-domain/container-scripts/add-app-to-domain.py index 093b85dc07..37742deccf 100755 --- a/OracleWebLogic/samples/wls-K8s/wls-12213-domain/container-scripts/add-app-to-domain.py +++ b/OracleWebLogic/samples/wls-K8s/wls-12213-domain/container-scripts/add-app-to-domain.py @@ -1,4 +1,4 @@ -#Copyright (c) 2014-2017 Oracle and/or its affiliates. All rights reserved. +#Copyright (c) 2014-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. # diff --git a/OracleWebLogic/samples/wls-K8s/wls-12213-domain/container-scripts/provision-domain.py b/OracleWebLogic/samples/wls-K8s/wls-12213-domain/container-scripts/provision-domain.py index 1260310458..e36076b68a 100755 --- a/OracleWebLogic/samples/wls-K8s/wls-12213-domain/container-scripts/provision-domain.py +++ b/OracleWebLogic/samples/wls-K8s/wls-12213-domain/container-scripts/provision-domain.py @@ -1,4 +1,4 @@ -#Copyright (c) 2014-2017 Oracle and/or its affiliates. All rights reserved. +#Copyright (c) 2014-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. # diff --git a/OracleWebLogic/samples/wls-K8s/wls-12213-domain/container-scripts/provision-domain.sh b/OracleWebLogic/samples/wls-K8s/wls-12213-domain/container-scripts/provision-domain.sh index 5f9f8c1ea8..f1f0f4d287 100755 --- a/OracleWebLogic/samples/wls-K8s/wls-12213-domain/container-scripts/provision-domain.sh +++ b/OracleWebLogic/samples/wls-K8s/wls-12213-domain/container-scripts/provision-domain.sh @@ -1,6 +1,6 @@ #! /bin/bash -#Copyright (c) 2014-2017 Oracle and/or its affiliates. All rights reserved. +#Copyright (c) 2014-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. # diff --git a/OracleWebLogic/samples/wls-K8s/wls-12213-domain/container-scripts/shutdown-servers.py b/OracleWebLogic/samples/wls-K8s/wls-12213-domain/container-scripts/shutdown-servers.py index 880a48d6fb..2f360e5c84 100755 --- a/OracleWebLogic/samples/wls-K8s/wls-12213-domain/container-scripts/shutdown-servers.py +++ b/OracleWebLogic/samples/wls-K8s/wls-12213-domain/container-scripts/shutdown-servers.py @@ -1,4 +1,4 @@ -#Copyright (c) 2014-2017 Oracle and/or its affiliates. All rights reserved. +#Copyright (c) 2014-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. # diff --git a/OracleWebLogic/samples/wls-K8s/wls-12213-domain/container-scripts/startadmin.sh b/OracleWebLogic/samples/wls-K8s/wls-12213-domain/container-scripts/startadmin.sh index e6962e4a5d..2b5ecd5324 100755 --- a/OracleWebLogic/samples/wls-K8s/wls-12213-domain/container-scripts/startadmin.sh +++ b/OracleWebLogic/samples/wls-K8s/wls-12213-domain/container-scripts/startadmin.sh @@ -7,16 +7,16 @@ domain_home=${DOMAINS_DIR}/${DOMAIN_NAME} sed -i 's/${OPERATOR_ENDPOINT}/'${OPERATOR_ENDPOINT}'/' $domain_home/config/diagnostics/Module-0-3905.xml chmod +w $domain_home/config/diagnostics/Module-0-3905.xml -#Copyright (c) 2014-2017 Oracle and/or its affiliates. All rights reserved. +#Copyright (c) 2014-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 WebLogic Admin Server -# Cluster Info +# Cluster Info export CLUSTER_NAME=DockerCluster export KEY_CLUSTER_PREFIX=${CLUSTER_NAME}/ -# Concurrency Lock Info +# Concurrency Lock Info export LOCK_NAME=Lock-${CLUSTER_NAME} # Stores Managed Server Name export SITUATIONAL_CONFIG_DIR=${domain_home}/optconfig @@ -43,7 +43,7 @@ function relay_SIGTERM { trap relay_SIGTERM SIGTERM -# Start admin server +# Start admin server (bin/startWebLogic.sh ) & while [ ! -f $MS_DONE_FILE ] diff --git a/OracleWebLogic/samples/wls-K8s/wls-12213-domain/container-scripts/startms.sh b/OracleWebLogic/samples/wls-K8s/wls-12213-domain/container-scripts/startms.sh index aae152dc2a..3b61c2cd34 100755 --- a/OracleWebLogic/samples/wls-K8s/wls-12213-domain/container-scripts/startms.sh +++ b/OracleWebLogic/samples/wls-K8s/wls-12213-domain/container-scripts/startms.sh @@ -1,6 +1,6 @@ #! /usr/bin/bash -#Copyright (c) 2014-2017 Oracle and/or its affiliates. All rights reserved. +#Copyright (c) 2014-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. # @@ -13,10 +13,10 @@ ms_name_from_image=${DEFAULT_MS_NAME} sed -i 's/${OPERATOR_ENDPOINT}/'${OPERATOR_ENDPOINT}'/' $domain_home/config/diagnostics/Module-0-3905.xml chmod +w $domain_home/config/diagnostics/Module-0-3905.xml -# Cluster Info +# Cluster Info export CLUSTER_NAME=DockerCluster export KEY_CLUSTER_PREFIX=${CLUSTER_NAME}/ -# Concurrency Lock Info +# Concurrency Lock Info export LOCK_NAME=Lock-${CLUSTER_NAME} # Stores Managed Server Name #export LOCAL_MS_NAME_PIPE=/tmp/MSName.fifo @@ -56,7 +56,7 @@ function relay_SIGTERM { trap relay_SIGTERM SIGTERM -# Start server +# Start server (bin/startManagedWebLogic.sh $LOCAL_MS_NAME t3://wls-admin-server:8001 ) & while [ ! -f $MS_DONE_FILE ] diff --git a/OracleWebLogic/samples/wls-k8s-domain/README.md b/OracleWebLogic/samples/wls-k8s-domain/README.md index 6f84202128..341f17427b 100644 --- a/OracleWebLogic/samples/wls-k8s-domain/README.md +++ b/OracleWebLogic/samples/wls-k8s-domain/README.md @@ -21,13 +21,13 @@ If you run `docker build` behind a proxy, you need to set proxy settings via `-- Three volumes are defined in `k8s/pv.yml` which refer to three external directories. You can choose to use host paths or shared NFS directories. Please change the paths accordingly. The external directories need to be initially empty. **NOTE:** The first two persistent volumes `pv1` and `pv2` will be used by WebLogic server pods. All processes in WebLogic server pods are running with UID 1000 and GID 1000 by default, so proper permissions need to be set to these two external directories to make sure that UID 1000 or GID 1000 have permission to read and write the volume directories. The third persistent volume `pv3` is reserved for later use. We assume that root user will be used to access this volume so no particular permission need to be set to the directory. - + ### 3. Deploy All the Kubernetes Resources Run the following commands to deploy the Kubernetes resources: ``` -$ kubectl create -f k8s/secrets.yml -$ kubectl create -f k8s/pv.yml +$ kubectl create -f k8s/secrets.yml +$ kubectl create -f k8s/pv.yml $ kubectl create -f k8s/pvc.yml $ kubectl create -f k8s/wls-admin.yml $ kubectl create -f k8s/wls-stateful.yml @@ -131,6 +131,5 @@ $ kubectl delete -f k8s/pv.yml $ kubectl delete -f k8s/secrets.yml ``` You can now delete all of data generated to the external directories. -## COPYRIGHT -Copyright (c) 2014-2017 Oracle and/or its affiliates. All rights reserved. - +## COPYRIGHT +Copyright (c) 2014-2018 Oracle and/or its affiliates. All rights reserved. diff --git a/OracleWebLogic/samples/wls-k8s-domain/build.sh b/OracleWebLogic/samples/wls-k8s-domain/build.sh index 854a4d0b5b..338fb930ab 100644 --- a/OracleWebLogic/samples/wls-k8s-domain/build.sh +++ b/OracleWebLogic/samples/wls-k8s-domain/build.sh @@ -1,6 +1,6 @@ -#!/bin/sh -#Copyright (c) 2014-2017 Oracle and/or its affiliates. All rights reserved. +#!/bin/sh +#Copyright (c) 2014-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. # -docker build -t wls-k8s-domain . +docker build -t wls-k8s-domain . diff --git a/OracleWebLogic/samples/wls-k8s-domain/container-scripts/base.py b/OracleWebLogic/samples/wls-k8s-domain/container-scripts/base.py index 61bbcec72b..9b9e063299 100755 --- a/OracleWebLogic/samples/wls-k8s-domain/container-scripts/base.py +++ b/OracleWebLogic/samples/wls-k8s-domain/container-scripts/base.py @@ -1,11 +1,11 @@ -#Copyright (c) 2014-2017 Oracle and/or its affiliates. All rights reserved. +#Copyright (c) 2014-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. # # Author Lily He import requests -from requests.auth import HTTPBasicAuth +from requests.auth import HTTPBasicAuth import json import shutil import sys @@ -23,8 +23,8 @@ print (prefix, domainDir) -user = os.environ["WLUSER"] -pwd = os.environ["WLPASSWORD"] +user = os.environ["WLUSER"] +pwd = os.environ["WLPASSWORD"] auth = HTTPBasicAuth(user, pwd) header1 = {'X-Requested-By': 'pythonclient','Accept':'application/json','Content-Type':'application/json'} header2 = {'X-Requested-By': 'pythonclient','Accept':'application/json'} @@ -55,7 +55,7 @@ def waitAdmin(): fail = True while(fail): sleep(2) - try: + try: res = requests.get(prefix+tail, auth=auth, headers=header2, verify=True) print res.status_code if(res.ok): diff --git a/OracleWebLogic/samples/wls-k8s-domain/container-scripts/run.py b/OracleWebLogic/samples/wls-k8s-domain/container-scripts/run.py index 577d75d655..baf8827aa1 100755 --- a/OracleWebLogic/samples/wls-k8s-domain/container-scripts/run.py +++ b/OracleWebLogic/samples/wls-k8s-domain/container-scripts/run.py @@ -1,11 +1,11 @@ -#Copyright (c) 2014-2017 Oracle and/or its affiliates. All rights reserved. +#Copyright (c) 2014-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. # # Author Lily He import requests -from requests.auth import HTTPBasicAuth +from requests.auth import HTTPBasicAuth import json import shutil import sys @@ -23,7 +23,7 @@ def createDomainWithLeasing(): base.waitAdmin() base.cpJDBCResource(defaultDSModule); base.createAll(clusterWithLeasing) - + def createDomainNoLeasing(): base.waitAdmin() base.createAll(clusterNoLeasing) @@ -31,7 +31,7 @@ def createDomainNoLeasing(): def createRes(jsonFile): base.createAll(jsonFile) -print 'url:', base.prefix +print 'url:', base.prefix start=time() option=sys.argv[1] if(option == 'createDomainNoLeasing'): diff --git a/OracleWebLogic/samples/wls-k8s-domain/container-scripts/startadmin.sh b/OracleWebLogic/samples/wls-k8s-domain/container-scripts/startadmin.sh index 7fccd7cf73..834d707b70 100755 --- a/OracleWebLogic/samples/wls-k8s-domain/container-scripts/startadmin.sh +++ b/OracleWebLogic/samples/wls-k8s-domain/container-scripts/startadmin.sh @@ -1,6 +1,6 @@ #!/bin/bash -#Copyright (c) 2014-2017 Oracle and/or its affiliates. All rights reserved. +#Copyright (c) 2014-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. # @@ -29,10 +29,10 @@ function setupDomain { echo "create domain with database leasing..." python run.py createDomainWithLeasing else - echo "create domain with no leasing..." + echo "create domain with no leasing..." python run.py createDomainNoLeasing fi -} +} # domain provision configDir="$SAMPLE_DOMAIN_HOME/config" @@ -45,4 +45,3 @@ else fi tail -f /u01/wlsdomain/admin.out - diff --git a/OracleWebLogic/samples/wls-k8s-domain/container-scripts/startms.sh b/OracleWebLogic/samples/wls-k8s-domain/container-scripts/startms.sh index 0735ae932c..e3aaa6d494 100755 --- a/OracleWebLogic/samples/wls-k8s-domain/container-scripts/startms.sh +++ b/OracleWebLogic/samples/wls-k8s-domain/container-scripts/startms.sh @@ -1,6 +1,6 @@ #!/bin/bash -#Copyright (c) 2014-2017 Oracle and/or its affiliates. All rights reserved. +#Copyright (c) 2014-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. # @@ -13,7 +13,7 @@ ok=0 # wait until domain provision finished or exit after max retry while [ $ok -lt 1 -a $count -lt $maxRetry ] ; do - sleep 5 + sleep 5 ok=`curl -I -v \ --user $WLUSER:$WLPASSWORD \ -H X-Requested-By:MyClient \