Merge branch 'master' of https://github.com/oracle/weblogic-image-tool into imagetooltest1

xiancao · xiancao · commit 27f94de5708f · 2019-07-02T21:08:39.000-07:00
diff --git a/imagetool/src/main/java/com/oracle/weblogic/imagetool/cli/cache/AddInstallerEntry.java b/imagetool/src/main/java/com/oracle/weblogic/imagetool/cli/cache/AddInstallerEntry.java
@@ -31,6 +31,12 @@ public AddInstallerEntry(boolean isCLIMode) {
     public CommandResponse call() {
         if (location != null && Files.isRegularFile(location) && !Utils.isEmptyString(version)) {
             String key = String.format("%s%s%s", type, CacheStore.CACHE_KEY_SEPARATOR, version);
+            if (cacheStore.getValueFromCache(key) != null) {
+                return new CommandResponse(-1, String.format("Installer already exists %s=%s. Try removing it "
+                        + "using the deleteEntry command before adding it again.",
+                    key,
+                    cacheStore.getValueFromCache(key)));
+            }
             cacheStore.addToCache(key, location.toAbsolutePath().toString());
             return new CommandResponse(0, String.format("Successfully added to cache. %s=%s", key,
                     cacheStore.getValueFromCache(key)));
diff --git a/imagetool/src/main/java/com/oracle/weblogic/imagetool/cli/menu/CreateImage.java b/imagetool/src/main/java/com/oracle/weblogic/imagetool/cli/menu/CreateImage.java
@@ -21,7 +21,6 @@
 import java.util.logging.Logger;
 import java.util.stream.Collectors;
 
-import com.oracle.weblogic.imagetool.api.model.CachePolicy;
 import com.oracle.weblogic.imagetool.api.model.CommandResponse;
 import com.oracle.weblogic.imagetool.api.model.DomainType;
 import com.oracle.weblogic.imagetool.api.model.InstallerType;
diff --git a/imagetool/src/main/java/com/oracle/weblogic/imagetool/cli/menu/ImageOperation.java b/imagetool/src/main/java/com/oracle/weblogic/imagetool/cli/menu/ImageOperation.java
@@ -13,6 +13,8 @@
 import java.util.List;
 import java.util.concurrent.Callable;
 import java.util.logging.Logger;
+import java.util.regex.Matcher;
+import java.util.regex.Pattern;
 import java.util.stream.Collectors;
 import java.util.stream.Stream;
 
@@ -61,6 +63,9 @@ public CommandResponse call() throws Exception {
                 return new CommandResponse(-1, "user Oracle support credentials do not match");
             }
         }
+
+        handleChown();
+
         logger.finer("Exiting ImageOperation call ");
         return new CommandResponse(0, null);
     }
@@ -188,6 +193,28 @@ void addOPatch1394ToImage(Path tmpDir, String opatchBugNumber) throws Exception
         dockerfileOptions.setOPatchPatchingEnabled();
     }
 
+    private void handleChown() {
+        if (osUserAndGroup.length != 2) {
+            throw new IllegalArgumentException("--chown value must be a colon separated user and group.  user:group");
+        }
+
+        Pattern p = Pattern.compile("^[a-z_]([a-z0-9_-]{0,31}|[a-z0-9_-]{0,30}\\$)$");
+        Matcher usr = p.matcher(osUserAndGroup[0]);
+        if (!usr.matches()) {
+            throw new IllegalArgumentException("--chown must contain a valid Unix username.  No more than 32 characters"
+                    + " and starts with a lowercase character.  Invalid value = " + osUserAndGroup[0]);
+        }
+        Matcher grp = p.matcher(osUserAndGroup[1]);
+        if (!grp.matches()) {
+            throw new IllegalArgumentException("--chown must contain a valid Unix groupid.  No more than 32 characters"
+                    + " and starts with a lowercase character.  Invalid value = " + osUserAndGroup[1]);
+        }
+
+        dockerfileOptions.setUserId(osUserAndGroup[0]);
+        dockerfileOptions.setGroupId(osUserAndGroup[1]);
+    }
+
+
     WLSInstallerType installerType = WLSInstallerType.WLS;
 
     String installerVersion = Constants.DEFAULT_WLS_VERSION;
@@ -277,6 +304,14 @@ void addOPatch1394ToImage(Path tmpDir, String opatchBugNumber) throws Exception
     )
     Path dockerLog;
 
+    @Option(
+            names = {"--chown"},
+            split = ":",
+            description = "userid:groupid for JDK/Middleware installs and patches. Default: ${DEFAULT-VALUE}.",
+            defaultValue = "oracle:oracle"
+    )
+    private String[] osUserAndGroup;
+
     @Unmatched
     List<String> unmatchedOptions;
 }
diff --git a/imagetool/src/main/java/com/oracle/weblogic/imagetool/util/DockerfileOptions.java b/imagetool/src/main/java/com/oracle/weblogic/imagetool/util/DockerfileOptions.java
@@ -17,6 +17,7 @@ public class DockerfileOptions {
     private String groupname = "oracle";
     private String javaHome = "/u01/jdk";
     private String baseImageName = "oraclelinux:7-slim";
+    private String tempDirectory = "/tmp/delme";
 
     /**
      * Options to be used with the Mustache template.
@@ -170,4 +171,23 @@ public DockerfileOptions setWdtEnabled() {
         useWdt = true;
         return this;
     }
+
+    /**
+     * Referenced by Dockerfile template, provides location where installers should write their temporary files.
+     *
+     * @return the full path to the temporary directory that should be used.
+     */
+    public String tempDir() {
+        return tempDirectory;
+    }
+
+    /**
+     * The location where installers should write their temporary files.
+     *
+     * @param value  the full path to the temporary directory that should be used.
+     */
+    public void setTempDirectory(String value) {
+
+        tempDirectory = value;
+    }
 }
diff --git a/imagetool/src/main/resources/docker-files/Create_Image.mustache b/imagetool/src/main/resources/docker-files/Create_Image.mustache
@@ -8,9 +8,9 @@ FROM {{baseImage}} as OS_UPDATE
 USER root
 
 {{#useYum}}
-RUN yum -y --downloaddir=$OTMPDIR install gzip tar unzip \
- && yum -y --downloaddir=$OTMPDIR clean all \
- && rm -rf $OTMPDIR
+RUN yum -y --downloaddir={{tempDir}} install gzip tar unzip \
+ && yum -y --downloaddir={{tempDir}} clean all \
+ && rm -rf {{tempDir}}
 {{/useYum}}
 {{#useAptGet}}
 RUN apt-get -y update \
@@ -30,34 +30,31 @@ RUN zypper -nq update \
 {{/useZypper}}
 
 ## Create user and group
-RUN if [ -z "$(getent group {{groupid}})" ]; then hash groupadd &> /dev/null && groupadd -g 1000 {{groupid}} || exit -1 ; fi \
- && if [ -z "$(getent passwd {{userid}})" ]; then hash useradd &> /dev/null && useradd -u 1100 -g {{groupid}} {{userid}} || exit -1; fi \
+RUN if [ -z "$(getent group {{groupid}})" ]; then hash groupadd &> /dev/null && groupadd {{groupid}} || exit -1 ; fi \
+ && if [ -z "$(getent passwd {{userid}})" ]; then hash useradd &> /dev/null && useradd -g {{groupid}} {{userid}} || exit -1; fi \
  && mkdir /u01 \
  && chown {{userid}}:{{groupid}} /u01
 
 FROM OS_UPDATE as JDK_BUILD
 ARG JAVA_PKG
-ARG OTMPDIR
 
 ENV JAVA_PKG=${JAVA_PKG:-server-jre-*-linux-x64.tar.gz} \
-    JAVA_HOME={{java_home}} \
-    OTMPDIR=${OTMPDIR:-/tmp/delme}
+    JAVA_HOME={{java_home}}
 
-COPY --chown={{userid}}:{{groupid}} $JAVA_PKG $OTMPDIR/
+COPY --chown={{userid}}:{{groupid}} $JAVA_PKG {{tempDir}}/
 
 USER {{userid}}
 
-RUN tar xzf $OTMPDIR/$JAVA_PKG -C /u01 \
+RUN tar xzf {{tempDir}}/$JAVA_PKG -C /u01 \
  && mv /u01/jdk* {{java_home}} \
- && rm -rf $OTMPDIR
+ && rm -rf {{tempDir}}
 
 FROM OS_UPDATE as WLS_BUILD
 ARG WLS_PKG
 ARG INV_LOC
 ARG WLS_RESP
 ARG ORACLE_HOME=/u01/oracle
 ARG ORAINST
-ARG OTMPDIR
 ARG PATCHDIR
 
 ENV WLS_PKG=${WLS_PKG:-fmw_12.2.1.3.0_wls_Disk1_1of1.zip} \
@@ -66,36 +63,35 @@ ENV WLS_PKG=${WLS_PKG:-fmw_12.2.1.3.0_wls_Disk1_1of1.zip} \
     INV_LOC=${INV_LOC:-/u01/oracle/oraInventory} \
     WLS_RESP=${WLS_RESP:-wls.rsp} \
     ORAINST=${ORAINST:-oraInst.loc} \
-    OTMPDIR=${OTMPDIR:-/tmp/delme} \
     OPATCH_NO_FUSER=true \
     PATCHDIR=${PATCHDIR:-patches}
 
 # Install base WLS
 COPY --from=JDK_BUILD --chown={{userid}}:{{groupid}} {{java_home}} {{java_home}}/
-COPY --chown={{userid}}:{{groupid}} $WLS_PKG $WLS_RESP $OTMPDIR/
+COPY --chown={{userid}}:{{groupid}} $WLS_PKG $WLS_RESP {{tempDir}}/
 COPY --chown={{userid}}:{{groupid}} $ORAINST $INV_LOC/
 {{#isOpatchPatchingEnabled}}
-COPY --chown=oracle:oracle p28186730_139400_Generic.zip $OTMPDIR/opatch/
+COPY --chown=oracle:oracle p28186730_139400_Generic.zip {{tempDir}}/opatch/
 {{/isOpatchPatchingEnabled}}
 {{#isPatchingEnabled}}
-COPY --chown=oracle:oracle $PATCHDIR/* $OTMPDIR/patches/
+COPY --chown=oracle:oracle $PATCHDIR/* {{tempDir}}/patches/
 {{/isPatchingEnabled}}
 
 USER {{userid}}
 
-RUN unzip $OTMPDIR/$WLS_PKG -d $OTMPDIR \
- && {{java_home}}/bin/java -Xmx1024m -jar $OTMPDIR/fmw_*.jar -silent ORACLE_HOME=$ORACLE_HOME \
-    -responseFile $OTMPDIR/$WLS_RESP -invPtrLoc $INV_LOC/$ORAINST -ignoreSysPrereqs -force -novalidation \
+RUN unzip {{tempDir}}/$WLS_PKG -d {{tempDir}} \
+ && {{java_home}}/bin/java -Xmx1024m -jar {{tempDir}}/fmw_*.jar -silent ORACLE_HOME=$ORACLE_HOME \
+    -responseFile {{tempDir}}/$WLS_RESP -invPtrLoc $INV_LOC/$ORAINST -ignoreSysPrereqs -force -novalidation \
 {{#isOpatchPatchingEnabled}}
- && cd $OTMPDIR/opatch \
- && {{java_home}}/bin/jar -xf $OTMPDIR/opatch/p28186730_139400_Generic.zip \
- && {{java_home}}/bin/java -jar $OTMPDIR/opatch/6880880/opatch_generic.jar -silent -ignoreSysPrereqs -force -novalidation oracle_home=$ORACLE_HOME \
+ && cd {{tempDir}}/opatch \
+ && {{java_home}}/bin/jar -xf {{tempDir}}/opatch/p28186730_139400_Generic.zip \
+ && {{java_home}}/bin/java -jar {{tempDir}}/opatch/6880880/opatch_generic.jar -silent -ignoreSysPrereqs -force -novalidation oracle_home=$ORACLE_HOME \
 {{/isOpatchPatchingEnabled}}
 {{#isPatchingEnabled}}
- && $ORACLE_HOME/OPatch/opatch napply -silent -oh $ORACLE_HOME -phBaseDir $OTMPDIR/patches \
+ && $ORACLE_HOME/OPatch/opatch napply -silent -oh $ORACLE_HOME -phBaseDir {{tempDir}}/patches \
  && $ORACLE_HOME/OPatch/opatch util cleanup -silent -oh $ORACLE_HOME \
 {{/isPatchingEnabled}}
- && rm -rf {{java_home}} $OTMPDIR
+ && rm -rf {{java_home}} {{tempDir}}
 
 {{#isWdtEnabled}}
 FROM OS_UPDATE as WDT_BUILD
@@ -133,7 +129,6 @@ ENV WDT_PKG=${WDT_PKG:-weblogic-deploy.zip} \
     PROPERTIES_FILE_DIR=$ORACLE_HOME/properties \
     WDT_HOME=${WDT_HOME:-/u01/app/weblogic-deploy} \
     SCRIPTS_DIR=${SCRIPTS_DIR:-scripts} \
-    OTMPDIR=${OTMPDIR:-/tmp/delme} \
     RCU_RUN_FLAG=${RCU_RUN_FLAG:-}
 
 # DO NOT COMBINE THESE BLOCKS. It won't work when formatting variables like DOMAIN_HOME
@@ -142,16 +137,16 @@ ENV DOMAIN_HOME=${DOMAIN_HOME:-/u01/domains/base_domain} \
 
 COPY --from=JDK_BUILD --chown={{userid}}:{{groupid}} {{java_home}} {{java_home}}/
 COPY --from=WLS_BUILD --chown={{userid}}:{{groupid}} $ORACLE_HOME $ORACLE_HOME/
-COPY --chown={{userid}}:{{groupid}} ${WDT_PKG} ${WDT_MODEL} ${WDT_ARCHIVE} ${WDT_VARIABLE} ${OTMPDIR}/
+COPY --chown={{userid}}:{{groupid}} ${WDT_PKG} ${WDT_MODEL} ${WDT_ARCHIVE} ${WDT_VARIABLE} {{tempDir}}/
 
 USER {{userid}}
 
-RUN unzip $OTMPDIR/$WDT_PKG -d $(dirname $WDT_HOME) \
+RUN unzip {{tempDir}}/$WDT_PKG -d $(dirname $WDT_HOME) \
  && mkdir -p $(dirname ${DOMAIN_HOME}) \
  && mkdir -p ${PROPERTIES_FILE_DIR} \
- && if [ -n "$WDT_MODEL" ]; then MODEL_OPT="-model_file ${OTMPDIR}/${WDT_MODEL##*/}"; fi \
- && if [ -n "$WDT_ARCHIVE" ]; then ARCHIVE_OPT="-archive_file ${OTMPDIR}/${WDT_ARCHIVE##*/}"; fi \
- && if [ -n "$WDT_VARIABLE" ]; then VARIABLE_OPT="-variable_file ${OTMPDIR}/${WDT_VARIABLE##*/}"; fi \
+ && if [ -n "$WDT_MODEL" ]; then MODEL_OPT="-model_file {{tempDir}}/${WDT_MODEL##*/}"; fi \
+ && if [ -n "$WDT_ARCHIVE" ]; then ARCHIVE_OPT="-archive_file {{tempDir}}/${WDT_ARCHIVE##*/}"; fi \
+ && if [ -n "$WDT_VARIABLE" ]; then VARIABLE_OPT="-variable_file {{tempDir}}/${WDT_VARIABLE##*/}"; fi \
  && if [ -n "${RCU_RUN_FLAG}" ]; then RCU_RUN_OPT="-run_rcu"; fi \
  && cd ${WDT_HOME}/bin \
  && ${WDT_HOME}/bin/createDomain.sh \
@@ -163,7 +158,7 @@ RUN unzip $OTMPDIR/$WDT_PKG -d $(dirname $WDT_HOME) \
  $VARIABLE_OPT \
  $MODEL_OPT \
  $ARCHIVE_OPT \
- && rm -rf {{java_home}} ${ORACLE_HOME} ${WDT_HOME} $OTMPDIR
+ && rm -rf {{java_home}} ${ORACLE_HOME} ${WDT_HOME} {{tempDir}}
 {{/isWdtEnabled}}
 
 FROM {{baseImage}} as FINAL_BUILD
@@ -198,8 +193,8 @@ ENV DOMAIN_HOME=${DOMAIN_HOME:-/u01/domains/base_domain} \
     PATH=$PATH:{{java_home}}/bin:${ORACLE_HOME}/oracle_common/common/bin:${ORACLE_HOME}/wlserver/common/bin:${DOMAIN_HOME}/bin:${ORACLE_HOME}
 
 ## Create user and group
-RUN if [ -z "$(getent group {{groupid}})" ]; then hash groupadd &> /dev/null && groupadd -g 1000 {{groupid}} || exit -1 ; fi \
- && if [ -z "$(getent passwd {{userid}})" ]; then hash useradd &> /dev/null && useradd -u 1100 -g {{groupid}} {{userid}} || exit -1; fi \
+RUN if [ -z "$(getent group {{groupid}})" ]; then hash groupadd &> /dev/null && groupadd {{groupid}} || exit -1 ; fi \
+ && if [ -z "$(getent passwd {{userid}})" ]; then hash useradd &> /dev/null && useradd -g {{groupid}} {{userid}} || exit -1; fi \
  && mkdir -p $(dirname {{java_home}}) $(dirname $ORACLE_HOME) $(dirname $DOMAIN_HOME) \
  && chown {{userid}}:{{groupid}} $(dirname {{java_home}}) $(dirname $ORACLE_HOME) $(dirname $DOMAIN_HOME)
 
diff --git a/imagetool/src/main/resources/docker-files/Update_Image.mustache b/imagetool/src/main/resources/docker-files/Update_Image.mustache
@@ -9,26 +9,24 @@ FROM {{baseImage}} as OS_UPDATE
 USER root
 
 ARG PATCHDIR
-ARG OTMPDIR
 
 ENV PATCHDIR=${PATCHDIR:-patches} \
-    OTMPDIR=${OTMPDIR:-/tmp/delme} \
     OPATCH_NO_FUSER=true
 
-USER oracle
+USER {{userid}}
 
 {{#isOpatchPatchingEnabled}}
-COPY --chown=oracle:oracle p28186730_139400_Generic.zip $OTMPDIR/opatch/
-RUN cd $OTMPDIR/opatch \
- && $JAVA_HOME/bin/jar -xf $OTMPDIR/opatch/p28186730_139400_Generic.zip \
- && $JAVA_HOME/bin/java -jar $OTMPDIR/opatch/6880880/opatch_generic.jar -silent -ignoreSysPrereqs -force -novalidation oracle_home=$ORACLE_HOME \
- && rm -rf $OTMPDIR
+COPY --chown={{userid}}:{{groupid}} p28186730_139400_Generic.zip {{tempDir}}/opatch/
+RUN cd {{tempDir}}/opatch \
+ && $JAVA_HOME/bin/jar -xf {{tempDir}}/opatch/p28186730_139400_Generic.zip \
+ && $JAVA_HOME/bin/java -jar {{tempDir}}/opatch/6880880/opatch_generic.jar -silent -ignoreSysPrereqs -force -novalidation oracle_home=$ORACLE_HOME \
+ && rm -rf {{tempDir}}
 {{/isOpatchPatchingEnabled}}
 
 {{#isPatchingEnabled}}
-COPY --chown=oracle:oracle $PATCHDIR/* $OTMPDIR/patches/
+COPY --chown={{userid}}:{{groupid}} $PATCHDIR/* {{tempDir}}/patches/
 
-RUN $ORACLE_HOME/OPatch/opatch napply -silent -oh $ORACLE_HOME -phBaseDir $OTMPDIR/patches \
+RUN $ORACLE_HOME/OPatch/opatch napply -silent -oh $ORACLE_HOME -phBaseDir {{tempDir}}/patches \
  && $ORACLE_HOME/OPatch/opatch util cleanup -silent -oh $ORACLE_HOME \
- && rm -rf $OTMPDIR
+ && rm -rf {{tempDir}}
 {{/isPatchingEnabled}}
