You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@beam.apache.org by da...@apache.org on 2025/10/16 18:21:49 UTC
(beam) 01/01: Fix publishing of ml/distroless images
This is an automated email from the ASF dual-hosted git repository.
damccorm pushed a commit to branch users/damccorm/ml-distroless
in repository https://gitbox.apache.org/repos/asf/beam.git
commit 9083f5cae4e8d360f574c8a699dc9cf5ac48c9b3
Author: Danny Mccormick <da...@google.com>
AuthorDate: Thu Oct 16 14:21:29 2025 -0400
Fix publishing of ml/distroless images
---
.github/workflows/build_release_candidate.yml | 17 +++++++++--------
.../workflows/republish_released_docker_containers.yml | 17 +++++++++--------
sdks/python/container/build.gradle | 8 ++++++--
3 files changed, 24 insertions(+), 18 deletions(-)
diff --git a/.github/workflows/build_release_candidate.yml b/.github/workflows/build_release_candidate.yml
index b070ada17a0..d6a709e535b 100644
--- a/.github/workflows/build_release_candidate.yml
+++ b/.github/workflows/build_release_candidate.yml
@@ -259,13 +259,14 @@ jobs:
# Any task which is skipped from a broader task must be explicitly included in this list to avoid accidentally missing new
# tasks as they are added.
images_to_publish: [
- {"gradle_task": ":pushAllRunnersDockerImages", "skip_flags": ""},
- {"gradle_task": ":sdks:python:container:push39", "skip_flags": ""},
- {"gradle_task": ":sdks:python:container:push310", "skip_flags": ""},
- {"gradle_task": ":sdks:python:container:push311", "skip_flags": ""},
- {"gradle_task": ":sdks:python:container:pushAll", "skip_flags": "-Pskip-python-39-images -Pskip-python-310-images -Pskip-python-311-images"},
- {"gradle_task": ":pushAllSdkDockerImages", "skip_flags": "-Pskip-python-images"},
- {"gradle_task": ":pushAllDockerImages", "skip_flags": "-Pskip-runner-images -Pskip-sdk-images"}
+ {"gradle_task": ":pushAllRunnersDockerImages", "include_skip_flags": "-Pinclude-ml -Pinclude-distroless"},
+ {"gradle_task": ":sdks:python:container:push39", "include_skip_flags": "-Pinclude-ml -Pinclude-distroless"},
+ {"gradle_task": ":sdks:python:container:push310", "include_skip_flags": "-Pinclude-ml -Pinclude-distroless"},
+ {"gradle_task": ":sdks:python:container:push311", "include_skip_flags": "-Pinclude-ml -Pinclude-distroless"},
+ {"gradle_task": ":sdks:python:container:push312", "include_skip_flags": "-Pinclude-ml -Pinclude-distroless"},
+ {"gradle_task": ":sdks:python:container:pushAll", "include_skip_flags": "-Pinclude-ml -Pinclude-distroless -Pskip-python-39-images -Pskip-python-310-images -Pskip-python-311-images -Pskip-python-312-images"},
+ {"gradle_task": ":pushAllSdkDockerImages", "include_skip_flags": "-Pskip-python-images"},
+ {"gradle_task": ":pushAllDockerImages", "include_skip_flags": "-Pskip-runner-images -Pskip-sdk-images"}
]
steps:
- name: Checkout
@@ -297,7 +298,7 @@ jobs:
username: ${{ secrets.DOCKERHUB_USER }}
password: ${{ secrets.DOCKERHUB_TOKEN }}
- name: Push docker images
- run: ./gradlew ${{ matrix.images_to_publish.gradle_task }} -PisRelease -Pdocker-pull-licenses -Pprune-images ${{ matrix.images_to_publish.skip_flags }} -Pdocker-tag=${{ github.event.inputs.RELEASE }}rc${{ github.event.inputs.RC }} --no-daemon --no-parallel
+ run: ./gradlew ${{ matrix.images_to_publish.gradle_task }} -PisRelease -Pdocker-pull-licenses -Pprune-images ${{ matrix.images_to_publish.include_skip_flags }} -Pdocker-tag=${{ github.event.inputs.RELEASE }}rc${{ github.event.inputs.RC }} --no-daemon --no-parallel
beam_site_pr:
if: ${{ fromJson(github.event.inputs.STAGE).beam_site_pr == 'yes'}}
diff --git a/.github/workflows/republish_released_docker_containers.yml b/.github/workflows/republish_released_docker_containers.yml
index 39909049177..09c9eb7edf1 100644
--- a/.github/workflows/republish_released_docker_containers.yml
+++ b/.github/workflows/republish_released_docker_containers.yml
@@ -46,13 +46,14 @@ jobs:
# Any task which is skipped from a broader task must be explicitly included in this list to avoid accidentally missing new
# tasks as they are added.
images_to_publish: [
- {"gradle_task": ":pushAllRunnersDockerImages", "skip_flags": ""},
- {"gradle_task": ":sdks:python:container:push39", "skip_flags": ""},
- {"gradle_task": ":sdks:python:container:push310", "skip_flags": ""},
- {"gradle_task": ":sdks:python:container:push311", "skip_flags": ""},
- {"gradle_task": ":sdks:python:container:pushAll", "skip_flags": "-Pskip-python-39-images -Pskip-python-310-images -Pskip-python-311-images"},
- {"gradle_task": ":pushAllSdkDockerImages", "skip_flags": "-Pskip-python-images"},
- {"gradle_task": ":pushAllDockerImages", "skip_flags": "-Pskip-runner-images -Pskip-sdk-images"}
+ {"gradle_task": ":pushAllRunnersDockerImages", "include_skip_flags": "-Pinclude-ml -Pinclude-distroless"},
+ {"gradle_task": ":sdks:python:container:push39", "include_skip_flags": "-Pinclude-ml -Pinclude-distroless"},
+ {"gradle_task": ":sdks:python:container:push310", "include_skip_flags": "-Pinclude-ml -Pinclude-distroless"},
+ {"gradle_task": ":sdks:python:container:push311", "include_skip_flags": "-Pinclude-ml -Pinclude-distroless"},
+ {"gradle_task": ":sdks:python:container:push312", "include_skip_flags": "-Pinclude-ml -Pinclude-distroless"},
+ {"gradle_task": ":sdks:python:container:pushAll", "include_skip_flags": "-Pinclude-ml -Pinclude-distroless -Pskip-python-39-images -Pskip-python-310-images -Pskip-python-311-images -Pskip-python-312-images"},
+ {"gradle_task": ":pushAllSdkDockerImages", "include_skip_flags": "-Pskip-python-images"},
+ {"gradle_task": ":pushAllDockerImages", "include_skip_flags": "-Pskip-runner-images -Pskip-sdk-images"}
]
steps:
- name: Checkout
@@ -93,7 +94,7 @@ jobs:
./gradlew ${{ matrix.images_to_publish.gradle_task }} \
-PisRelease \
-Pdocker-pull-licenses \
- -Pprune-images ${{ matrix.images_to_publish.skip_flags }} \
+ -Pprune-images ${{ matrix.images_to_publish.include_skip_flags }} \
-Pdocker-repository-root=gcr.io/apache-beam-testing/updated_released_container_images \
-Pdocker-tag-list=${{ env.release }},${{ github.sha }},$(date +'%Y-%m-%d') \
--no-daemon \
diff --git a/sdks/python/container/build.gradle b/sdks/python/container/build.gradle
index fe7bda55317..505eb45d4b8 100644
--- a/sdks/python/container/build.gradle
+++ b/sdks/python/container/build.gradle
@@ -57,6 +57,12 @@ for(int i=min_python_version; i<=max_python_version; ++i) {
}
}
dependsOn ':sdks:python:container:py' + cur + ':docker'
+ if (project.hasProperty("include-ml")) {
+ dependsOn ':sdks:python:container:ml:push3' + cur
+ }
+ if (project.hasProperty("include-distroless")) {
+ dependsOn ':sdks:python:container:distroless:push3' + cur
+ }
doLast {
if (project.hasProperty("prune-images")) {
@@ -70,8 +76,6 @@ for(int i=min_python_version; i<=max_python_version; ++i) {
}
tasks.register("pushAll") {
- dependsOn ':sdks:python:container:distroless:pushAll'
- dependsOn ':sdks:python:container:ml:pushAll'
for(int ver=min_python_version; ver<=max_python_version; ++ver) {
if (!project.hasProperty("skip-python-3" + ver + "-images")) {
dependsOn ':sdks:python:container:push3' + ver