Added additional build command hook for --additionalBuildCommands prior at the beginning of the Dockerfile, initial-build-commands (#400)

Author: ddsharpe

documentation/1.11/content/userguide/tools/create-aux-image.md

@@ -52,6 +52,7 @@ Valid sections for `createAuxImage` are:
 
 | Section | Available Variables | Build Stage | Timing |
 | --- | --- | --- | --- |
+| `initial-build-commands` | None | All | As root, and before any Image Tool actions. |
 | `package-manager-packages` | None | All | A list of OS packages, such as `ftp gzip`, separated by line or space. |
 | `final-build-commands` | `AUXILIARY_IMAGE_PATH` `WDT_HOME` `WDT_MODEL_HOME`| Final image | After all Image Tool actions are complete, and just before the container image is finalized. |
 

documentation/1.11/content/userguide/tools/create-image.md

@@ -75,6 +75,7 @@ Valid sections for create are:
 
 | Section | Available Variables | Build Stage | Timing |
 | --- | --- | --- | --- |
+| `initial-build-commands` | None | All | As root, and before any Image Tool actions. |
 | `package-manager-packages` | None | All | A list of OS packages, such as `ftp gzip`, separated by line or space. |
 | `before-jdk-install` | `JAVA_HOME` | Intermediate (JDK_BUILD) | Before the JDK is installed. |
 | `after-jdk-install` | `JAVA_HOME` | Intermediate (JDK_BUILD) | After the JDK is installed. |

documentation/1.11/content/userguide/tools/rebase-image.md

@@ -58,6 +58,7 @@ The input for this parameter is a simple text file that contains one or more of
 
 | Section | Available Variables | Build Stage | Timing |
 | --- | --- | --- | --- |
+| `initial-build-commands` | None | All | As root, and before any Image Tool actions. |
 | `before-jdk-install` | `JAVA_HOME` `DOMAIN_HOME`| Intermediate (JDK_BUILD) | Before the JDK is installed. |
 | `after-jdk-install` | `JAVA_HOME` `DOMAIN_HOME` | Intermediate (JDK_BUILD) | After the JDK is installed. |
 | `before-fmw-install` | `JAVA_HOME` `ORACLE_HOME` `DOMAIN_HOME` | Intermediate (WLS_BUILD) | Before the Oracle Home is created. |

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

@@ -28,6 +28,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 INITIAL_BLD = "initial-build-commands";
     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";
@@ -48,6 +49,7 @@ public class AdditionalBuildCommands {
     public AdditionalBuildCommands(Path file) throws IOException {
         sections = new ArrayList<>();
         sections.add(getPattern(PACKAGES));
+        sections.add(getPattern(INITIAL_BLD));
         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

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

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

@@ -5,6 +5,9 @@
 FROM {{baseImage}} as os_update
 LABEL com.oracle.weblogic.imagetool.buildid="{{buildId}}"
 USER root
+{{#initialBuildCommands}}
+    {{{.}}}
+{{/initialBuildCommands}}
 # Use package manager to make sure that unzip, tar, and other required packages are installed
 {{> package-managers}}
 

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

@@ -18,6 +18,9 @@ LABEL com.oracle.weblogic.imagetool.buildid="{{buildId}}"
 
     LABEL com.oracle.weblogic.imagetool.buildid="{{buildId}}"
     USER root
+    {{#initialBuildCommands}}
+        {{{.}}}
+    {{/initialBuildCommands}}
     # Use package manager to make sure that unzip, tar, and other required packages are installed
     {{> package-managers}}
 

imagetool/src/main/resources/docker-files/aux-image.mustache

@@ -9,7 +9,9 @@ FROM {{baseImage}} as os_update
 LABEL com.oracle.weblogic.imagetool.buildid="{{buildId}}"
 
 USER root
-
+{{#initialBuildCommands}}
+    {{{.}}}
+{{/initialBuildCommands}}
 # Use package manager to make sure that unzip, tar, and other required packages are installed
 {{> package-managers}}