moved package manager detection into environment probe (#196)

* moved package manager detection into environment probe

* add DNF and microDNF to rebase template

* temporary change to install useradd and groupadd to the 8-slim image until the Linux team adds it back

Author: ddsharpe

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

@@ -351,16 +351,17 @@ public void copyOptionsFromImage(String fromImage, String tmpDir)
                 logger.info("IMG-0000", existingJavaHome);
             }
 
-            String osProperty = baseImageProperties.getProperty("ID", "ol");
-            PackageManagerType pkgMgr = PackageManagerType.fromOperatingSystem(osProperty);
-            logger.fine("fromImage is {0}, using package manager {1}", osProperty, pkgMgr);
+            String pkgMgrProp = baseImageProperties.getProperty("PACKAGE_MANAGER", "YUM");
+
+            PackageManagerType pkgMgr = PackageManagerType.valueOf(pkgMgrProp);
+            logger.fine("fromImage package manager {0}", pkgMgr);
             if (packageManager != PackageManagerType.OS_DEFAULT && pkgMgr != packageManager) {
                 logger.info("IMG-0079", pkgMgr, packageManager);
                 pkgMgr = packageManager;
             }
             dockerfileOptions.setPackageInstaller(pkgMgr);
         } else if (packageManager == PackageManagerType.OS_DEFAULT) {
-            // Default OS is Oracle Linux, so default package manager is YUM
+            // Default OS is Oracle Linux 7-slim, so default package manager is YUM
             dockerfileOptions.setPackageInstaller(PackageManagerType.YUM);
         } else {
             dockerfileOptions.setPackageInstaller(packageManager);

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

@@ -7,34 +7,10 @@ public enum PackageManagerType {
     OS_DEFAULT,
     NONE,
     YUM,
+    DNF,
+    MICRODNF,
     APTGET,
     APK,
     ZYPPER;
 
-    /**
-     * Returns the package manager that should be used to install software on a given Linux OS.
-     * Defaults to YUM.  Known OS's include: ubuntu, debian, opensuse, centos, ol (Oracle Linux), and rhel.
-     *
-     * @param osID identifier for the OS, like ubuntu, debian, rhel, ol, ...
-     * @return the package manager
-     */
-    public static PackageManagerType fromOperatingSystem(String osID) {
-        if (osID == null) {
-            return YUM;
-        }
-
-        osID = osID.replaceAll("[\"]", "");
-        switch (osID) {
-            case "ubuntu":
-            case "debian":
-                return APTGET;
-            case "opensuse":
-                return ZYPPER;
-            case "centos":
-            case "ol":
-            case "rhel":
-            default:
-                return YUM;
-        }
-    }
 }

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

@@ -257,6 +257,16 @@ public boolean useYum() {
         return pkgMgr == PackageManagerType.YUM;
     }
 
+    @SuppressWarnings("unused")
+    public boolean useMicroDnf() {
+        return pkgMgr == PackageManagerType.MICRODNF;
+    }
+
+    @SuppressWarnings("unused")
+    public boolean useDnf() {
+        return pkgMgr == PackageManagerType.DNF;
+    }
+
     @SuppressWarnings("unused")
     public boolean useAptGet() {
         return pkgMgr == PackageManagerType.APTGET;

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

@@ -14,6 +14,14 @@ RUN yum -y --downloaddir={{{tempDir}}} install gzip tar unzip libaio \
  && rm -rf /var/cache/yum/* \
  && rm -rf {{{tempDir}}}
 {{/useYum}}
+{{#useDnf}}
+RUN dnf -y install gzip tar unzip libaio \
+ && dnf clean all
+{{/useDnf}}
+{{#useMicroDnf}}
+RUN microdnf install gzip tar unzip libaio shadow-utils \
+ && microdnf clean all
+{{/useMicroDnf}}
 {{#useAptGet}}
 RUN apt-get -y update \
  && apt-get -y upgrade \

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

@@ -36,6 +36,14 @@ LABEL com.oracle.weblogic.imagetool.buildid="{{buildId}}"
         && rm -rf /var/cache/yum/* \
         && rm -rf {{{tempDir}}}
     {{/useYum}}
+    {{#useDnf}}
+        RUN dnf -y install gzip tar unzip libaio \
+        && dnf clean all
+    {{/useDnf}}
+    {{#useMicroDnf}}
+        RUN microdnf install gzip tar unzip libaio shadow-utils \
+        && microdnf clean all
+    {{/useMicroDnf}}
     {{#useAptGet}}
         RUN apt-get -y update \
         && apt-get -y upgrade \

imagetool/src/main/resources/probe-env/test-create-env.sh

@@ -10,6 +10,20 @@ if [[ -f /etc/os-release ]]; then
   cat /etc/os-release | grep -oE '^VERSION_ID=[\"]?[[:digit:]\.]+[\"]?'
 fi
 
+if command -v dnf &> /dev/null; then
+  echo PACKAGE_MANAGER=DNF
+elif command -v yum &> /dev/null; then
+  echo PACKAGE_MANAGER=YUM
+elif command -v microdnf &> /dev/null; then
+  echo PACKAGE_MANAGER=MICRODNF
+elif command -v apt-get &> /dev/null; then
+  echo PACKAGE_MANAGER=APTGET
+elif command -v apk &> /dev/null; then
+  echo PACKAGE_MANAGER=APK
+elif command -v zypper &> /dev/null; then
+  echo PACKAGE_MANAGER=ZYPPER
+fi
+
 if [[ -n "$JAVA_HOME" ]]; then
   echo JAVA_HOME="$JAVA_HOME"
 fi

imagetool/src/main/resources/probe-env/test-update-env.sh

@@ -10,6 +10,20 @@ if [[ -f /etc/os-release ]]; then
   cat /etc/os-release | grep -oE '^VERSION_ID=[\"]?[[:digit:]\.]+[\"]?'
 fi
 
+if command -v dnf &> /dev/null; then
+  echo PACKAGE_MANAGER=DNF
+elif command -v yum &> /dev/null; then
+  echo PACKAGE_MANAGER=YUM
+elif command -v microdnf &> /dev/null; then
+  echo PACKAGE_MANAGER=MICRODNF
+elif command -v apt-get &> /dev/null; then
+  echo PACKAGE_MANAGER=APTGET
+elif command -v apk &> /dev/null; then
+  echo PACKAGE_MANAGER=APK
+elif command -v zypper &> /dev/null; then
+  echo PACKAGE_MANAGER=ZYPPER
+fi
+
 if [[ -n "$JAVA_HOME" ]]; then
   echo JAVA_HOME="$JAVA_HOME"
   echo JAVA_PATH="$(readlink -f $JAVA_HOME)"