fix new OPatch version installer (#102)

Author: ddsharpe

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

@@ -247,8 +247,10 @@ void addOPatch1394ToImage(String tmpDir, String opatchBugNumber) throws Exceptio
         String filePath =
                 new PatchFile(useCache, Constants.OPATCH_PATCH_TYPE, Constants.OPATCH_PATCH_TYPE, opatchBugNumber,
                         userId, password).resolve(cacheStore);
-        Files.copy(Paths.get(filePath), Paths.get(tmpDir, new File(filePath).getName()));
+        String filename = new File(filePath).getName();
+        Files.copy(Paths.get(filePath), Paths.get(tmpDir, filename));
         dockerfileOptions.setOPatchPatchingEnabled();
+        dockerfileOptions.setOPatchFileName(filename);
     }
 
     private void handleChown() {

imagetool/src/main/java/com/oracle/weblogic/imagetool/impl/PatchFile.java

@@ -43,13 +43,16 @@ public PatchFile(CachePolicy cachePolicy, String category, String version, Strin
     public String resolve(CacheStore cacheStore) throws Exception {
         //patchId is null in case of latestPSU
 
+        logger.entering();
         String filePath = cacheStore.getValueFromCache(getKey());
         boolean fileExists = isFileOnDisk(filePath);
 
+        if (fileExists) {
+            logger.info("IMG-0017", category, patchId, filePath);
+        } else {
+            logger.fine("Could not find patch in cache category={0} version={1} patchId={2}",
+                category, version, patchId);
 
-        logger.finest("PatchFile.resolve: Patch file in cache?: " + fileExists);
-
-        if (!fileExists) {
             if (userId == null || password == null)
                 throw new Exception(String.format(
                         "Patch %s is not in the cache store and you have not provide Oracle Support "
@@ -60,7 +63,7 @@ public String resolve(CacheStore cacheStore) throws Exception {
             filePath = downloadPatch(cacheStore);
         }
 
-        logger.finest("PatchFile.resolve: resolved filepath " + filePath);
+        logger.exiting(filePath);
         return filePath;
     }
 

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

@@ -34,6 +34,7 @@ public class DockerfileOptions {
     private String domainHome;
     private String tempDirectory;
     private String baseImageName;
+    private String opatchFileName;
 
     // WDT values
     private String wdtHome;
@@ -284,6 +285,26 @@ public DockerfileOptions setOPatchPatchingEnabled() {
         return this;
     }
 
+    /**
+     * Set filename for OPatch patch.
+     *
+     * @return this DockerfileOptions object
+     */
+    public DockerfileOptions setOPatchFileName(String value) {
+        opatchFileName = value;
+        return this;
+    }
+
+    /**
+     * Referenced by Dockerfile template, provides OPatch filename.
+     *
+     * @return simple filename for OPatch Patch.
+     */
+    @SuppressWarnings("unused")
+    public String opatchFileName() {
+        return opatchFileName;
+    }
+
     /**
      * Referenced by Dockerfile template, for enabling WDT function.
      *

imagetool/src/main/resources/ImageTool.properties

@@ -15,3 +15,4 @@ IMG-0013=Error parsing additional build commands file {0}
 IMG-0014=Additional build command section, {0}, was not one of the valid sections: {1}
 IMG-0015=Additional build commands, adding {0} lines to section [{1}]
 IMG-0016=Image Tool build ID: {0}
+IMG-0017=Using {0} patch {1} from cache: {2}

imagetool/src/main/resources/docker-files/Create_Image.mustache

@@ -87,7 +87,7 @@ COPY --chown={{userid}}:{{groupid}} $WLS_PKG wls.rsp {{{tempDir}}}/
 COPY --chown={{userid}}:{{groupid}} $ORAINST $INV_LOC/
 
 {{#isOpatchPatchingEnabled}}
-    COPY --chown={{userid}}:{{groupid}} p28186730_139400_Generic.zip {{{tempDir}}}/opatch/
+    COPY --chown={{userid}}:{{groupid}} {{{opatchFileName}}} {{{tempDir}}}/opatch/
 {{/isOpatchPatchingEnabled}}
 
 {{#isPatchingEnabled}}
@@ -105,7 +105,7 @@ RUN unzip -q {{{tempDir}}}/$WLS_PKG -d {{{tempDir}}} \
     -responseFile {{{tempDir}}}/wls.rsp -invPtrLoc $INV_LOC/$ORAINST -ignoreSysPrereqs -force -novalidation \
 {{#isOpatchPatchingEnabled}}
  && cd {{{tempDir}}}/opatch \
- && {{{java_home}}}/bin/jar -xf {{{tempDir}}}/opatch/p28186730_139400_Generic.zip \
+ && {{{java_home}}}/bin/jar -xf {{{tempDir}}}/opatch/{{{opatchFileName}}} \
  && {{{java_home}}}/bin/java -jar {{{tempDir}}}/opatch/6880880/opatch_generic.jar -silent -ignoreSysPrereqs -force -novalidation oracle_home={{{oracle_home}}} \
 {{/isOpatchPatchingEnabled}}
 {{#isPatchingEnabled}}