This is an automated email from the ASF dual-hosted git repository. altay pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/beam.git
The following commit(s) were added to refs/heads/master by this push: new 0122d4d BEAM-8165 pass root as a param and keep default root new 85d6d38 Merge pull request #9588 from Hannah-Jiang/container 0122d4d is described below commit 0122d4dcb16d5c15f14b42ab299be7833b2162e5 Author: Hannah Jiang <hannahji...@google.com> AuthorDate: Mon Sep 16 13:41:22 2019 -0700 BEAM-8165 pass root as a param and keep default root --- .../src/main/groovy/org/apache/beam/gradle/BeamModulePlugin.groovy | 2 +- runners/google-cloud-dataflow-java/build.gradle | 4 +++- sdks/go/container/build.gradle | 7 ++++++- sdks/java/container/build.gradle | 7 ++++++- sdks/python/container/py2/build.gradle | 2 ++ sdks/python/container/py35/build.gradle | 2 ++ sdks/python/container/py36/build.gradle | 2 ++ sdks/python/container/py37/build.gradle | 2 ++ 8 files changed, 24 insertions(+), 4 deletions(-) diff --git a/buildSrc/src/main/groovy/org/apache/beam/gradle/BeamModulePlugin.groovy b/buildSrc/src/main/groovy/org/apache/beam/gradle/BeamModulePlugin.groovy index c325d7c..3d5e2d6 100644 --- a/buildSrc/src/main/groovy/org/apache/beam/gradle/BeamModulePlugin.groovy +++ b/buildSrc/src/main/groovy/org/apache/beam/gradle/BeamModulePlugin.groovy @@ -1492,7 +1492,7 @@ class BeamModulePlugin implements Plugin<Project> { if (project.rootProject.hasProperty(["docker-repository-root"])) { configuration.root = project.rootProject["docker-repository-root"] } else { - configuration.root = "apachebeam" + configuration.root = "${System.properties["user.name"]}-docker-apache.bintray.io/beam" } } if (configuration.tag == null) { diff --git a/runners/google-cloud-dataflow-java/build.gradle b/runners/google-cloud-dataflow-java/build.gradle index 55ebe27..831498a 100644 --- a/runners/google-cloud-dataflow-java/build.gradle +++ b/runners/google-cloud-dataflow-java/build.gradle @@ -214,7 +214,9 @@ task validatesRunnerLegacyWorkerJava11Test(type: Test) { task buildAndPushDockerContainer() { dependsOn ":sdks:java:container:docker" finalizedBy 'cleanUpDockerImages' - def defaultDockerImageName = containerImageName(name: "java_sdk") + def defaultDockerImageName = containerImageName( + name: "java_sdk", + root: "apachebeam") doLast { exec { commandLine "docker", "tag", "${defaultDockerImageName}", "${dockerImageName}" diff --git a/sdks/go/container/build.gradle b/sdks/go/container/build.gradle index 909cc4d..48f7996 100644 --- a/sdks/go/container/build.gradle +++ b/sdks/go/container/build.gradle @@ -46,7 +46,12 @@ golang { } docker { - name containerImageName(name: "go_sdk") + name containerImageName( + name: "go_sdk", + root: project.rootProject.hasProperty(["docker-repository-root"]) ? + project.rootProject["docker-repository-root"] : "apachebeam", + tag: project.rootProject.hasProperty(["docker-tag"]) ? + project.rootProject["docker-tag"] : project['version']) files "./build/" } // Ensure that making the docker image builds any required artifacts diff --git a/sdks/java/container/build.gradle b/sdks/java/container/build.gradle index 49077fd..4cc29d8 100644 --- a/sdks/java/container/build.gradle +++ b/sdks/java/container/build.gradle @@ -69,7 +69,12 @@ golang { } docker { - name containerImageName(name: "java_sdk") + name containerImageName( + name: "java_sdk", + root: project.rootProject.hasProperty(["docker-repository-root"]) ? + project.rootProject["docker-repository-root"] : "apachebeam", + tag: project.rootProject.hasProperty(["docker-tag"]) ? + project.rootProject["docker-tag"] : project['version']) dockerfile project.file("./${dockerfileName}") files "./build/" } diff --git a/sdks/python/container/py2/build.gradle b/sdks/python/container/py2/build.gradle index f9b06d2..64f39f0 100644 --- a/sdks/python/container/py2/build.gradle +++ b/sdks/python/container/py2/build.gradle @@ -54,6 +54,8 @@ task copyLauncherDependencies(type: Copy) { docker { name containerImageName( name: "python2.7_sdk", + root: project.rootProject.hasProperty(["docker-repository-root"]) ? + project.rootProject["docker-repository-root"] : "apachebeam", tag: project.rootProject.hasProperty(["docker-tag"]) ? project.rootProject["docker-tag"] : project['python_sdk_version']) files "../Dockerfile", "./build" diff --git a/sdks/python/container/py35/build.gradle b/sdks/python/container/py35/build.gradle index 7aef5fe..024847b 100644 --- a/sdks/python/container/py35/build.gradle +++ b/sdks/python/container/py35/build.gradle @@ -54,6 +54,8 @@ task copyLauncherDependencies(type: Copy) { docker { name containerImageName( name: "python3.5_sdk", + root: project.rootProject.hasProperty(["docker-repository-root"]) ? + project.rootProject["docker-repository-root"] : "apachebeam", tag: project.rootProject.hasProperty(["docker-tag"]) ? project.rootProject["docker-tag"] : project['python_sdk_version']) files "../Dockerfile", "./build" diff --git a/sdks/python/container/py36/build.gradle b/sdks/python/container/py36/build.gradle index 0f6d250..f81f6ec 100644 --- a/sdks/python/container/py36/build.gradle +++ b/sdks/python/container/py36/build.gradle @@ -54,6 +54,8 @@ task copyLauncherDependencies(type: Copy) { docker { name containerImageName( name: "python3.6_sdk", + root: project.rootProject.hasProperty(["docker-repository-root"]) ? + project.rootProject["docker-repository-root"] : "apachebeam", tag: project.rootProject.hasProperty(["docker-tag"]) ? project.rootProject["docker-tag"] : project['python_sdk_version']) files "../Dockerfile", "./build" diff --git a/sdks/python/container/py37/build.gradle b/sdks/python/container/py37/build.gradle index f4004d7..a7f10c4 100644 --- a/sdks/python/container/py37/build.gradle +++ b/sdks/python/container/py37/build.gradle @@ -54,6 +54,8 @@ task copyLauncherDependencies(type: Copy) { docker { name containerImageName( name: "python3.7_sdk", + root: project.rootProject.hasProperty(["docker-repository-root"]) ? + project.rootProject["docker-repository-root"] : "apachebeam", tag: project.rootProject.hasProperty(["docker-tag"]) ? project.rootProject["docker-tag"] : project['python_sdk_version']) files "../Dockerfile", "./build"