changed OH default location and cleanup

gosurya-oracle · jshum2479 · commit 3b6121ef8586 · 2019-05-02T21:16:38.000Z
diff --git a/src/main/java/com/oracle/weblogicx/imagebuilder/cli/CLIDriver.java b/src/main/java/com/oracle/weblogicx/imagebuilder/cli/CLIDriver.java
@@ -47,11 +47,7 @@ public static void main(String[] args) {
             CommandLine.usage(cliDriver, System.out);
             System.exit(-1);
         } else {
-            //List<String> argsList = Stream.of(args).collect(Collectors.toList());
-            //argsList.add("--cli");
-            //CommandResponse response = WLSCommandLine.call(cliDriver, argsList.toArray(new String[0]));
             CommandResponse response = WLSCommandLine.call(cliDriver, true, args);
-
             if (response != null) {
                 if (response.getStatus() != 0) {
                     String message = String.format("Response code: %d, message: %s", response.getStatus(),
diff --git a/src/main/java/com/oracle/weblogicx/imagebuilder/util/XPathUtil.java b/src/main/java/com/oracle/weblogicx/imagebuilder/util/XPathUtil.java
@@ -26,28 +26,6 @@ public class XPathUtil {
 
     private static final Logger logger = Logger.getLogger(XPathUtil.class.getName());
 
-
-    //    /**
-//     * Apply XPath and return the results as nodelist
-//     *
-//     * @param doc  dom document
-//     * @param expression xpath expression
-//     * @return nodelist result
-//     * @throws XPathExpressionException when xpath failed
-//     */
-//    public static NodeList applyXPathReturnNodeList(Document doc, String expression) throws XPathExpressionException {
-//
-//        XPathFactory factory = XPathFactory.newInstance();
-//
-//        XPath xpath = factory.newXPath();
-//
-//        NodeList nodeList;
-//
-//        nodeList = (NodeList) xpath.evaluate(expression, doc, XPathConstants.NODESET);
-//        return nodeList;
-//
-//    }
-
     /**
      * Apply XPath and return the results as nodelist
      *
diff --git a/src/main/resources/docker-files/Dockerfile.create b/src/main/resources/docker-files/Dockerfile.create
@@ -10,10 +10,10 @@ USER root
 
 ARG JAVA_PKG
 ARG WLS_PKG
-ARG JAVA_HOME
+ARG JAVA_HOME=/u01/jdk
 ARG INV_LOC
 ARG WLS_RESP
-ARG ORACLE_HOME
+ARG ORACLE_HOME=/u01/oracle
 ARG ORAINST
 ARG OTMPDIR
 ARG PATCHDIR
@@ -22,58 +22,48 @@ ARG PATCHDIR
 ENV JAVA_PKG=${JAVA_PKG:-server-jre-*-linux-x64.tar.gz} \
     WLS_PKG=${WLS_PKG:-fmw_12.2.1.3.0_wls_Disk1_1of1.zip} \
     JAVA_HOME=${JAVA_HOME:-/u01/jdk} \
-    INV_LOC=${INV_LOC:-/u01/app/oraInventory} \
+    ORACLE_HOME=${ORACLE_HOME:-/u01/oracle} \
+    INV_LOC=${INV_LOC:-/u01/oracle/oraInventory} \
     WLS_RESP=${WLS_RESP:-wls.rsp} \
-    ORACLE_HOME=${ORACLE_HOME:-/u01/app/oracle/middleware} \
     ORAINST=${ORAINST:-oraInst.loc} \
     OTMPDIR=${OTMPDIR:-/tmp/delme} \
     OPATCH_NO_FUSER=true \
     PATCHDIR=${PATCHDIR:-patches}
 
 # PLACEHOLDER FOR %%WDT_ENV%% #
 
-RUN mkdir -p $OTMPDIR
-
 # PLACEHOLDER FOR %%PKG_INSTALL%% #
 
 #RUN if [ -z "$(getent group oracle)" ]; then hash groupadd &> /dev/null && groupadd -g 1000 oracle || addgroup -g 1000 oracle ; fi \
 # && if [ -z "$(getent passwd oracle)" ]; then hash useradd &> /dev/null && useradd -u 1100 -g oracle oracle || adduser -D -u 1100 -G oracle oracle; fi \
 
 ## Create oracle user
 RUN if [ -z "$(getent group oracle)" ]; then hash groupadd &> /dev/null && groupadd -g 1000 oracle || exit -1 ; fi \
- && if [ -z "$(getent passwd oracle)" ]; then hash useradd &> /dev/null && useradd -u 1100 -g oracle oracle || exit -1; fi \
- && mkdir -p $ORACLE_HOME \
- && mkdir -p $INV_LOC \
- && chown -R oracle:oracle /u01/ \
- && chown -R oracle:oracle $OTMPDIR/
+ && if [ -z "$(getent passwd oracle)" ]; then hash useradd &> /dev/null && useradd -u 1100 -g oracle oracle || exit -1; fi
+# && mkdir -p $ORACLE_HOME \
+# && mkdir -p $INV_LOC \
+# && chown -R oracle:oracle /u01/ \
+# && chown -R oracle:oracle $OTMPDIR/
 
 USER oracle
 
 # Install base WLS
 COPY --chown=oracle:oracle $JAVA_PKG $WLS_PKG $WLS_RESP $OTMPDIR/
-COPY --chown=oracle:oracle  $ORAINST $INV_LOC
+COPY --chown=oracle:oracle $ORAINST $INV_LOC/
 
 RUN tar xzvf $OTMPDIR/$JAVA_PKG -C /u01 \
  && mv /u01/jdk* $JAVA_HOME \
  && 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 -novalidation
+    -responseFile $OTMPDIR/$WLS_RESP -invPtrLoc $INV_LOC/$ORAINST -novalidation \
+ && rm -rf $OTMPDIR
 
 # PLACEHOLDER FOR %%OPATCH_1394%% #
 
 # PLACEHOLDER FOR %%PATCH_APPLY%% #
 
 # PLACEHOLDER FOR %%WDT_INSTALL%% #
 
-# PLACEHOLDER FOR %%PATCH_CLEANUP%% #
-
-# PLACEHOLDER FOR %%WDT_CLEANUP%% #
-
-RUN rm -rf $OTMPDIR
-
-RUN unset JAVA_PKG WLS_PKG JAVA_HOME INV_LOC WLS_RESP ORAINST OTMPDIR PATCHDIR
-
 # PLACEHOLDER FOR %%WDT_CMD%% #
 
-#ENTRYPOINT /bin/bash
 
diff --git a/src/main/resources/docker-files/Dockerfile.ph b/src/main/resources/docker-files/Dockerfile.ph
@@ -33,7 +33,7 @@ ENV WDT_PKG=${WDT_PKG:-weblogic-deploy.zip} \
     WDT_MODEL=${WDT_MODEL:-} \
     WLSDEPLOY_PROPERTIES="-Djava.security.egd=file:/dev/./urandom" \
     DOMAIN_TYPE=${DOMAIN_TYPE:-WLS} \
-    DOMAIN_PARENT=${DOMAIN_PARENT:-${ORACLE_HOME}/user_projects/domains} \
+    DOMAIN_PARENT=${DOMAIN_PARENT:-/u01/domains} \
     DOMAIN_NAME=${DOMAIN_NAME:-base_domain} \
     WDT_ARCHIVE=${WDT_ARCHIVE:-} \
     WDT_VARIABLE=${WDT_VARIABLE:-} \
@@ -55,10 +55,8 @@ COPY --chown=oracle:oracle ${WDT_PKG} ${WDT_MODEL} ${WDT_ARCHIVE} ${WDT_VARIABLE
 COPY --chown=oracle:oracle ${SCRIPTS_DIR}/*.sh ${SCRIPT_HOME}/
 
 RUN unzip $OTMPDIR/$WDT_PKG -d $(dirname $WDT_HOME) \
- && chmod a+x $SCRIPT_HOME/*.sh
-
-#WORKDIR $ORACLE_HOME
-RUN mkdir -p $(dirname ${DOMAIN_HOME}) \
+ && chmod a+x $SCRIPT_HOME/*.sh \
+ && 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 \
@@ -74,14 +72,11 @@ RUN mkdir -p $(dirname ${DOMAIN_HOME}) \
  $VARIABLE_OPT \
  $MODEL_OPT \
  $ARCHIVE_OPT \
- && chmod -R a+x ${DOMAIN_HOME}/bin/*.sh
+ && chmod -R a+x ${DOMAIN_HOME}/bin/*.sh \
+ && rm -rf ${WDT_HOME} $OTMPDIR
 
 # END %%WDT_INSTALL%% #
 
-# START %%WDT_CLEANUP%% #
-RUN rm -rf ${WDT_HOME}
-# END %%WDT_CLEANUP%% #
-
 # START %%WDT_CMD%% #
 # Expose admin server, managed server port
 EXPOSE $ADMIN_PORT $MANAGED_SERVER_PORT
@@ -90,28 +85,23 @@ CMD ["sh", "-c", "${SCRIPT_HOME}/startAdminServer.sh"]
 # END %%WDT_CMD%% #
 
 # START %%OPATCH_1394%% #
-RUN mkdir -p $OTMPDIR/opatch
 COPY --chown=oracle:oracle p28186730_139400_Generic.zip $OTMPDIR/opatch/
 
 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
+ && $JAVA_HOME/bin/java -jar $OTMPDIR/opatch/6880880/opatch_generic.jar -silent oracle_home=$ORACLE_HOME \
+ && rm -rf $OTMPDIR
 
 # END %%OPATCH_1394%% #
 
 # START %%PATCH_APPLY%% #
-RUN mkdir -p $OTMPDIR/patches
-
 COPY --chown=oracle:oracle $PATCHDIR/* $OTMPDIR/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 $OTMPDIR/patches \
+ && $ORACLE_HOME/OPatch/opatch util cleanup -silent -oh $ORACLE_HOME \
+ && rm -rf $OTMPDIR
 # END %%PATCH_APPLY%% #
 
-# START %%PATCH_CLEANUP%% #
-RUN $ORACLE_HOME/OPatch/opatch util cleanup -silent -oh $ORACLE_HOME
-# END %%PATCH_CLEANUP%% #
-
 # START %%PKG_INSTALL%%_YUM #
 # install necessary packages
 RUN yum -y update \
diff --git a/src/main/resources/docker-files/Dockerfile.update b/src/main/resources/docker-files/Dockerfile.update
@@ -27,15 +27,6 @@ USER oracle
 
 # PLACEHOLDER FOR %%PATCH_APPLY%% #
 
-# Prep for patches and install latest opatch
-#RUN mkdir -p $OTMPDIR/patches \
-# && mkdir -p $OTMPDIR/opatch \
-# && chown oracle:oinstall $OTMPDIR/
-#
-#COPY --chown=oracle:oinstall $PATCHDIR/* ${OTMPDIR}/patches/
-#
-#RUN $ORACLE_HOME/OPatch/opatch napply -silent -oh $ORACLE_HOME -phBaseDir $OTMPDIR/patches
-
 # PLACEHOLDER FOR %%PATCH_CLEANUP%% #
 
 RUN rm -rf $OTMPDIR
diff --git a/src/main/resources/probe-env/test-create-env.sh b/src/main/resources/probe-env/test-create-env.sh
@@ -20,24 +20,3 @@ if [[ ! -z "$ORACLE_HOME" ]]; then
     echo WLS_VERSION=$($JAVA_HOME/bin/java -cp $ORACLE_HOME/wlserver/server/lib/weblogic.jar weblogic.version 2> /dev/null | grep -oE -m 1 '([[:digit:]\.]+)' | head -1)
   fi
 fi
-
-#if [[ -f /etc/os-release ]]; then
-#  echo OS_ID=$(cat /etc/os-release | grep -oP '^ID=[\"]?\K\w+(?=[\"]?)')
-#  echo OS_VERSION_ID=$(cat /etc/os-release | grep -oP '^VERSION_ID=[\"]?\K[\d\.]+(?=[\"]?)')
-#fi
-#
-#if [[ ! -z "$ORACLE_HOME" ]]; then
-#  echo ORACLE_HOME="$ORACLE_HOME"
-#  WLS_TYPE=$(cat $ORACLE_HOME/inventory/registry.xml 2> /dev/null | grep -q 'WebLogic Server for FMW' && printf "fmw")
-#  if [[ ! -z "$WLS_TYPE" ]]; then
-#    echo WLS_TYPE="$WLS_TYPE"
-#  fi
-#  if [[ ! -z "$JAVA_HOME" ]]; then
-#    echo WLS_VERSION=$($JAVA_HOME/bin/java -cp $ORACLE_HOME/wlserver/server/lib/weblogic.jar weblogic.version 2> /dev/null | grep -oP 'WebLogic Server \K[\d\.]+\s+')
-#  fi
-#fi
-
-#echo WLS_TYPE=$(cat $ORACLE_HOME/inventory/registry.xml 2> /dev/null | perl -ne '/WebLogic Server for FMW/ && print "fmw"')
-#echo WLS_VERSION=$($JAVA_HOME/bin/java -cp $ORACLE_HOME/wlserver/server/lib/weblogic.jar weblogic.version 2> /dev/null | perl -ne '/\s+([\d\.]+)\s+/ && print $1')
-#echo OS_ID=$(cat /etc/os-release 2> /dev/null | perl -ne '/^ID=\"(\S+)\"$/ && print $1')
-#echo OS_VERSION_ID=$(cat /etc/os-release 2> /dev/null | perl -ne '/^VERSION_ID=\"(\S+)\"$/ && print $1')
diff --git a/src/main/resources/probe-env/test-update-env.sh b/src/main/resources/probe-env/test-update-env.sh
@@ -25,29 +25,3 @@ if [[ ! -z "$ORACLE_HOME" ]]; then
     echo "$LSINV_TEXT" > /tmp_scripts/opatch-lsinventory.txt 2> /dev/null
   fi
 fi
-
-#if [[ -f /etc/os-release ]]; then
-#  echo OS_ID=$(cat /etc/os-release | grep -oP '^ID=\"\K\w+(?=\")')
-#  echo OS_VERSION_ID=$(cat /etc/os-release | grep -oP '^VERSION_ID=\"\K[\d\.]+(?=\")')
-#fi
-#
-#if [[ ! -z "$ORACLE_HOME" ]]; then
-#  echo ORACLE_HOME="$ORACLE_HOME"
-#  WLS_TYPE=$(cat $ORACLE_HOME/inventory/registry.xml 2> /dev/null | grep -q 'WebLogic Server for FMW' && printf "fmw")
-#  if [[ ! -z "$WLS_TYPE" ]]; then
-#    echo WLS_TYPE="$WLS_TYPE"
-#  fi
-#  if [[ ! -z "$JAVA_HOME" ]]; then
-#    echo WLS_VERSION=$($JAVA_HOME/bin/java -cp $ORACLE_HOME/wlserver/server/lib/weblogic.jar weblogic.version 2> /dev/null | grep -oP 'WebLogic Server \K[\d\.]+\s+')
-#  fi
-#  echo OPATCH_VERSION=$($ORACLE_HOME/OPatch/opatch version 2> /dev/null | grep -oP '\s+\K[\d\.]+$')
-#  $ORACLE_HOME/OPatch/opatch lsinventory > /tmp_scripts/opatch-lsinventory.xml 2>&1
-#fi
-
-#echo ORACLE_HOME=$ORACLE_HOME
-#echo WLS_TYPE=$(cat $ORACLE_HOME/inventory/registry.xml 2> /dev/null | perl -ne '/WebLogic Server for FMW/ && print "fmw"')
-#echo WLS_VERSION=$($JAVA_HOME/bin/java -cp $ORACLE_HOME/wlserver/server/lib/weblogic.jar weblogic.version 2> /dev/null | perl -ne '/\s+([\d\.]+)\s+/ && print $1')
-#echo OPATCH_VERSION=$($ORACLE_HOME/OPatch/opatch version 2> /dev/null | perl -n -e'/\s+([\d\.]+)\s+/ && print $1')
-#echo OS_ID=$(cat /etc/os-release 2> /dev/null | perl -ne '/^ID=\"(\S+)\"$/ && print $1')
-#echo OS_VERSION_ID=$(cat /etc/os-release 2> /dev/null | perl -ne '/^VERSION_ID=\"(\S+)\"$/ && print $1')
-#$ORACLE_HOME/OPatch/opatch lsinventory > /tmp_scripts/opatch-lsinventory.xml 2>&1
