From ef3f0108a962b13c91771d9c79f7a9a4cf7db9df Mon Sep 17 00:00:00 2001 From: Qingyang Chen Date: Mon, 2 Jul 2018 14:18:11 -0400 Subject: [PATCH 1/2] Makes jibExportDockerContext.targetDir configurable from build.gradle. --- .../com/google/cloud/tools/jib/gradle/DockerContextTask.java | 2 ++ 1 file changed, 2 insertions(+) diff --git a/jib-gradle-plugin/src/main/java/com/google/cloud/tools/jib/gradle/DockerContextTask.java b/jib-gradle-plugin/src/main/java/com/google/cloud/tools/jib/gradle/DockerContextTask.java index 8defaed68c..81c162c0c2 100644 --- a/jib-gradle-plugin/src/main/java/com/google/cloud/tools/jib/gradle/DockerContextTask.java +++ b/jib-gradle-plugin/src/main/java/com/google/cloud/tools/jib/gradle/DockerContextTask.java @@ -30,6 +30,7 @@ import org.gradle.api.GradleException; import org.gradle.api.Task; import org.gradle.api.file.FileCollection; +import org.gradle.api.tasks.Input; import org.gradle.api.tasks.InputFiles; import org.gradle.api.tasks.Nested; import org.gradle.api.tasks.OutputDirectory; @@ -74,6 +75,7 @@ public FileCollection getInputFiles() { * @return the output directory for the Docker context is by default {@code build/jib-docker- * context}. */ + @Input @OutputDirectory public String getTargetDir() { if (targetDir == null) { From babd96e21264a67c9a40617c95156d607818ba2a Mon Sep 17 00:00:00 2001 From: Qingyang Chen Date: Mon, 2 Jul 2018 14:47:07 -0400 Subject: [PATCH 2/2] Updates CHANGELOG. --- jib-gradle-plugin/CHANGELOG.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/jib-gradle-plugin/CHANGELOG.md b/jib-gradle-plugin/CHANGELOG.md index 7a528b9514..868a0e9c13 100644 --- a/jib-gradle-plugin/CHANGELOG.md +++ b/jib-gradle-plugin/CHANGELOG.md @@ -5,6 +5,8 @@ All notable changes to this project will be documented in this file. ### Added +- Can configure `jibExportDockerContext` output directory with `jibExportDockerContext.targetDir` ([#492](https://github.com/GoogleContainerTools/jib/pull/492)) + ### Changed ### Fixed