Add 'args' parameter to Maven plugin

jib-maven-plugin/CHANGELOG.md

@@ -16,6 +16,7 @@ All notable changes to this project will be documented in this file.
 - `jib:buildDocker` maven goal to build straight to Docker daemon ([#266](https://github.com/GoogleContainerTools/jib/pull/266))
 - `mainClass` is inferred by searching through class files if configuration is missing ([#278](https://github.com/GoogleContainerTools/jib/pull/278))
 - Can now specify target image with `-Dimage` ([#328](https://github.com/GoogleContainerTools/jib/issues/328))
+- `args` parameter to define default main args ([#346](https://github.com/GoogleContainerTools/jib/issues/346))
 
 ### Changed
 - Removed `enableReproducibleBuilds` parameter - application layers will always be reproducible ([#245](https://github.com/GoogleContainerTools/jib/pull/245))

jib-maven-plugin/src/main/java/com/google/cloud/tools/jib/maven/BuildDockerMojo.java

@@ -68,6 +68,7 @@ public void execute() throws MojoExecutionException {
             .setKnownBaseRegistryCredentials(knownBaseRegistryCredentials)
             .setTargetImage(targetImage)
             .setMainClass(mainClass)
+            .setJavaArguments(getArgs())
             .setJvmFlags(getJvmFlags())
             .setEnvironment(getEnvironment())
             .build();

jib-maven-plugin/src/main/java/com/google/cloud/tools/jib/maven/BuildImageMojo.java

@@ -100,6 +100,7 @@ public void execute() throws MojoExecutionException, MojoFailureException {
             .setTargetImageCredentialHelperName(getTargetImageCredentialHelperName())
             .setKnownTargetRegistryCredentials(knownTargetRegistryCredentials)
             .setMainClass(mainClass)
+            .setJavaArguments(getArgs())
             .setJvmFlags(getJvmFlags())
             .setEnvironment(getEnvironment())
             .setTargetFormat(ImageFormat.valueOf(getFormat()).getManifestTemplateClass())

jib-maven-plugin/src/main/java/com/google/cloud/tools/jib/maven/DockerContextMojo.java

@@ -54,6 +54,7 @@ public void execute() throws MojoExecutionException, MojoFailureException {
           .setBaseImage(getBaseImage())
           .setJvmFlags(getJvmFlags())
           .setMainClass(mainClass)
+          .setJavaArguments(getArgs())
           .generate(Paths.get(targetDir));
 
       mavenBuildLogger.info("Created Docker context at " + targetDir);

jib-maven-plugin/src/main/java/com/google/cloud/tools/jib/maven/JibPluginConfiguration.java

@@ -97,6 +97,8 @@ static ImageReference parseTargetImageReference(String to) {
 
   @Nullable @Parameter private String mainClass;
 
+  @Parameter private List<String> args = Collections.emptyList();
+
   @Nullable
   @Parameter(defaultValue = "Docker", required = true)
   private String format;
@@ -140,6 +142,10 @@ String getMainClass() {
     return mainClass;
   }
 
+  List<String> getArgs() {
+    return args;
+  }
+
   String getFormat() {
     return Preconditions.checkNotNull(format);
   }

jib-maven-plugin/src/test/java/com/google/cloud/tools/jib/maven/BuildDockerMojoIntegrationTest.java

@@ -56,7 +56,7 @@ private static String buildToDockerDaemonAndRun(Path projectRoot, String imageRe
   @Test
   public void testExecute_simple() throws VerificationException, IOException, InterruptedException {
     Assert.assertEquals(
-        "Hello, world\n",
+        "Hello, world. An argument.\n",
         buildToDockerDaemonAndRun(
             simpleTestProject.getProjectRoot(),
             "gcr.io/jib-integration-testing/simpleimage:maven"));

jib-maven-plugin/src/test/java/com/google/cloud/tools/jib/maven/BuildImageMojoIntegrationTest.java

@@ -89,7 +89,7 @@ public void testExecute_simple() throws VerificationException, IOException, Inte
     }
 
     Assert.assertEquals(
-        "Hello, world\n",
+        "Hello, world. An argument.\n",
         buildAndRun(
             simpleTestProject.getProjectRoot(),
             "gcr.io/jib-integration-testing/simpleimage:maven"));

jib-maven-plugin/src/test/java/com/google/cloud/tools/jib/maven/DockerContextMojoIntegrationTest.java

@@ -50,6 +50,7 @@ public void testExecute() throws VerificationException, IOException, Interrupted
 
     String imageName = "jib/integration-test";
     new Command("docker", "build", "-t", imageName, dockerContextDirectory.toString()).run();
-    Assert.assertEquals("Hello, world\n", new Command("docker", "run", imageName).run());
+    Assert.assertEquals(
+        "Hello, world. An argument.\n", new Command("docker", "run", imageName).run());
   }
 }

jib-maven-plugin/src/test/resources/projects/simple/pom.xml

@@ -41,6 +41,7 @@
           <to>
             <image>gcr.io/jib-integration-testing/simpleimage:maven</image>
           </to>
+          <args>An argument.</args>
           <!-- Does not have tests use user-level cache for base image layers. -->
           <useOnlyProjectCache>true</useOnlyProjectCache>
         </configuration>

jib-maven-plugin/src/test/resources/projects/simple/src/main/java/com/test/HelloWorld.java

@@ -36,6 +36,6 @@ public static void main(String[] args) throws IOException, URISyntaxException {
     Path worldFile = Paths.get(classLoader.getResource("world").toURI());
     String world = new String(Files.readAllBytes(worldFile), StandardCharsets.UTF_8);
 
-    System.out.println(greeting + ", " + world);
+    System.out.println(greeting + ", " + world + ". " + (args.length > 0 ? args[0] : ""));
   }
 }