Make docker tasks correctly depend on required build tasks
Project: http://git-wip-us.apache.org/repos/asf/beam/repo Commit: http://git-wip-us.apache.org/repos/asf/beam/commit/85786280 Tree: http://git-wip-us.apache.org/repos/asf/beam/tree/85786280 Diff: http://git-wip-us.apache.org/repos/asf/beam/diff/85786280 Branch: refs/heads/master Commit: 85786280bf07519a9e1e44e66c7389baa6e3d233 Parents: 7fe8943 Author: Luke Cwik <lc...@google.com> Authored: Mon Nov 6 13:49:40 2017 -0800 Committer: Luke Cwik <lc...@google.com> Committed: Fri Nov 17 14:27:16 2017 -0800 ---------------------------------------------------------------------- sdks/java/container/build.gradle | 9 +++++++-- sdks/python/container/build.gradle | 2 ++ 2 files changed, 9 insertions(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/beam/blob/85786280/sdks/java/container/build.gradle ---------------------------------------------------------------------- diff --git a/sdks/java/container/build.gradle b/sdks/java/container/build.gradle index 11b3009..c26aa3d 100644 --- a/sdks/java/container/build.gradle +++ b/sdks/java/container/build.gradle @@ -44,9 +44,11 @@ dependencies { task copyDockerfileDependencies(type: Copy) { from configurations.dockerDependency + rename "slf4j-api.*", "slf4j-api.jar" + rename "slf4j-jdk14.*", "slf4j-jdk14.jar" + rename "beam-sdks-java-harness.*", "beam-sdks-java-harness.jar" into "build/target" } -docker.dependsOn copyDockerfileDependencies golang { packagePath = 'github.com/apache/beam/sdks/python/boot' @@ -59,6 +61,9 @@ golang { docker { // TODO(herohde): make the name easier to generate for releases. - name System.properties['user.name'] + '-docker-apache.bintray.io/beam/python:latest' + name System.properties['user.name'] + '-docker-apache.bintray.io/beam/java:latest' files "./build/" } +// Ensure that we build the required resources and copy and file dependencies from related projects +dockerPrepare.dependsOn build +dockerPrepare.dependsOn copyDockerfileDependencies http://git-wip-us.apache.org/repos/asf/beam/blob/85786280/sdks/python/container/build.gradle ---------------------------------------------------------------------- diff --git a/sdks/python/container/build.gradle b/sdks/python/container/build.gradle index 0d091d4..feba865 100644 --- a/sdks/python/container/build.gradle +++ b/sdks/python/container/build.gradle @@ -49,3 +49,5 @@ docker { name System.properties['user.name'] + '-docker-apache.bintray.io/beam/python:latest' files "./build/" } +// Ensure that making the docker image builds any required artifacts +dockerPrepare.dependsOn build