Remove "su" command and move common commands to the head of the file

Author: mriccell

OracleWebLogic/dockerfiles/12.2.1.1/Dockerfile.generic

@@ -33,45 +33,48 @@ FROM oracle/serverjre:8
 # ----------
 MAINTAINER Monica Riccelli <[email protected]>
 
-# WLS Configuration (editable during build time)
-# ------------------------------
-ARG ADMIN_PASSWORD
-
-
-# Environment variables required for this build (do NOT change)
-# -------------------------------------------------------------
-ENV FMW_PKG=fmw_12.2.1.1.0_wls_Disk1_1of1.zip \
-    FMW_JAR=fmw_12.2.1.1.0_wls.jar \
-    SCRIPT_FILE=/u01/oracle/createAndStartEmptyDomain.sh \
+# Common environment variables required for this build (do NOT change)
+# --------------------------------------------------------------------
+ENV SCRIPT_FILE=/u01/oracle/createAndStartEmptyDomain.sh \
     ORACLE_HOME=/u01/oracle \
     USER_MEM_ARGS="-Djava.security.egd=file:/dev/./urandom" \
     DEBUG_FLAG=true \
     PRODUCTION_MODE=dev \
     DOMAIN_NAME="${DOMAIN_NAME:-base_domain}" \
     DOMAIN_HOME=/u01/oracle/user_projects/domains/${DOMAIN_NAME:-base_domain} \
-    ADMIN_PORT="${ADMIN_PORT:-8001}" \
+    ADMIN_PORT="${ADMIN_PORT:-7001}" \
     PATH=$PATH:/usr/java/default/bin:/u01/oracle/oracle_common/common/bin:/u01/oracle/wlserver/common/bin
-
-# Copy packages
-# -------------
-COPY $FMW_PKG install.file oraInst.loc /u01/
+    
+# Copy scripts
+#-------------
 COPY container-scripts/createAndStartEmptyDomain.sh container-scripts/create-wls-domain.py /u01/oracle/
 
 # Setup filesystem and oracle user
-# Install and configure Oracle JDK
 # Adjust file permissions, go to /u01 as user 'oracle' to proceed with WLS installation
-# ------------------------------------------------------------
+# ------------------------------------------------------------  
 RUN chmod a+xr /u01 && \
     chmod +xr $SCRIPT_FILE && \
     useradd -b /u01 -M -s /bin/bash oracle && \
     chown oracle:oracle -R /u01 && \
-    echo oracle:oracle | chpasswd && \
-    yum -y install util-linux && yum clean all && \
-    cd /u01 && $JAVA_HOME/bin/jar xf /u01/$FMW_PKG && cd - && \
-    su -c "$JAVA_HOME/bin/java -jar /u01/$FMW_JAR -silent -responseFile /u01/install.file -invPtrLoc /u01/oraInst.loc -jreLoc $JAVA_HOME -ignoreSysPrereqs -force -novalidation ORACLE_HOME=$ORACLE_HOME INSTALL_TYPE=\"WebLogic Server\"" - oracle && \
+    echo oracle:oracle | chpasswd 
+
+# Environment variables required for this build (do NOT change)
+# -------------------------------------------------------------
+ENV FMW_PKG=fmw_12.2.1.1.0_wls_Disk1_1of1.zip \
+    FMW_JAR=fmw_12.2.1.1.0_wls.jar 
+    
+# Copy packages
+# -------------
+COPY $FMW_PKG install.file oraInst.loc /u01/
+
+# Install 
+# ------------------------------------------------------------
+USER oracle    
+RUN cd /u01 && $JAVA_HOME/bin/jar xf /u01/$FMW_PKG && cd - && \
+    $JAVA_HOME/bin/java -jar /u01/$FMW_JAR -invPtrLoc /u01/oraInst.loc -jreLoc $JAVA_HOME -ignoreSysPrereqs -force -novalidation ORACLE_HOME=$ORACLE_HOME && \
     rm /u01/$FMW_JAR /u01/$FMW_PKG /u01/oraInst.loc /u01/install.file
 
-WORKDIR ${ORACLE_HOME}
+WORKDIR ${ORACLE_HOME} 
 
 # Define default command to start script. 
 CMD ["/u01/oracle/createAndStartEmptyDomain.sh"]