Additional docker options

Author: ddsharpe

imagetool/pom.xml

@@ -13,7 +13,7 @@
     <parent>
         <artifactId>imagetool-parent</artifactId>
         <groupId>com.oracle.weblogic.lifecycle.imagetool</groupId>
-        <version>1.11.12-SNAPSHOT</version>
+        <version>1.12.1-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 

imagetool/src/main/java/com/oracle/weblogic/imagetool/builder/BuildCommand.java

@@ -30,6 +30,7 @@ public class BuildCommand {
 
     private final List<String> command;
     private final List<BuildArg> buildArgs;
+    private List<String> additionalOptions;
     private final String context;
 
     /**
@@ -71,6 +72,11 @@ public BuildCommand forceRm(boolean value) {
         return this;
     }
 
+    public BuildCommand additionalOptions(List<String> options) {
+        additionalOptions = options;
+        return this;
+    }
+
     /**
      * Add a --build-arg to the Docker build command.
      * Conceal is defaulted to false.
@@ -232,6 +238,9 @@ private CloseableList<PrintWriter> createPrintWriters(List<OutputStream> outputS
 
     private List<String> getCommand(boolean showPasswords) {
         List<String> result = new ArrayList<>(command);
+        if (additionalOptions != null && !additionalOptions.isEmpty()) {
+            result.addAll(additionalOptions);
+        }
         for (BuildArg arg : buildArgs) {
             result.addAll(arg.toList(showPasswords));
         }

imagetool/src/main/java/com/oracle/weblogic/imagetool/cli/ImageTool.java

@@ -14,6 +14,7 @@
 import com.oracle.weblogic.imagetool.cli.menu.UpdateImage;
 import com.oracle.weblogic.imagetool.logging.LoggingFacade;
 import com.oracle.weblogic.imagetool.logging.LoggingFactory;
+import com.oracle.weblogic.imagetool.util.Utils;
 import picocli.CommandLine;
 import picocli.CommandLine.Command;
 import picocli.CommandLine.ParseResult;
@@ -66,10 +67,10 @@ public static void main(String[] args) {
      * @param args the command line arguments (minus the sub commands themselves)
      */
     public static CommandResponse run(Object entryPoint, PrintWriter out, PrintWriter err, String... args) {
+        System.setProperty("picocli.endofoptions.description", Utils.getMessage("IMG-0119"));
         CommandLine cmd = new CommandLine(entryPoint)
             .setCaseInsensitiveEnumValuesAllowed(true)
             .setToggleBooleanFlags(false)
-            .setUnmatchedArgumentsAllowed(false)
             .setTrimQuotes(true)
             .setColorScheme(CommandLine.Help.defaultColorScheme(CommandLine.Help.Ansi.AUTO))
             .setParameterExceptionHandler(new ExceptionHandler())

imagetool/src/main/java/com/oracle/weblogic/imagetool/cli/cache/CacheCLI.java

@@ -3,11 +3,8 @@
 
 package com.oracle.weblogic.imagetool.cli.cache;
 
-import java.util.List;
-
 import com.oracle.weblogic.imagetool.cli.HelpVersionProvider;
 import picocli.CommandLine.Command;
-import picocli.CommandLine.Unmatched;
 
 @Command(
     name = "cache",
@@ -24,7 +21,4 @@
     sortOptions = false
 )
 public class CacheCLI {
-
-    @Unmatched
-    List<String> unmatchedOptions;
 }

imagetool/src/main/java/com/oracle/weblogic/imagetool/cli/cache/CacheOperation.java

@@ -3,19 +3,13 @@
 
 package com.oracle.weblogic.imagetool.cli.cache;
 
-import java.util.List;
 import java.util.concurrent.Callable;
 
 import com.oracle.weblogic.imagetool.api.model.CommandResponse;
 import picocli.CommandLine.Model.CommandSpec;
 import picocli.CommandLine.Spec;
-import picocli.CommandLine.Unmatched;
 
 public abstract class CacheOperation implements Callable<CommandResponse> {
-
-    @Unmatched
-    List<String> unmatchedOptions;
-
     @Spec
     CommandSpec spec;
 }

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

@@ -31,8 +31,8 @@
 import com.oracle.weblogic.imagetool.util.Utils;
 import picocli.CommandLine;
 import picocli.CommandLine.Option;
+import picocli.CommandLine.Parameters;
 import picocli.CommandLine.Spec;
-import picocli.CommandLine.Unmatched;
 
 import static com.oracle.weblogic.imagetool.util.Constants.BUSYBOX_OS_IDS;
 
@@ -124,6 +124,7 @@ BuildCommand getInitialBuildCmd(String contextFolder) {
             .tag(imageTag)
             .network(buildNetwork)
             .pull(buildPull)
+            .additionalOptions(buildOptions)
             .buildArg(buildArgs)
             .buildArg("http_proxy", httpProxyUrl, httpProxyUrl != null && httpProxyUrl.contains("@"))
             .buildArg("https_proxy", httpsProxyUrl, httpsProxyUrl != null && httpsProxyUrl.contains("@"))
@@ -422,9 +423,11 @@ public String buildId() {
     )
     Map<String,String> buildArgs;
 
-    @SuppressWarnings("unused")
-    @Unmatched
-    List<String> unmatchedOptions;
+    @Parameters(
+        description = "Container build options.",
+        hidden = true
+    )
+    List<String> buildOptions;
 
     @Spec
     CommandLine.Model.CommandSpec spec;

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

@@ -18,6 +18,7 @@
     name = "create",
     description = "Build WebLogic docker image",
     requiredOptionMarker = '*',
+    showEndOfOptionsDelimiterInUsageHelp = true,
     abbreviateSynopsis = true
 )
 public class CreateImage extends CommonCreateOptions implements Callable<CommandResponse> {

imagetool/src/main/resources/ImageTool.properties

@@ -117,3 +117,4 @@ IMG-0115=Unable to reach Oracle patch server to check for patch conflicts, skipp
 IMG-0116=A patch conflict was detected. The patches listed within the brackets conflict with each other. These fixes cannot be applied without a merge patch from Oracle:
 IMG-0117=The value for --sourceImage must not be empty.
 IMG-0118=Failed to clean up intermediate container images for build ID {0}
+IMG-0119=All parameters and options provided after the -- will be passed to the container image build command.

installer/pom.xml

@@ -13,7 +13,7 @@
     <parent>
         <artifactId>imagetool-parent</artifactId>
         <groupId>com.oracle.weblogic.lifecycle.imagetool</groupId>
-        <version>1.11.12-SNAPSHOT</version>
+        <version>1.12.1-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 

pom.xml

@@ -8,7 +8,7 @@
     <modelVersion>4.0.0</modelVersion>
     <groupId>com.oracle.weblogic.lifecycle.imagetool</groupId>
     <artifactId>imagetool-parent</artifactId>
-    <version>1.11.12-SNAPSHOT</version>
+    <version>1.12.1-SNAPSHOT</version>
     <packaging>pom</packaging>
 
     <name>WebLogic Image Tool</name>
@@ -72,7 +72,7 @@
             <dependency>
                 <groupId>org.junit.jupiter</groupId>
                 <artifactId>junit-jupiter-engine</artifactId>
-                <version>5.9.3</version>
+                <version>5.10.0</version>
                 <scope>test</scope>
             </dependency>
             <dependency>
@@ -154,7 +154,7 @@
                 <plugin>
                     <groupId>org.apache.maven.plugins</groupId>
                     <artifactId>maven-failsafe-plugin</artifactId>
-                    <version>3.1.0</version>
+                    <version>3.1.2</version>
                     <configuration>
                         <groups>${test.groups}</groups>
                     </configuration>
@@ -241,14 +241,14 @@
                         <dependency>
                             <groupId>com.puppycrawl.tools</groupId>
                             <artifactId>checkstyle</artifactId>
-                            <version>10.12.0</version>
+                            <version>10.12.3</version>
                         </dependency>
                     </dependencies>
                 </plugin>
                 <plugin>
                     <groupId>org.apache.maven.plugins</groupId>
                     <artifactId>maven-surefire-plugin</artifactId>
-                    <version>3.1.0</version>
+                    <version>3.1.2</version>
                     <configuration>
                         <groups>unit</groups>
                         <excludedGroups>failing</excludedGroups>
@@ -285,7 +285,7 @@
                 <plugin>
                     <groupId>org.apache.maven.plugins</groupId>
                     <artifactId>maven-enforcer-plugin</artifactId>
-                    <version>3.3.0</version>
+                    <version>3.4.0</version>
                 </plugin>
             </plugins>
         </pluginManagement>