added support for adding additional OS packages to AdditionalBuildCommands (#217)

Author: ddsharpe

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

@@ -21,6 +21,7 @@
 public class AdditionalBuildCommands {
     private static final LoggingFacade logger = LoggingFactory.getLogger(AdditionalBuildCommands.class);
 
+    public static final String PACKAGES = "package-manager-packages";
     public static final String BEFORE_JDK = "before-jdk-install";
     public static final String AFTER_JDK = "after-jdk-install";
     public static final String BEFORE_FMW = "before-fmw-install";
@@ -34,6 +35,7 @@ public class AdditionalBuildCommands {
 
     private AdditionalBuildCommands() {
         sections = new ArrayList<>();
+        sections.add(getPattern(PACKAGES));
         sections.add(getPattern(BEFORE_JDK));
         sections.add(getPattern(AFTER_JDK));
         sections.add(getPattern(BEFORE_FMW));

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

@@ -786,6 +786,16 @@ private List<String> getAdditionalCommandsForSection(String sectionName) {
         return additionalBuildCommands.get(sectionName);
     }
 
+    /**
+     * Referenced by Dockerfile template, provides additional OS packages supplied by the user.
+     *
+     * @return list of commands as Strings.
+     */
+    @SuppressWarnings("unused")
+    public List<String> osPackages() {
+        return getAdditionalCommandsForSection(AdditionalBuildCommands.PACKAGES);
+    }
+
     /**
      * Referenced by Dockerfile template, provides additional build commands supplied by the user.
      *

imagetool/src/main/resources/ImageTool.properties

@@ -46,7 +46,7 @@ IMG-0044=Invalid arguments. Both --key and --path are required parameters, and c
 IMG-0045=Invalid argument. The value for --key should correspond to a valid entry in the cache.
 IMG-0046=Deleted all entries from cache
 IMG-0047=cache is empty
-IMG-0048=Installer already exists {0}={1}. Try removing it, before adding it again:  deleteEntry --key={0}
+IMG-0048=Installer already exists {0}={1}. Try removing it, before adding it again:  imagetool cache deleteEntry --key={0}
 IMG-0049=Could not find value for --path, file not found: {0}
 IMG-0050=Successfully added to cache. {0}={1}
 IMG-0051=Deleted entry [[cyan: {0}]]={1}

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

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