Skip to content

Commit

Permalink
remove version_suffix
Browse files Browse the repository at this point in the history
  • Loading branch information
damccorm committed Apr 24, 2023
1 parent 83a2914 commit 37c7d58
Showing 1 changed file with 8 additions and 6 deletions.
14 changes: 8 additions & 6 deletions sdks/python/apache_beam/runners/dataflow/internal/apiclient.py
Original file line number Diff line number Diff line change
Expand Up @@ -1211,15 +1211,17 @@ def get_container_image_from_options(pipeline_options):

# Legacy and runner v2 exist in different repositories.
# Set to legacy format, override if runner v2
version_suffix = '%s%s' % (sys.version_info[0:2])
container_repo = names.DATAFLOW_CONTAINER_IMAGE_REPOSITORY
image_name = '{repository}/python{version_suffix}'.format(
repository=container_repo, version_suffix=version_suffix)
image_name = '{repository}/python{major}{minor}'.format(
repository=container_repo,
major=sys.version_info[0],
minor=sys.version_info[1])

if is_runner_v2:
version_suffix = '%s.%s' % (sys.version_info[0:2])
image_name = '{repository}/beam_python{version_suffix}_sdk'.format(
repository=container_repo, version_suffix=version_suffix)
image_name = '{repository}/beam_python{major}.{minor}_sdk'.format(
repository=container_repo,
major=sys.version_info[0],
minor=sys.version_info[1])

image_tag = _get_required_container_version(is_runner_v2)
return image_name + ':' + image_tag
Expand Down

0 comments on commit 37c7d58

Please sign in to comment.