Adds to.tags configuration for Gradle.

jib-core/src/main/java/com/google/cloud/tools/jib/builder/steps/PushImageStep.java

@@ -136,6 +136,7 @@ private Void afterAllPushed() throws IOException, RegistryException, ExecutionEx
       // Pushes to all target image tags.
       // TODO: Parallelize.
       for (String tag : buildConfiguration.getAllTargetImageTags()) {
+        buildConfiguration.getBuildLogger().info("Tagging with " + tag + "...");
         registryClient.pushManifest(manifestTemplate, tag);
       }
     }

jib-gradle-plugin/src/integration-test/java/com/google/cloud/tools/jib/gradle/JibPluginIntegrationTest.java

@@ -190,6 +190,11 @@ public void testBuild_empty() throws IOException, InterruptedException {
         new Command("docker", "inspect", "-f", "{{.Created}}", targetImage).run().trim());
   }
 
+  @Test
+  public void testBuild_multipleTags() throws IOException, InterruptedException {
+    // TODO: Implement
+  }
+
   @Test
   public void testBuild_simple() throws IOException, InterruptedException {
     String targetImage =

jib-gradle-plugin/src/main/java/com/google/cloud/tools/jib/gradle/BaseImageParameters.java

@@ -0,0 +1,68 @@
+/*
+ * Copyright 2018 Google LLC.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not
+ * use this file except in compliance with the License. You may obtain a copy of
+ * the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+ * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
+ * License for the specific language governing permissions and limitations under
+ * the License.
+ */
+
+package com.google.cloud.tools.jib.gradle;
+
+import javax.annotation.Nullable;
+import javax.inject.Inject;
+import org.gradle.api.Action;
+import org.gradle.api.model.ObjectFactory;
+
+/** {@link ImageParameters} that configure the base image. */
+public class BaseImageParameters implements ImageParameters {
+
+  private AuthParameters auth;
+
+  @Nullable private String image;
+  @Nullable private String credHelper;
+
+  @Inject
+  public BaseImageParameters(ObjectFactory objectFactory, String imageDescriptor) {
+    auth = objectFactory.newInstance(AuthParameters.class, imageDescriptor + ".auth");
+  }
+
+  @Nullable
+  @Override
+  public String getImage() {
+    return image;
+  }
+
+  @Override
+  public void setImage(String image) {
+    this.image = image;
+  }
+
+  @Nullable
+  @Override
+  public String getCredHelper() {
+    return credHelper;
+  }
+
+  @Override
+  public void setCredHelper(String credHelper) {
+    this.credHelper = credHelper;
+  }
+
+  @Override
+  public AuthParameters getAuth() {
+    return auth;
+  }
+
+  @Override
+  public void auth(Action<? super AuthParameters> action) {
+    action.execute(auth);
+  }
+}

jib-gradle-plugin/src/main/java/com/google/cloud/tools/jib/gradle/BuildImageTask.java

@@ -115,6 +115,7 @@ public void buildImage() throws InvalidImageReferenceException {
             .setBaseImageConfiguration(
                 pluginConfigurationProcessor.getBaseImageConfigurationBuilder().build())
             .setTargetImageConfiguration(targetImageConfiguration)
+            .setAdditionalTargetImageTags(jibExtension.getTo().getTags())
             .setContainerConfiguration(
                 pluginConfigurationProcessor.getContainerConfigurationBuilder().build())
             .setTargetFormat(jibExtension.getFormat())

jib-gradle-plugin/src/main/java/com/google/cloud/tools/jib/gradle/ImageParameters.java

@@ -17,9 +17,7 @@
 package com.google.cloud.tools.jib.gradle;
 
 import javax.annotation.Nullable;
-import javax.inject.Inject;
 import org.gradle.api.Action;
-import org.gradle.api.model.ObjectFactory;
 import org.gradle.api.tasks.Input;
 import org.gradle.api.tasks.Nested;
 import org.gradle.api.tasks.Optional;
@@ -31,47 +29,25 @@
  * <p>{@code image} (required) is the image reference and {@code credHelper} (optional) is the name
  * (after {@code docker-credential} of the credential helper for accessing the {@code image}.
  */
-public class ImageParameters {
-
-  private AuthParameters auth;
-
-  @Nullable private String image;
-  @Nullable private String credHelper;
-
-  @Inject
-  public ImageParameters(ObjectFactory objectFactory, String imageDescriptor) {
-    auth = objectFactory.newInstance(AuthParameters.class, imageDescriptor + ".auth");
-  }
+interface ImageParameters {
 
   @Input
   @Nullable
   @Optional
-  public String getImage() {
-    return image;
-  }
+  String getImage();
 
-  public void setImage(String image) {
-    this.image = image;
-  }
+  void setImage(String image);
 
   @Input
   @Nullable
   @Optional
-  public String getCredHelper() {
-    return credHelper;
-  }
+  String getCredHelper();
 
-  public void setCredHelper(String credHelper) {
-    this.credHelper = credHelper;
-  }
+  void setCredHelper(String credHelper);
 
   @Nested
   @Optional
-  AuthParameters getAuth() {
-    return auth;
-  }
+  AuthParameters getAuth();
 
-  public void auth(Action<? super AuthParameters> action) {
-    action.execute(auth);
-  }
+  void auth(Action<? super AuthParameters> action);
 }

jib-gradle-plugin/src/main/java/com/google/cloud/tools/jib/gradle/JibExtension.java

@@ -73,27 +73,24 @@ private static Path resolveDefaultExtraDirectory(Path projectDirectory) {
     return projectDirectory.resolve("src").resolve("main").resolve("jib");
   }
 
-  private final ImageParameters from;
-  private final ImageParameters to;
+  private final BaseImageParameters from;
+  private final TargetImageParameters to;
   private final ContainerParameters container;
   private final Property<Boolean> useOnlyProjectCache;
   private final Property<Boolean> allowInsecureRegistries;
   private final Property<Path> extraDirectory;
 
-  private final Path projectDir;
-
   // TODO: Deprecated parameters; remove these 4
   private final ListProperty<String> jvmFlags;
   private final Property<String> mainClass;
   private final ListProperty<String> args;
   private final Property<ImageFormat> format;
 
   public JibExtension(Project project) {
-    projectDir = project.getProjectDir().toPath();
     ObjectFactory objectFactory = project.getObjects();
 
-    from = objectFactory.newInstance(ImageParameters.class, "jib.from");
-    to = objectFactory.newInstance(ImageParameters.class, "jib.to");
+    from = objectFactory.newInstance(BaseImageParameters.class, "jib.from");
+    to = objectFactory.newInstance(TargetImageParameters.class, "jib.to");
     container = objectFactory.newInstance(ContainerParameters.class);
 
     jvmFlags = objectFactory.listProperty(String.class);
@@ -111,7 +108,7 @@ public JibExtension(Project project) {
     args.set(Collections.emptyList());
     useOnlyProjectCache.set(DEFAULT_USE_ONLY_PROJECT_CACHE);
     allowInsecureRegistries.set(DEFAULT_ALLOW_INSECURE_REGISTIRIES);
-    extraDirectory.set(resolveDefaultExtraDirectory(projectDir));
+    extraDirectory.set(resolveDefaultExtraDirectory(project.getProjectDir().toPath()));
   }
 
   /**
@@ -206,13 +203,13 @@ String getTargetImage() {
 
   @Nested
   @Optional
-  public ImageParameters getFrom() {
+  public BaseImageParameters getFrom() {
     return from;
   }
 
   @Nested
   @Optional
-  public ImageParameters getTo() {
+  public TargetImageParameters getTo() {
     return to;
   }
 

jib-gradle-plugin/src/main/java/com/google/cloud/tools/jib/gradle/TargetImageParameters.java

@@ -0,0 +1,83 @@
+/*
+ * Copyright 2018 Google LLC.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not
+ * use this file except in compliance with the License. You may obtain a copy of
+ * the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+ * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
+ * License for the specific language governing permissions and limitations under
+ * the License.
+ */
+
+package com.google.cloud.tools.jib.gradle;
+
+import java.util.Collections;
+import java.util.Set;
+import javax.annotation.Nullable;
+import javax.inject.Inject;
+import org.gradle.api.Action;
+import org.gradle.api.model.ObjectFactory;
+import org.gradle.api.tasks.Input;
+import org.gradle.api.tasks.Optional;
+
+/** {@link ImageParameters} that configure the target image. */
+public class TargetImageParameters implements ImageParameters {
+
+  private AuthParameters auth;
+
+  @Nullable private String image;
+  private Set<String> tags = Collections.emptySet();
+  @Nullable private String credHelper;
+
+  @Inject
+  public TargetImageParameters(ObjectFactory objectFactory, String imageDescriptor) {
+    auth = objectFactory.newInstance(AuthParameters.class, imageDescriptor + ".auth");
+  }
+
+  @Nullable
+  @Override
+  public String getImage() {
+    return image;
+  }
+
+  @Override
+  public void setImage(String image) {
+    this.image = image;
+  }
+
+  @Input
+  @Optional
+  public Set<String> getTags() {
+    return tags;
+  }
+
+  public void setTags(Set<String> tags) {
+    this.tags = tags;
+  }
+
+  @Nullable
+  @Override
+  public String getCredHelper() {
+    return credHelper;
+  }
+
+  @Override
+  public void setCredHelper(String credHelper) {
+    this.credHelper = credHelper;
+  }
+
+  @Override
+  public AuthParameters getAuth() {
+    return auth;
+  }
+
+  @Override
+  public void auth(Action<? super AuthParameters> action) {
+    action.execute(auth);
+  }
+}

jib-gradle-plugin/src/test/java/com/google/cloud/tools/jib/gradle/PluginConfigurationProcessorTest.java

@@ -35,15 +35,15 @@ public class PluginConfigurationProcessorTest {
 
   @Mock GradleJibLogger mockGradleJibLogger;
   @Mock JibExtension mockJibExtension;
-  @Mock ImageParameters mockImageParameters;
+  @Mock BaseImageParameters mockBaseImageParameters;
   @Mock ContainerParameters mockContainerParameters;
   @Mock GradleProjectProperties mockProjectProperties;
 
   @Before
   public void setUp() throws Exception {
     Mockito.doReturn("gcr.io/distroless/java").when(mockJibExtension).getBaseImage();
-    Mockito.doReturn(mockImageParameters).when(mockJibExtension).getFrom();
-    Mockito.doReturn(new AuthParameters("mock")).when(mockImageParameters).getAuth();
+    Mockito.doReturn(mockBaseImageParameters).when(mockJibExtension).getFrom();
+    Mockito.doReturn(new AuthParameters("mock")).when(mockBaseImageParameters).getAuth();
     Mockito.doReturn(mockContainerParameters).when(mockJibExtension).getContainer();
     Mockito.doReturn(Collections.emptyList()).when(mockContainerParameters).getEntrypoint();