Merge pull request #244 from oracle/use-ghcr

Pull oraclelinux image from ghcr.io so that customers aren't rate limited

Author: rjeberhard

imagetool/src/main/java/com/oracle/weblogic/imagetool/util/DockerfileOptions.java

@@ -91,7 +91,7 @@ public DockerfileOptions(String buildId) {
 
         tempDirectory = "/tmp/imagetool";
 
-        baseImageName = "oraclelinux:7-slim";
+        baseImageName = "ghcr.io/oracle/oraclelinux:7-slim";
 
         // WDT values
         useWdt = false;

site/create-image-with-internet.md

@@ -4,7 +4,7 @@ The Image Tool supports creating Linux based WebLogic Docker images, applying We
 
 In this use case, the Image Tool will:
 
-1. Start with a base-level operating system image (`oraclelinux:7-slim`).
+1. Start with a base-level operating system image (`ghcr.io/oracle/oraclelinux:7-slim`).
 2. Update the image with the necessary packages for installing WebLogic Server.
 3. Install Java and WebLogic Server.
 
@@ -55,7 +55,7 @@ https_proxy=http://company-proxy.com:80 --build-arg WLS_PKG=fmw_12.2.1.3.0_wls_D
 JAVA_PKG=jdk-8u201-linux-x64.tar.gz --build-arg PATCHDIR=patches /home/acmeuser/wlsimgbuilder_temp8791654163579491583
 Sending build context to Docker daemon   1.08GB
 
-Step 1/46 : ARG BASE_IMAGE=oraclelinux:7-slim
+Step 1/46 : ARG BASE_IMAGE=ghcr.io/oracle/oraclelinux:7-slim
 ...
 Removing intermediate container 57ccb9fff56b
  ---> 18d366fc3da4
@@ -68,9 +68,9 @@ Successfully tagged wls:12.2.1.3.0
 ```bash
 docker images
 
-REPOSITORY          TAG                 IMAGE ID            CREATED              SIZE
-wls                 12.2.1.3.0          18d366fc3da4        About a minute ago   1.41GB
-oraclelinux         7-slim              f7512ac13c1b        6 weeks ago          118MB
+REPOSITORY                    TAG                 IMAGE ID            CREATED              SIZE
+wls                           12.2.1.3.0          18d366fc3da4        About a minute ago   1.41GB
+ghcr.io/oracle/oraclelinux    7-slim              f7512ac13c1b        6 weeks ago          118MB
 
 ```
 ## Copyright

site/create-image.md

@@ -14,7 +14,7 @@ Usage: imagetool create [OPTIONS]
 | `--chown` | `userid:groupid` for JDK/Middleware installs and patches.  | `oracle:oracle` |
 | `--docker` | Path to the Docker executable.  |  `docker` |
 | `--dryRun` | Skip Docker build execution and print the Dockerfile to stdout.  |  |
-| `--fromImage` | Docker image to use as a base image when creating a new image. | `oraclelinux:7-slim`  |
+| `--fromImage` | Docker image to use as a base image when creating a new image. | `ghcr.io/oracle/oraclelinux:7-slim`  |
 | `--httpProxyUrl` | Proxy for the HTTP protocol. Example: `http://myproxy:80` or `http:user:passwd@myproxy:8080`  |   |
 | `--httpsProxyUrl` | Proxy for the HTTPS protocol. Example: `https://myproxy:80` or `https:user:passwd@myproxy:8080`  |   |
 | `--installerResponseFile` | One or more custom response files. A comma separated list of paths to installer response files. Overrides the default responses for the Oracle silent installer.  |   |

site/rebase-image.md

@@ -16,7 +16,7 @@ Usage: imagetool rebase [OPTIONS]
 | `--chown` | `userid:groupid` for JDK/Middleware installs and patches.  | `oracle:oracle` |
 | `--docker` | Path to the Docker executable.  |  `docker` |
 | `--dryRun` | Skip Docker build execution and print the Dockerfile to stdout.  |  |
-| `--fromImage` | Docker image to use as a base image when creating a new image. | `oraclelinux:7-slim`  |
+| `--fromImage` | Docker image to use as a base image when creating a new image. | `ghcr.io/oracle/oraclelinux:7-slim`  |
 | `--httpProxyUrl` | Proxy for the HTTP protocol. Example: `http://myproxy:80` or `http:user:passwd@myproxy:8080`  |   |
 | `--httpsProxyUrl` | Proxy for the HTTPS protocol. Example: `https://myproxy:80` or `https:user:passwd@myproxy:8080`  |   |
 | `--installerResponseFile` | One or more custom response files. A comma separated list of paths to installer response files. Overrides the default responses for the Oracle silent installer.  |   |

tests/src/test/java/com/oracle/weblogic/imagetool/tests/ITImagetool.java

@@ -965,7 +965,7 @@ void createMiiOl8slim(TestInfo testInfo) throws Exception {
             String tagName = build_tag + ":" + getMethodName(testInfo);
             String command = new CreateCommand()
                 .tag(tagName)
-                .fromImage(" oraclelinux", "8-slim")
+                .fromImage("ghcr.io/oracle/oraclelinux", "8-slim")
                 .version(WLS_VERSION)
                 .wdtVersion(WDT_VERSION)
                 .wdtArchive(WDT_ARCHIVE)