[BEAM-9063] migrate docker images to apache (#10612)

* [BEAM-9063] migrate docker images to apache * change prefix from beam- to beam_ * Update sdks/java/core/src/main/java/org/apache/beam/sdk/util/ReleaseInfo.java Co-Authored-By: Kyle Weaver <[email protected]> * Update sdks/java/core/src/main/java/org/apache/beam/sdk/util/ReleaseInfo.java Co-Authored-By: Kyle Weaver <[email protected]> * add spark job server container Co-authored-by: Kyle Weaver <[email protected]>
apache · Feb 21, 2020 · 00ed8a8 · 00ed8a8
1 parent 3aece70
commit 00ed8a8
Show file tree

Hide file tree

Showing 27 changed files with 136 additions and 89 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
@@ -1435,8 +1435,8 @@ class BeamModulePlugin implements Plugin<Project> {
  // containerImageName returns a configurable container image name, by default a
  // development image at docker.io (see sdks/CONTAINERS.md):
  //
- //  format: apachebeam/$NAME_sdk:latest
- //  ie: apachebeam/python2.7_sdk:latest apachebeam/java_sdk:latest apachebeam/go_sdk:latest
+ // format: apache/beam_$NAME_sdk:latest
+ // ie: apache/beam_python2.7_sdk:latest apache/beam_java_sdk:latest apache/beam_go_sdk:latest
  //
  // Both the root and tag can be defined using properties or explicitly provided.
  project.ext.containerImageName = {

diff --git a/gradle.properties b/gradle.properties
@@ -27,3 +27,6 @@ version=2.20.0-SNAPSHOT
 sdk_version=2.20.0.dev
 
 javaVersion=1.8
+
+docker_image_default_repo_root=apache
+docker_image_default_repo_prefix=beam_
diff --git a/release/src/main/scripts/build_release_candidate.sh b/release/src/main/scripts/build_release_candidate.sh
@@ -45,6 +45,9 @@ PYTHON_ARTIFACTS_DIR=python
 BEAM_ROOT_DIR=beam
 WEBSITE_ROOT_DIR=beam-site
 
+DOCKER_IMAGE_DEFAULT_REPO_ROOT=apache
+DOCKER_IMAGE_DEFAULT_REPO_PREFIX=beam_
+
 PYTHON_VER=("python2.7" "python3.5" "python3.6" "python3.7")
 FLINK_VER=("1.7" "1.8" "1.9")
 
@@ -221,7 +224,7 @@ if [[ $confirmation = "y" ]]; then
  echo '-------------------Generating and Pushing Python images-----------------'
  ./gradlew :sdks:python:container:buildAll -Pdocker-tag=${RELEASE}_rc${RC_NUM}
  for ver in "${PYTHON_VER[@]}"; do
- docker push apachebeam/${ver}_sdk:${RELEASE}_rc${RC_NUM} &
+ docker push ${DOCKER_IMAGE_DEFAULT_REPO_ROOT}/${DOCKER_IMAGE_DEFAULT_REPO_PREFIX}${ver}_sdk:${RELEASE}_rc${RC_NUM} &
  done
 
  echo '-------------------Generating and Pushing Java images-----------------'
@@ -243,14 +246,14 @@ if [[ $confirmation = "y" ]]; then
 
  echo '-------------------Clean up images at local-----------------'
  for ver in "${PYTHON_VER[@]}"; do
- docker rmi -f apachebeam/${ver}_sdk:${RELEASE}_rc${RC_NUM}
+ docker rmi -f ${DOCKER_IMAGE_DEFAULT_REPO_ROOT}/${DOCKER_IMAGE_DEFAULT_REPO_PREFIX}${ver}_sdk:${RELEASE}_rc${RC_NUM}
  done
- docker rmi -f apachebeam/java_sdk:${RELEASE}_rc${RC_NUM}
- docker rmi -f apachebeam/go_sdk:${RELEASE}_rc${RC_NUM}
+ docker rmi -f ${DOCKER_IMAGE_DEFAULT_REPO_ROOT}/${DOCKER_IMAGE_DEFAULT_REPO_PREFIX}java_sdk:${RELEASE}_rc${RC_NUM}
+ docker rmi -f ${DOCKER_IMAGE_DEFAULT_REPO_ROOT}/${DOCKER_IMAGE_DEFAULT_REPO_PREFIX}go_sdk:${RELEASE}_rc${RC_NUM}
  for ver in "${FLINK_VER[@]}"; do
- docker rmi -f "apachebeam/flink${ver}_job_server:${RELEASE}_rc${RC_NUM}"
+ docker rmi -f "${DOCKER_IMAGE_DEFAULT_REPO_ROOT}/${DOCKER_IMAGE_DEFAULT_REPO_PREFIX}flink${ver}_job_server:${RELEASE}_rc${RC_NUM}"
  done
- docker rmi -f "apachebeam/spark_job_server:${RELEASE}_rc${RC_NUM}"
+ docker rmi -f "${DOCKER_IMAGE_DEFAULT_REPO_ROOT}/${DOCKER_IMAGE_DEFAULT_REPO_PREFIX}spark_job_server:${RELEASE}_rc${RC_NUM}"
 fi
 
 echo "[Current Step]: Update beam-site"

diff --git a/release/src/main/scripts/publish_docker_images.sh b/release/src/main/scripts/publish_docker_images.sh
@@ -24,6 +24,9 @@
 
 set -e
 
+DOCKER_IMAGE_DEFAULT_REPO_ROOT=apache
+DOCKER_IMAGE_DEFAULT_REPO_PREFIX=beam_
+
 PYTHON_VER=("python2.7" "python3.5" "python3.6" "python3.7")
 FLINK_VER=("1.7" "1.8" "1.9")
 
@@ -46,62 +49,62 @@ if [[ $confirmation = "y" ]]; then
  echo '-------------------Generating and Pushing Python images-----------------'
  for ver in "${PYTHON_VER[@]}"; do
  # Pull varified RC from dockerhub.
- docker pull apachebeam/${ver}_sdk:${RELEASE}_${RC_VERSION}
+ docker pull ${DOCKER_IMAGE_DEFAULT_REPO_ROOT}/${DOCKER_IMAGE_DEFAULT_REPO_PREFIX}${ver}_sdk:${RELEASE}_${RC_VERSION}
 
  # Tag with ${RELEASE} and push to dockerhub.
- docker tag apachebeam/${ver}_sdk:${RELEASE}_${RC_VERSION} apachebeam/${ver}_sdk:${RELEASE}
- docker push apachebeam/${ver}_sdk:${RELEASE}
+ docker tag ${DOCKER_IMAGE_DEFAULT_REPO_ROOT}/${DOCKER_IMAGE_DEFAULT_REPO_PREFIX}${ver}_sdk:${RELEASE}_${RC_VERSION} ${DOCKER_IMAGE_DEFAULT_REPO_ROOT}/${DOCKER_IMAGE_DEFAULT_REPO_PREFIX}${ver}_sdk:${RELEASE}
+ docker push ${DOCKER_IMAGE_DEFAULT_REPO_ROOT}/${DOCKER_IMAGE_DEFAULT_REPO_PREFIX}${ver}_sdk:${RELEASE}
 
  # Tag with latest and push to dockerhub.
- docker tag apachebeam/${ver}_sdk:${RELEASE}_${RC_VERSION} apachebeam/${ver}_sdk:latest
- docker push apachebeam/${ver}_sdk:latest
+ docker tag ${DOCKER_IMAGE_DEFAULT_REPO_ROOT}/${DOCKER_IMAGE_DEFAULT_REPO_PREFIX}${ver}_sdk:${RELEASE}_${RC_VERSION} ${DOCKER_IMAGE_DEFAULT_REPO_ROOT}/${DOCKER_IMAGE_DEFAULT_REPO_PREFIX}${ver}_sdk:latest
+ docker push ${DOCKER_IMAGE_DEFAULT_REPO_ROOT}/${DOCKER_IMAGE_DEFAULT_REPO_PREFIX}${ver}_sdk:latest
 
  # Cleanup images from local
- docker rmi -f apachebeam/${ver}_sdk:${RELEASE}_${RC_VERSION}
- docker rmi -f apachebeam/${ver}_sdk:${RELEASE}
- docker rmi -f apachebeam/${ver}_sdk:latest
+ docker rmi -f ${DOCKER_IMAGE_DEFAULT_REPO_ROOT}/${DOCKER_IMAGE_DEFAULT_REPO_PREFIX}${ver}_sdk:${RELEASE}_${RC_VERSION}
+ docker rmi -f ${DOCKER_IMAGE_DEFAULT_REPO_ROOT}/${DOCKER_IMAGE_DEFAULT_REPO_PREFIX}${ver}_sdk:${RELEASE}
+ docker rmi -f ${DOCKER_IMAGE_DEFAULT_REPO_ROOT}/${DOCKER_IMAGE_DEFAULT_REPO_PREFIX}${ver}_sdk:latest
  done
 
  echo '-------------------Generating and Pushing Java images-----------------'
  # Pull varified RC from dockerhub.
- docker pull apachebeam/java_sdk:${RELEASE}_${RC_VERSION}
+ docker pull ${DOCKER_IMAGE_DEFAULT_REPO_ROOT}/${DOCKER_IMAGE_DEFAULT_REPO_PREFIX}java_sdk:${RELEASE}_${RC_VERSION}
 
  # Tag with ${RELEASE} and push to dockerhub.
- docker tag apachebeam/java_sdk:${RELEASE}_${RC_VERSION} apachebeam/java_sdk:${RELEASE}
- docker push apachebeam/java_sdk:${RELEASE}
+ docker tag ${DOCKER_IMAGE_DEFAULT_REPO_ROOT}/${DOCKER_IMAGE_DEFAULT_REPO_PREFIX}java_sdk:${RELEASE}_${RC_VERSION} ${DOCKER_IMAGE_DEFAULT_REPO_ROOT}/${DOCKER_IMAGE_DEFAULT_REPO_PREFIX}java_sdk:${RELEASE}
+ docker push ${DOCKER_IMAGE_DEFAULT_REPO_ROOT}/${DOCKER_IMAGE_DEFAULT_REPO_PREFIX}java_sdk:${RELEASE}
 
  # Tag with latest and push to dockerhub.
- docker tag apachebeam/java_sdk:${RELEASE}_${RC_VERSION} apachebeam/java_sdk:latest
- docker push apachebeam/java_sdk:latest
+ docker tag ${DOCKER_IMAGE_DEFAULT_REPO_ROOT}/${DOCKER_IMAGE_DEFAULT_REPO_PREFIX}java_sdk:${RELEASE}_${RC_VERSION} ${DOCKER_IMAGE_DEFAULT_REPO_ROOT}/${DOCKER_IMAGE_DEFAULT_REPO_PREFIX}java_sdk:latest
+ docker push ${DOCKER_IMAGE_DEFAULT_REPO_ROOT}/${DOCKER_IMAGE_DEFAULT_REPO_PREFIX}java_sdk:latest
 
  # Cleanup images from local
- docker rmi -f apachebeam/java_sdk:${RELEASE}_${RC_VERSION}
- docker rmi -f apachebeam/java_sdk:${RELEASE}
- docker rmi -f apachebeam/java_sdk:latest
+ docker rmi -f ${DOCKER_IMAGE_DEFAULT_REPO_ROOT}/${DOCKER_IMAGE_DEFAULT_REPO_PREFIX}java_sdk:${RELEASE}_${RC_VERSION}
+ docker rmi -f ${DOCKER_IMAGE_DEFAULT_REPO_ROOT}/${DOCKER_IMAGE_DEFAULT_REPO_PREFIX}java_sdk:${RELEASE}
+ docker rmi -f ${DOCKER_IMAGE_DEFAULT_REPO_ROOT}/${DOCKER_IMAGE_DEFAULT_REPO_PREFIX}java_sdk:latest
 
  echo '-------------------Generating and Pushing Go images-----------------'
  # Pull varified RC from dockerhub.
- docker pull apachebeam/go_sdk:${RELEASE}_${RC_VERSION}
+ docker pull ${DOCKER_IMAGE_DEFAULT_REPO_ROOT}/${DOCKER_IMAGE_DEFAULT_REPO_PREFIX}go_sdk:${RELEASE}_${RC_VERSION}
 
  # Tag with ${RELEASE} and push to dockerhub.
- docker tag apachebeam/go_sdk:${RELEASE}_${RC_VERSION} apachebeam/go_sdk:${RELEASE}
- docker push apachebeam/go_sdk:${RELEASE}
+ docker tag ${DOCKER_IMAGE_DEFAULT_REPO_ROOT}/${DOCKER_IMAGE_DEFAULT_REPO_PREFIX}go_sdk:${RELEASE}_${RC_VERSION} ${DOCKER_IMAGE_DEFAULT_REPO_ROOT}/${DOCKER_IMAGE_DEFAULT_REPO_PREFIX}go_sdk:${RELEASE}
+ docker push ${DOCKER_IMAGE_DEFAULT_REPO_ROOT}/${DOCKER_IMAGE_DEFAULT_REPO_PREFIX}go_sdk:${RELEASE}
 
  # Tag with latest and push to dockerhub.
- docker tag apachebeam/go_sdk:${RELEASE}_${RC_VERSION} apachebeam/go_sdk:latest
- docker push apachebeam/go_sdk:latest
+ docker tag ${DOCKER_IMAGE_DEFAULT_REPO_ROOT}/${DOCKER_IMAGE_DEFAULT_REPO_PREFIX}go_sdk:${RELEASE}_${RC_VERSION} ${DOCKER_IMAGE_DEFAULT_REPO_ROOT}/${DOCKER_IMAGE_DEFAULT_REPO_PREFIX}go_sdk:latest
+ docker push ${DOCKER_IMAGE_DEFAULT_REPO_ROOT}/${DOCKER_IMAGE_DEFAULT_REPO_PREFIX}go_sdk:latest
 
  # Cleanup images from local
- docker rmi -f apachebeam/go_sdk:${RELEASE}_${RC_VERSION}
- docker rmi -f apachebeam/go_sdk:${RELEASE}
- docker rmi -f apachebeam/go_sdk:latest
+ docker rmi -f ${DOCKER_IMAGE_DEFAULT_REPO_ROOT}/${DOCKER_IMAGE_DEFAULT_REPO_PREFIX}go_sdk:${RELEASE}_${RC_VERSION}
+ docker rmi -f ${DOCKER_IMAGE_DEFAULT_REPO_ROOT}/${DOCKER_IMAGE_DEFAULT_REPO_PREFIX}go_sdk:${RELEASE}
+ docker rmi -f ${DOCKER_IMAGE_DEFAULT_REPO_ROOT}/${DOCKER_IMAGE_DEFAULT_REPO_PREFIX}go_sdk:latest
 
  echo '-------------Generating and Pushing Flink job server images-------------'
  echo "Publishing images for the following Flink versions:" "${FLINK_VER[@]}"
  echo "Make sure the versions are correct, then press any key to proceed."
  read
  for ver in "${FLINK_VER[@]}"; do
- FLINK_IMAGE_NAME=apachebeam/flink${ver}_job_server
+ FLINK_IMAGE_NAME=${DOCKER_IMAGE_DEFAULT_REPO_ROOT}/${DOCKER_IMAGE_DEFAULT_REPO_PREFIX}flink${ver}_job_server
 
  # Pull verified RC from dockerhub.
  docker pull "${FLINK_IMAGE_NAME}:${RELEASE}_${RC_VERSION}"
@@ -121,7 +124,7 @@ if [[ $confirmation = "y" ]]; then
  done
 
  echo '-------------Generating and Pushing Spark job server image-------------'
- SPARK_IMAGE_NAME="apachebeam/spark_job_server"
+ SPARK_IMAGE_NAME=${DOCKER_IMAGE_DEFAULT_REPO_ROOT}/${DOCKER_IMAGE_DEFAULT_REPO_PREFIX}spark_job_server
 
  # Pull verified RC from dockerhub.
  docker pull "${SPARK_IMAGE_NAME}:${RELEASE}_${RC_VERSION}"

diff --git a/...nstruction-java/src/main/java/org/apache/beam/runners/core/construction/Environments.java b/...nstruction-java/src/main/java/org/apache/beam/runners/core/construction/Environments.java
@@ -55,7 +55,11 @@ public class Environments {
  * container.
  */
  private static final String JAVA_SDK_HARNESS_CONTAINER_URL =
- "apachebeam/java_sdk:" + ReleaseInfo.getReleaseInfo().getSdkVersion();
+ ReleaseInfo.getReleaseInfo().getDefaultDockerRepoRoot()
+ + "/"
+ + ReleaseInfo.getReleaseInfo().getDefaultDockerRepoPrefix()
+ + "java_sdk:"
+ + ReleaseInfo.getReleaseInfo().getSdkVersion();
  public static final Environment JAVA_SDK_HARNESS_ENVIRONMENT =
  createDockerEnvironment(JAVA_SDK_HARNESS_CONTAINER_URL);
 

diff --git a/runners/flink/job-server-container/flink_job_server_container.gradle b/runners/flink/job-server-container/flink_job_server_container.gradle
@@ -54,9 +54,10 @@ task copyDockerfileDependencies(type: Copy) {
 
 docker {
  name containerImageName(
- name: "flink${project.parent.name}_job_server",
+ name: project.docker_image_default_repo_prefix + "flink${project.parent.name}_job_server",
  root: project.rootProject.hasProperty(["docker-repository-root"]) ?
- project.rootProject["docker-repository-root"] : "apachebeam")
+ project.rootProject["docker-repository-root"] :
+ project.docker_image_default_repo_root)
  files "./build/"
 }
 

diff --git a/runners/flink/job-server/flink_job_server.gradle b/runners/flink/job-server/flink_job_server.gradle
@@ -218,7 +218,9 @@ def addTestJavaJarCreator(String pyVersion) {
  "--env_dir ${project.rootProject.buildDir}/gradleenv/${project.path.hashCode()}",
  "--python_root_dir ${project.rootDir}/sdks/python",
  "--python_version ${pyVersion}",
- "--python_container_image apachebeam/python${pyVersion}_sdk:${project.sdk_version}",
+ "--python_container_image ${project.docker_image_default_repo_root}/"
+ + ${project.docker_image_default_repo_prefix}
+ + "python${pyVersion}_sdk:${project.sdk_version}",
  ]
  args "-c", "../../../portability/test_pipeline_jar.sh ${options.join(' ')}"
  }
@@ -260,7 +262,9 @@ def addTestFlinkUberJarPy(String pyVersion) {
  "--env_dir ${project.rootProject.buildDir}/gradleenv/${project.path.hashCode()}",
  "--python_root_dir ${project.rootDir}/sdks/python",
  "--python_version ${pyVersion}",
- "--python_container_image apachebeam/python${pyVersion}_sdk:${project.sdk_version}",
+ "--python_container_image ${project.docker_image_default_repo_root}/"
+ + ${project.docker_image_default_repo_prefix}
+ + "python${pyVersion}_sdk:${project.sdk_version}",
  ]
  args "-c", "../../job-server/test_flink_uber_jar.sh ${options.join(' ')}"
  }

diff --git a/runners/google-cloud-dataflow-java/build.gradle b/runners/google-cloud-dataflow-java/build.gradle
@@ -188,8 +188,8 @@ task buildAndPushDockerContainer() {
  dependsOn ":sdks:java:container:docker"
  finalizedBy 'cleanUpDockerImages'
  def defaultDockerImageName = containerImageName(
- name: "java_sdk",
- root: "apachebeam",
+ name: project.docker_image_default_repo_prefix + "java_sdk",
+ root: "apache",
  tag: project.sdk_version)
  doLast {
  exec {

diff --git a/runners/spark/job-server/build.gradle b/runners/spark/job-server/build.gradle
@@ -164,7 +164,9 @@ def addTestJavaJarCreator(String pyVersion) {
  "--env_dir ${project.rootProject.buildDir}/gradleenv/${project.path.hashCode()}",
  "--python_root_dir ${project.rootDir}/sdks/python",
  "--python_version ${pyVersion}",
- "--python_container_image apachebeam/python${pyVersion}_sdk:${project.sdk_version}",
+ "--python_container_image ${project.docker_image_default_repo_root}/"
+ + ${project.docker_image_default_repo_prefix}
+ + "python${pyVersion}_sdk:${project.sdk_version}",
  ]
  args "-c", "../../portability/test_pipeline_jar.sh ${options.join(' ')}"
  }

diff --git a/runners/spark/job-server/container/build.gradle b/runners/spark/job-server/container/build.gradle
@@ -54,9 +54,10 @@ task copyDockerfileDependencies(type: Copy) {
 }
 
 docker {
- name containerImageName(name: 'spark_job_server',
+ name containerImageName(name: project.docker_image_default_repo_prefix + 'spark_job_server',
  root: project.rootProject.hasProperty(["docker-repository-root"]) ?
- project.rootProject["docker-repository-root"] : "apachebeam")
+ project.rootProject["docker-repository-root"] :
+ project.docker_image_default_repo_root)
  files "./build/"
 }
 

diff --git a/sdks/go/container/build.gradle b/sdks/go/container/build.gradle
@@ -47,9 +47,10 @@ golang {
 
 docker {
  name containerImageName(
- name: "go_sdk",
+ name: project.docker_image_default_repo_prefix + "go_sdk",
  root: project.rootProject.hasProperty(["docker-repository-root"]) ?
- project.rootProject["docker-repository-root"] : "apachebeam")
+ project.rootProject["docker-repository-root"] :
+ project.docker_image_default_repo_root)
  files "./build/"
 }
 // Ensure that making the docker image builds any required artifacts

diff --git a/sdks/go/pkg/beam/options/jobopts/options.go b/sdks/go/pkg/beam/options/jobopts/options.go
@@ -108,7 +108,7 @@ func GetEnvironmentUrn(ctx context.Context) string {
 // Convenience function.
 func GetEnvironmentConfig(ctx context.Context) string {
  if *EnvironmentConfig == "" {
- *EnvironmentConfig = os.ExpandEnv("apachebeam/go_sdk:latest")
+ *EnvironmentConfig = os.ExpandEnv("apache/beam_go_sdk:latest")
  log.Infof(ctx, "No environment config specified. Using default config: '%v'", *EnvironmentConfig)
  }
  return *EnvironmentConfig

diff --git a/sdks/java/container/build.gradle b/sdks/java/container/build.gradle
@@ -70,9 +70,10 @@ golang {
 
 docker {
  name containerImageName(
- name: "java_sdk",
+ name: project.docker_image_default_repo_prefix + "java_sdk",
  root: project.rootProject.hasProperty(["docker-repository-root"]) ?
- project.rootProject["docker-repository-root"] : "apachebeam",
+ project.rootProject["docker-repository-root"] :
+ project.docker_image_default_repo_root,
  tag: project.rootProject.hasProperty(["docker-tag"]) ?
  project.rootProject["docker-tag"] : project.sdk_version)
  dockerfile project.file("./${dockerfileName}")

diff --git a/sdks/java/core/build.gradle b/sdks/java/core/build.gradle
@@ -47,6 +47,8 @@ processResources {
  filter org.apache.tools.ant.filters.ReplaceTokens, tokens: [
  'pom.version': version,
  'pom.sdk_version': sdk_version,
+ 'pom.docker_image_default_repo_root': docker_image_default_repo_root,
+ 'pom.docker_image_default_repo_prefix': docker_image_default_repo_prefix,
  'timestamp': new Date().format("yyyy-MM-dd HH:mm")
  ]
 }

diff --git a/sdks/java/core/src/main/java/org/apache/beam/sdk/util/ReleaseInfo.java b/sdks/java/core/src/main/java/org/apache/beam/sdk/util/ReleaseInfo.java
@@ -61,10 +61,22 @@ public String getSdkVersion() {
  return getProperties().get("sdk_version");
  }
 
+ /** Provides docker image default root (apache). */
+ public String getDefaultDockerRepoRoot() {
+ return getProperties().get("docker_image_default_repo_root");
+ }
+
+ /** Provides docker image default repo prefix (beam_). */
+ public String getDefaultDockerRepoPrefix() {
+ return getProperties().get("docker_image_default_repo_prefix");
+ }
+
  /////////////////////////////////////////////////////////////////////////
  private static final Logger LOG = LoggerFactory.getLogger(ReleaseInfo.class);
  private static final String DEFAULT_NAME = "Apache Beam SDK for Java";
  private static final String DEFAULT_VERSION = "Unknown";
+ private static final String DEFAULT_DOCKER_IMAGE_ROOT = "apache";
+ private static final String DEFAULT_DOCKER_IMAGE_PREFIX = "beam_";
 
  private static class LazyInit {
  private static final ReleaseInfo INSTANCE;
@@ -89,6 +101,12 @@ private static class LazyInit {
  if (!properties.containsKey("sdk_version")) {
  properties.setProperty("sdk_version", DEFAULT_VERSION);
  }
+ if (!properties.containsKey("docker_image_default_repo_root")) {
+ properties.setProperty("docker_image_default_repo_root", DEFAULT_DOCKER_IMAGE_ROOT);
+ }
+ if (!properties.containsKey("docker_image_default_repo_prefix")) {
+ properties.setProperty("docker_image_default_repo_prefix", DEFAULT_DOCKER_IMAGE_PREFIX);
+ }
  INSTANCE = new AutoValue_ReleaseInfo(ImmutableMap.copyOf((Map) properties));
  }
  }

diff --git a/sdks/python/apache_beam/runners/portability/job_server.py b/sdks/python/apache_beam/runners/portability/job_server.py
@@ -187,7 +187,7 @@ def __init__(
 
  def subprocess_cmd_and_endpoint(self):
  # TODO This is hardcoded to Flink at the moment but should be changed
- job_server_image_name = "apachebeam/flink1.9_job_server:latest"
+ job_server_image_name = "apache/beam_flink1.9_job_server:latest"
  docker_path = subprocess.check_output(['which',
  'docker']).strip().decode('utf-8')
  cmd = [

diff --git a/sdks/python/apache_beam/transforms/environments.py b/sdks/python/apache_beam/transforms/environments.py
@@ -257,7 +257,7 @@ def default_docker_image():
  (sys.version_info[0], sys.version_info[1]))
 
  image = (
- 'apachebeam/python{version_suffix}_sdk:{tag}'.format(
+ 'apache/beam_python{version_suffix}_sdk:{tag}'.format(
  version_suffix=version_suffix, tag=sdk_version))
  logging.info(
  'Using Python SDK docker image: %s. If the image is not '

diff --git a/sdks/python/container/py2/build.gradle b/sdks/python/container/py2/build.gradle
@@ -53,9 +53,10 @@ task copyLauncherDependencies(type: Copy) {
 
 docker {
  name containerImageName(
- name: "python2.7_sdk", 
+ name: project.docker_image_default_repo_prefix + "python2.7_sdk",
  root: project.rootProject.hasProperty(["docker-repository-root"]) ?
- project.rootProject["docker-repository-root"] : "apachebeam",
+ project.rootProject["docker-repository-root"] :
+ project.docker_image_default_repo_root,
  tag: project.rootProject.hasProperty(["docker-tag"]) ?
  project.rootProject["docker-tag"] : project.sdk_version)
  files "../Dockerfile", "./build"

diff --git a/sdks/python/container/py35/build.gradle b/sdks/python/container/py35/build.gradle
@@ -53,9 +53,10 @@ task copyLauncherDependencies(type: Copy) {
 
 docker {
  name containerImageName(
- name: "python3.5_sdk",
+ name: project.docker_image_default_repo_prefix + "python3.5_sdk",
  root: project.rootProject.hasProperty(["docker-repository-root"]) ?
- project.rootProject["docker-repository-root"] : "apachebeam",
+ project.rootProject["docker-repository-root"] :
+ project.docker_image_default_repo_root,
  tag: project.rootProject.hasProperty(["docker-tag"]) ?
  project.rootProject["docker-tag"] : project.sdk_version)
  files "../Dockerfile", "./build"

diff --git a/sdks/python/container/py36/build.gradle b/sdks/python/container/py36/build.gradle
@@ -53,9 +53,10 @@ task copyLauncherDependencies(type: Copy) {
 
 docker {
  name containerImageName(
- name: "python3.6_sdk",
+ name: project.docker_image_default_repo_prefix + "python3.6_sdk",
  root: project.rootProject.hasProperty(["docker-repository-root"]) ?
- project.rootProject["docker-repository-root"] : "apachebeam",
+ project.rootProject["docker-repository-root"] :
+ project.docker_image_default_repo_root,
  tag: project.rootProject.hasProperty(["docker-tag"]) ?
  project.rootProject["docker-tag"] : project.sdk_version)
  files "../Dockerfile", "./build"