fix issues reported by rc

Author: gosurya-oracle

src/main/java/com/oracle/weblogicx/imagebuilder/cli/menu/CreateImage.java

@@ -21,6 +21,7 @@
 import java.nio.file.Files;
 import java.nio.file.Path;
 import java.nio.file.Paths;
+import java.nio.file.attribute.PosixFilePermissions;
 import java.time.Duration;
 import java.time.Instant;
 import java.util.LinkedList;
@@ -72,7 +73,7 @@ public CommandResponse call() throws Exception {
             // create a tmp directory for user.
             // using user home as base to avoid running out of space in tmp
             tmpDir = Files.createTempDirectory(Paths.get(System.getProperty("user.home")),
-                "wlsimgbuilder_temp");
+                "wlsimgbuilder_temp", PosixFilePermissions.asFileAttribute(PosixFilePermissions.fromString("rwxr-xr-x")));
             String tmpDirPath = tmpDir.toAbsolutePath().toString();
             logger.info("tmp directory used for build context: " + tmpDirPath);
             Path tmpPatchesDir = Files.createDirectory(Paths.get(tmpDirPath, "patches"));
@@ -86,7 +87,7 @@ public CommandResponse call() throws Exception {
                 cmdBuilder.add("BASE_IMAGE=" + fromImage);
 
                 tmpDir2 = Files.createTempDirectory(Paths.get(System.getProperty("user.home")),
-                    "wlsimgbuilder_temp");
+                    "wlsimgbuilder_temp", PosixFilePermissions.asFileAttribute(PosixFilePermissions.fromString("rwxr-xr-x")));
                 logger.info("tmp directory in user.home for docker run: " + tmpDir2);
 
                 Utils.copyResourceAsFile("/probe-env/test-create-env.sh",

src/main/java/com/oracle/weblogicx/imagebuilder/cli/menu/UpdateImage.java

@@ -6,7 +6,6 @@
 
 import com.oracle.weblogicx.imagebuilder.api.model.CommandResponse;
 import com.oracle.weblogicx.imagebuilder.api.model.WLSInstallerType;
-import com.oracle.weblogicx.imagebuilder.cli.HelpVersionProvider;
 import com.oracle.weblogicx.imagebuilder.util.ARUUtil;
 import com.oracle.weblogicx.imagebuilder.util.Constants;
 import com.oracle.weblogicx.imagebuilder.util.Utils;
@@ -18,6 +17,7 @@
 import java.nio.file.Files;
 import java.nio.file.Path;
 import java.nio.file.Paths;
+import java.nio.file.attribute.PosixFilePermissions;
 import java.time.Duration;
 import java.time.Instant;
 import java.util.ArrayList;
@@ -71,7 +71,8 @@ public CommandResponse call() throws Exception {
                 cmdBuilder.add("BASE_IMAGE=" + fromImage);
             }
 
-            tmpDir2 = Files.createTempDirectory(Paths.get(System.getProperty("user.home")), null);
+            tmpDir2 = Files.createTempDirectory(Paths.get(System.getProperty("user.home")), "wlsimgbuilder_temp",
+                    PosixFilePermissions.asFileAttribute(PosixFilePermissions.fromString("rwxr-xr-x")));
             logger.info("tmp directory in user.home for docker run: " + tmpDir2);
             Utils.copyResourceAsFile("/probe-env/test-update-env.sh",
                     tmpDir2.toAbsolutePath().toString() + File.separator + "test-env.sh", true);
@@ -130,7 +131,8 @@ public CommandResponse call() throws Exception {
             }
 
             // create a tmp directory for user.
-            tmpDir = Files.createTempDirectory(null);
+            tmpDir = Files.createTempDirectory(Paths.get(System.getProperty("user.home")), "wlsimgbuilder_temp",
+                    PosixFilePermissions.asFileAttribute(PosixFilePermissions.fromString("rwxr-xr-x")));
             String tmpDirPath = tmpDir.toAbsolutePath().toString();
             Path tmpPatchesDir = Files.createDirectory(Paths.get(tmpDirPath, "patches"));
             Files.createFile(Paths.get(tmpPatchesDir.toAbsolutePath().toString(), "dummy.txt"));

src/main/java/com/oracle/weblogicx/imagebuilder/util/Utils.java

@@ -469,7 +469,7 @@ public static List<String> getDockerRunCmd(Path hostDirToMount, String dockerIma
                                                String... args) {
         //docker run -v /user.dir/tmpdir:/tmp wls122130:min sh -c /tmp/test-env.sh
         final List<String> retVal = Stream.of(
-                "docker", "run", "--volume=" + hostDirToMount.toAbsolutePath().toString() + ":/tmp_scripts",
+                "docker", "run", "--user=root", "--volume=" + hostDirToMount.toAbsolutePath().toString() + ":/tmp_scripts",
                 dockerImage, "/tmp_scripts/" + scriptToRun).collect(Collectors.toList());
         if (args != null && args.length > 0) {
             retVal.addAll(Arrays.asList(args));

src/main/resources/docker-files/Dockerfile.ph

@@ -93,9 +93,9 @@ CMD ["sh", "-c", "${SCRIPT_HOME}/startAdminServer.sh"]
 RUN mkdir -p $OTMPDIR/opatch
 COPY --chown=oracle:oracle p28186730_139400_Generic.zip $OTMPDIR/opatch/
 
-RUN unzip $OTMPDIR/opatch/p28186730_139400_Generic.zip -d $OTMPDIR/opatch ; \
-    /u01/jdk/bin/java -jar $OTMPDIR/opatch/6880880/opatch_generic.jar -silent -invPtrLoc $INV_LOC/$ORAINST \
-    oracle_home=$ORACLE_HOME
+RUN cd $OTMPDIR/opatch \
+ && jar -xf $OTMPDIR/opatch/p28186730_139400_Generic.zip \
+ && $JAVA_HOME/bin/java -jar $OTMPDIR/opatch/6880880/opatch_generic.jar -silent oracle_home=$ORACLE_HOME
 
 # END %%OPATCH_1394%% #
 

src/main/resources/docker-files/Dockerfile.update

@@ -13,7 +13,8 @@ ARG PATCHDIR
 ARG OTMPDIR
 
 ENV PATCHDIR=${PATCHDIR:-patches} \
-    OTMPDIR=${OTMPDIR:-/tmp/delme}
+    OTMPDIR=${OTMPDIR:-/tmp/delme} \
+    OPATCH_NO_FUSER=true
 
 RUN mkdir -p $OTMPDIR \
  && chown -R oracle:oracle $OTMPDIR/