Fixed bug in REBASE that prevented copy of WDT_HOME (#367)

Author: ddsharpe

imagetool/src/main/java/com/oracle/weblogic/imagetool/cli/menu/RebaseImage.java

@@ -1,4 +1,4 @@
-// Copyright (c) 2019, 2021, Oracle and/or its affiliates.
+// Copyright (c) 2019, 2022, Oracle and/or its affiliates.
 // Licensed under the Universal Permissive License v 1.0 as shown at https://oss.oracle.com/licenses/upl.
 
 package com.oracle.weblogic.imagetool.cli.menu;
@@ -30,45 +30,42 @@ public CommandResponse call() throws Exception {
         logger.entering();
         Instant startTime = Instant.now();
 
-        String oldOracleHome;
-        String oldJavaHome;
         String newOracleHome = null;
         String newJavaHome = null;
-        String domainHome;
-        String modelHome;
-        boolean modelOnly;
 
         try {
             initializeOptions();
 
-            if (sourceImage != null && !sourceImage.isEmpty()) {
-                logger.finer("IMG-0002", sourceImage);
-                dockerfileOptions.setSourceImage(sourceImage);
+            if (Utils.isEmptyString(sourceImage)) {
+                // sourceImage is a required parameter.  This error will only occur if the user passes an empty string.
+                return CommandResponse.error(Utils.getMessage("IMG-0117"));
+            }
 
-                logger.info("IMG-0091", sourceImage);
-                Properties baseImageProperties = Utils.getBaseImageProperties(buildEngine, sourceImage,
-                    "/probe-env/inspect-image.sh", buildDir());
+            logger.finer("IMG-0002", sourceImage);
+            dockerfileOptions.setSourceImage(sourceImage);
 
-                oldOracleHome = baseImageProperties.getProperty("oracleHome", null);
-                oldJavaHome = baseImageProperties.getProperty("javaHome", null);
-                domainHome = baseImageProperties.getProperty("domainHome", null);
-                modelHome = baseImageProperties.getProperty("wdtModelHome", null);
-                modelOnly = Boolean.parseBoolean(baseImageProperties.getProperty("wdtModelOnly", null));
-            } else {
-                return CommandResponse.error("Source Image not set");
-            }
+            logger.info("IMG-0091", sourceImage);
+            Properties sourceImageProperties = Utils.getBaseImageProperties(buildEngine, sourceImage,
+                "/probe-env/inspect-image.sh", buildDir());
+
+            String oldOracleHome = sourceImageProperties.getProperty("oracleHome", null);
+            String oldJavaHome = sourceImageProperties.getProperty("javaHome", null);
+            String domainHome = sourceImageProperties.getProperty("domainHome", null);
+            String wdtHome = sourceImageProperties.getProperty("wdtHome", null);
+            String modelHome = sourceImageProperties.getProperty("wdtModelHome", null);
+            boolean modelOnly = Boolean.parseBoolean(sourceImageProperties.getProperty("wdtModelOnly", null));
 
+            // If the user specified --targetImage, collect and apply the properties for the new image.
             if (!Utils.isEmptyString(targetImage)) {
                 logger.finer("IMG-0002", targetImage);
                 dockerfileOptions.setTargetImage(targetImage);
                 dockerfileOptions.setRebaseToTarget(true);
 
-                Properties baseImageProperties = Utils.getBaseImageProperties(buildEngine, targetImage,
+                Properties targetImageProperties = Utils.getBaseImageProperties(buildEngine, targetImage,
                     "/probe-env/inspect-image.sh", buildDir());
-
-                newOracleHome = baseImageProperties.getProperty("oracleHome", null);
-                newJavaHome = baseImageProperties.getProperty("javaHome", null);
-
+                newOracleHome = targetImageProperties.getProperty("oracleHome", null);
+                newJavaHome = targetImageProperties.getProperty("javaHome", null);
+                useFileOwnerFromTarget(targetImageProperties);
             } else {
                 dockerfileOptions.setRebaseToNew(true);
             }
@@ -94,6 +91,7 @@ public CommandResponse call() throws Exception {
 
             dockerfileOptions
                 .setDomainHome(domainHome)
+                .setWdtHome(wdtHome)
                 .setWdtModelHome(modelHome)
                 .setWdtModelOnly(modelOnly);
 
@@ -117,6 +115,17 @@ public CommandResponse call() throws Exception {
         return successfulBuildResponse(startTime);
     }
 
+    private void useFileOwnerFromTarget(Properties imageProperties) {
+        String userid = imageProperties.getProperty("oracleHomeUser", null);
+        String groupid = imageProperties.getProperty("oracleHomeGroup", null);
+        if (!Utils.isEmptyString(userid)) {
+            dockerfileOptions.setUserId(userid);
+        }
+        if (!Utils.isEmptyString(groupid)) {
+            dockerfileOptions.setGroupId(groupid);
+        }
+    }
+
     @Option(
         names = {"--sourceImage"},
         required = true,

imagetool/src/main/resources/ImageTool.properties

@@ -88,7 +88,7 @@ IMG-0086=Failed to find patch number [[brightred: {0}]] on Oracle servers, verif
 IMG-0087=The Oracle Home directory in --fromImage={0} has an owner and group of {1}:{2}.  You must update the image with the same user and group setting from when it was created. Example: --chown={1}:{2}
 IMG-0088=Build command failed with error: {0}
 IMG-0089=WDT_MODEL_HOME was not set in the source image, using default model location: {0}
-IMG-0090=Rebasing WDT models.  A domain was not found in the source image at {0}
+IMG-0090=Rebasing WDT models only.  A domain was not found in the source image at {0}
 IMG-0091=Reading settings from the source image {0}
 IMG-0092=ORACLE_HOME already exists in {0} (--fromImage), skipping middleware installs
 IMG-0093=Patching skipped.  Using CREATE to patch --fromImage with an existing ORACLE_HOME is not supported. To create a patched image, use CREATE with a linux base image and apply the WebLogic install and patches at the same time.
@@ -115,3 +115,4 @@ IMG-0113=The directory specified with WLSIMG_BLDDIR must be writable: {0}
 IMG-0114=Unable to parse section {0} of additionalBuildCommands: {1}
 IMG-0115=Unable to reach Oracle patch server to check for patch conflicts, skipping online conflict check. OPatch will check patches locally during the build.
 IMG-0116=A patch conflict was detected. The patches listed within the brackets conflict with each other. These fixes cannot be applied without a merge patch from Oracle:
+IMG-0117=The value for --sourceImage must not be empty.