From 8ca679909e31752ca278a9c0f5326fb372ee0f3f Mon Sep 17 00:00:00 2001 From: Derek Sharpe Date: Thu, 6 Jun 2019 16:29:05 -0500 Subject: [PATCH 1/7] updated sample Dockerfile and documentation to reference the Oracle Container Registry instead of Docker Hub --- samples/docker-domain/Dockerfile | 3 +-- samples/docker-domain/README.md | 4 +++- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/samples/docker-domain/Dockerfile b/samples/docker-domain/Dockerfile index fe8e94e0a9..3cdc7abaa6 100644 --- a/samples/docker-domain/Dockerfile +++ b/samples/docker-domain/Dockerfile @@ -40,8 +40,7 @@ # # Pull base image # --------------- -# FROM store/oracle/weblogic:12.2.1.3 -FROM store/oracle/weblogic:12.2.1.3-dev +FROM container-registry.oracle.com/middleware/weblogic:12.2.1.3-dev # Maintainer # ---------- diff --git a/samples/docker-domain/README.md b/samples/docker-domain/README.md index a002c532a7..286f97ccfd 100644 --- a/samples/docker-domain/README.md +++ b/samples/docker-domain/README.md @@ -28,7 +28,9 @@ When the WDT `discoverDomain` tool is used on an existing domain, a ZIP archive ### How to Build and Run -**NOTE:** The image is based on a WebLogic Server image in the docker-images project: `oracle/weblogic:12.2.1.3-developer`. Build that image to your local repository before building this sample. +**NOTE:** The image is based on a WebLogic Server image in the Oracle container registry: `container-registry.oracle.com/middleware/weblogic:12.2.1.3-dev`. You will need to login and accept the license agreement on the [Oracle Registry](https://container-registry.oracle.com/) before you can use Docker to pull the image. +Also, don't forget to login, `docker login container-registry.oracle.com`, with docker before you pull, `docker pull container-registry.oracle.com/middleware/weblogic:12.2.1.3-dev`. +If you prefer, you may want to build your own base image, using the docker-images project for OracleWebLogic on Github as a starting point, [https://github.com/oracle/docker-images/tree/master/OracleWebLogic/dockerfiles/12.2.1.3](https://github.com/oracle/docker-images/tree/master/OracleWebLogic/dockerfiles/12.2.1.3) The WebLogic Deploy Tool installer is required to build this image. Add `weblogic-deploy.zip` to the sample directory. From 53b7c92322484af0ba7174087d999b3cc53fced5 Mon Sep 17 00:00:00 2001 From: Derek Sharpe Date: Thu, 6 Jun 2019 17:03:22 -0500 Subject: [PATCH 2/7] added colon to docker build tag in the example --- samples/docker-domain/README.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/samples/docker-domain/README.md b/samples/docker-domain/README.md index 286f97ccfd..7223637c32 100644 --- a/samples/docker-domain/README.md +++ b/samples/docker-domain/README.md @@ -69,7 +69,7 @@ To build this sample taking the defaults, run: --build-arg WDT_ARCHIVE=archive.zip \ --build-arg WDT_VARIABLE=properties/docker-build/domain.properties \ --force-rm=true \ - -t 12213-domain-wdt . + -t 12213-domain1-wdt:1.0 . This will use the model, variable and archive files in the sample directory. @@ -88,7 +88,7 @@ To parse the sample variable file and build the sample, run: --build-arg WDT_ARCHIVE=archive.zip \ --build-arg WDT_VARIABLE=properties/docker-build/domain.properties \ --force-rm=true \ - -t 12213-domain-wdt . + -t 12213-domain1-wdt:1.0 . This sample provides a Derby Data Source that is targeted to the Managed Server cluster. The Derby database is created in the Admin Server container when the container is run. To turn off the database create, set DERBY_FLAG="false" in the From 0b2c07f6b61b3254e5301733cd7230fef5ae6c7b Mon Sep 17 00:00:00 2001 From: Derek Sharpe Date: Fri, 7 Jun 2019 11:55:34 -0500 Subject: [PATCH 3/7] text edit suggestions from Rosemary --- samples/docker-domain/README.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/samples/docker-domain/README.md b/samples/docker-domain/README.md index 7223637c32..8376d23ed2 100644 --- a/samples/docker-domain/README.md +++ b/samples/docker-domain/README.md @@ -28,8 +28,8 @@ When the WDT `discoverDomain` tool is used on an existing domain, a ZIP archive ### How to Build and Run -**NOTE:** The image is based on a WebLogic Server image in the Oracle container registry: `container-registry.oracle.com/middleware/weblogic:12.2.1.3-dev`. You will need to login and accept the license agreement on the [Oracle Registry](https://container-registry.oracle.com/) before you can use Docker to pull the image. -Also, don't forget to login, `docker login container-registry.oracle.com`, with docker before you pull, `docker pull container-registry.oracle.com/middleware/weblogic:12.2.1.3-dev`. +**NOTE:** The image is based on a WebLogic Server image in the Oracle Container Registry: `container-registry.oracle.com/middleware/weblogic:12.2.1.3-dev`. You will need to log in and accept the license agreement on the [Oracle Container Registry](https://container-registry.oracle.com/) before you can use Docker to pull the image. +Also, don't forget to log in with Docker, `docker login container-registry.oracle.com`, before you try to pull the image, `docker pull container-registry.oracle.com/middleware/weblogic:12.2.1.3-dev`. If you prefer, you may want to build your own base image, using the docker-images project for OracleWebLogic on Github as a starting point, [https://github.com/oracle/docker-images/tree/master/OracleWebLogic/dockerfiles/12.2.1.3](https://github.com/oracle/docker-images/tree/master/OracleWebLogic/dockerfiles/12.2.1.3) The WebLogic Deploy Tool installer is required to build this image. Add `weblogic-deploy.zip` to the sample directory. From 47616d6e3212c1faa592e21ad8e6c1519c66226b Mon Sep 17 00:00:00 2001 From: Derek Sharpe Date: Fri, 7 Jun 2019 11:56:43 -0500 Subject: [PATCH 4/7] text edit suggestions from Rosemary --- samples/docker-domain/README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/samples/docker-domain/README.md b/samples/docker-domain/README.md index 8376d23ed2..006d8f0f9b 100644 --- a/samples/docker-domain/README.md +++ b/samples/docker-domain/README.md @@ -30,7 +30,7 @@ When the WDT `discoverDomain` tool is used on an existing domain, a ZIP archive **NOTE:** The image is based on a WebLogic Server image in the Oracle Container Registry: `container-registry.oracle.com/middleware/weblogic:12.2.1.3-dev`. You will need to log in and accept the license agreement on the [Oracle Container Registry](https://container-registry.oracle.com/) before you can use Docker to pull the image. Also, don't forget to log in with Docker, `docker login container-registry.oracle.com`, before you try to pull the image, `docker pull container-registry.oracle.com/middleware/weblogic:12.2.1.3-dev`. -If you prefer, you may want to build your own base image, using the docker-images project for OracleWebLogic on Github as a starting point, [https://github.com/oracle/docker-images/tree/master/OracleWebLogic/dockerfiles/12.2.1.3](https://github.com/oracle/docker-images/tree/master/OracleWebLogic/dockerfiles/12.2.1.3) +If you prefer, you may want to build your own base image, using the docker-images project for OracleWebLogic on Github as a starting point, [https://github.com/oracle/docker-images/tree/master/OracleWebLogic/dockerfiles/12.2.1.3](https://github.com/oracle/docker-images/tree/master/OracleWebLogic/dockerfiles/12.2.1.3). The WebLogic Deploy Tool installer is required to build this image. Add `weblogic-deploy.zip` to the sample directory. From 841ded823aae14d2170e45b33043f345c01a70b3 Mon Sep 17 00:00:00 2001 From: Derek Sharpe Date: Fri, 7 Jun 2019 17:18:09 -0500 Subject: [PATCH 5/7] typo - GitHub --- samples/docker-domain/README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/samples/docker-domain/README.md b/samples/docker-domain/README.md index 006d8f0f9b..5a7983238d 100644 --- a/samples/docker-domain/README.md +++ b/samples/docker-domain/README.md @@ -30,7 +30,7 @@ When the WDT `discoverDomain` tool is used on an existing domain, a ZIP archive **NOTE:** The image is based on a WebLogic Server image in the Oracle Container Registry: `container-registry.oracle.com/middleware/weblogic:12.2.1.3-dev`. You will need to log in and accept the license agreement on the [Oracle Container Registry](https://container-registry.oracle.com/) before you can use Docker to pull the image. Also, don't forget to log in with Docker, `docker login container-registry.oracle.com`, before you try to pull the image, `docker pull container-registry.oracle.com/middleware/weblogic:12.2.1.3-dev`. -If you prefer, you may want to build your own base image, using the docker-images project for OracleWebLogic on Github as a starting point, [https://github.com/oracle/docker-images/tree/master/OracleWebLogic/dockerfiles/12.2.1.3](https://github.com/oracle/docker-images/tree/master/OracleWebLogic/dockerfiles/12.2.1.3). +If you prefer, you may want to build your own base image, using the docker-images project for OracleWebLogic on GitHub as a starting point, [https://github.com/oracle/docker-images/tree/master/OracleWebLogic/dockerfiles/12.2.1.3](https://github.com/oracle/docker-images/tree/master/OracleWebLogic/dockerfiles/12.2.1.3). The WebLogic Deploy Tool installer is required to build this image. Add `weblogic-deploy.zip` to the sample directory. From 92ee5f0b8de8a28a1dda9353545856b7a1cbafb5 Mon Sep 17 00:00:00 2001 From: Derek Sharpe Date: Tue, 25 Jun 2019 10:30:46 -0500 Subject: [PATCH 6/7] spelling corrections --- samples/docker-domain/README.md | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/samples/docker-domain/README.md b/samples/docker-domain/README.md index 5a7983238d..df9a1fd09b 100644 --- a/samples/docker-domain/README.md +++ b/samples/docker-domain/README.md @@ -18,7 +18,7 @@ Care should be taken to secure the credentials that are present in the model. Th See the README file for more information on using property and file tokens in the WDT model. -The ADMIN credentials are necessary to start the Admin or Managed Server in a docker container. The sample provides security.properties in the properties/docker-run directory. This file contains the admin credentials and additional properties used to customize the Weblogic Server start. +The ADMIN credentials are necessary to start the Admin or Managed Server in a docker container. The sample provides security.properties in the properties/docker-run directory. This file contains the admin credentials and additional properties used to customize the WebLogic Server start. Note: Oracle recommends that the adminpass.properties, adminuser.properties and security.properties files be deleted or secured after the image is built and the WebLogic Server are started so that the user name and password are not inadvertently exposed. @@ -30,7 +30,7 @@ When the WDT `discoverDomain` tool is used on an existing domain, a ZIP archive **NOTE:** The image is based on a WebLogic Server image in the Oracle Container Registry: `container-registry.oracle.com/middleware/weblogic:12.2.1.3-dev`. You will need to log in and accept the license agreement on the [Oracle Container Registry](https://container-registry.oracle.com/) before you can use Docker to pull the image. Also, don't forget to log in with Docker, `docker login container-registry.oracle.com`, before you try to pull the image, `docker pull container-registry.oracle.com/middleware/weblogic:12.2.1.3-dev`. -If you prefer, you may want to build your own base image, using the docker-images project for OracleWebLogic on GitHub as a starting point, [https://github.com/oracle/docker-images/tree/master/OracleWebLogic/dockerfiles/12.2.1.3](https://github.com/oracle/docker-images/tree/master/OracleWebLogic/dockerfiles/12.2.1.3). +If you prefer, you may want to build your own base image, using the docker-images project for Oracle WebLogic on GitHub as a starting point, [https://github.com/oracle/docker-images/tree/master/OracleWebLogic/dockerfiles/12.2.1.3](https://github.com/oracle/docker-images/tree/master/OracleWebLogic/dockerfiles/12.2.1.3). The WebLogic Deploy Tool installer is required to build this image. Add `weblogic-deploy.zip` to the sample directory. @@ -113,7 +113,7 @@ To start an additional Managed Server (in this example managed-server-2), run: The above scenario from this sample will give you a WebLogic domain with a dynamic cluster set up on a single host environment. -You may create more containerized Managed Servers by calling the `docker` command above for `startManagedServer.sh` as long you link properly with the Administration Server. For an example of a multihost environment, see the sample `1221-multihost`. +You may create more containerized Managed Servers by calling the `docker` command above for `startManagedServer.sh` as long you link properly with the Administration Server. For an example of a multi-host environment, see the sample `1221-multihost`. # Copyright Copyright (c) 2018 Oracle and/or its affiliates. All rights reserved. From f86aec70964f6885b2cca8d965b7dbf9ee69df8f Mon Sep 17 00:00:00 2001 From: Derek Sharpe Date: Wed, 24 Jul 2019 17:41:38 -0500 Subject: [PATCH 7/7] switched base image to weblogic:12.2.1.3 generic instead of dev to match samples in operator project --- samples/docker-domain/Dockerfile | 2 +- samples/docker-domain/README.md | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/samples/docker-domain/Dockerfile b/samples/docker-domain/Dockerfile index 836bd7391f..00a6f21a96 100644 --- a/samples/docker-domain/Dockerfile +++ b/samples/docker-domain/Dockerfile @@ -39,7 +39,7 @@ # # Pull base image # --------------- -FROM container-registry.oracle.com/middleware/weblogic:12.2.1.3-dev +FROM container-registry.oracle.com/middleware/weblogic:12.2.1.3 # Maintainer # ---------- diff --git a/samples/docker-domain/README.md b/samples/docker-domain/README.md index df9a1fd09b..a31619d9ec 100644 --- a/samples/docker-domain/README.md +++ b/samples/docker-domain/README.md @@ -28,8 +28,8 @@ When the WDT `discoverDomain` tool is used on an existing domain, a ZIP archive ### How to Build and Run -**NOTE:** The image is based on a WebLogic Server image in the Oracle Container Registry: `container-registry.oracle.com/middleware/weblogic:12.2.1.3-dev`. You will need to log in and accept the license agreement on the [Oracle Container Registry](https://container-registry.oracle.com/) before you can use Docker to pull the image. -Also, don't forget to log in with Docker, `docker login container-registry.oracle.com`, before you try to pull the image, `docker pull container-registry.oracle.com/middleware/weblogic:12.2.1.3-dev`. +**NOTE:** The image is based on a WebLogic Server image in the Oracle Container Registry: `container-registry.oracle.com/middleware/weblogic:12.2.1.3`. You will need to log in and accept the license agreement on the [Oracle Container Registry](https://container-registry.oracle.com/) before you can use Docker to pull the image. +Also, don't forget to log in with Docker, `docker login container-registry.oracle.com`, before you try to pull the image, `docker pull container-registry.oracle.com/middleware/weblogic:12.2.1.3`. If you prefer, you may want to build your own base image, using the docker-images project for Oracle WebLogic on GitHub as a starting point, [https://github.com/oracle/docker-images/tree/master/OracleWebLogic/dockerfiles/12.2.1.3](https://github.com/oracle/docker-images/tree/master/OracleWebLogic/dockerfiles/12.2.1.3). The WebLogic Deploy Tool installer is required to build this image. Add `weblogic-deploy.zip` to the sample directory.