(beam) branch master updated: Actually publish distroless containers when releasing (#35485)

[jrmccluskey]

This is an automated email from the ASF dual-hosted git repository.

jrmccluskey 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 ec5e85fdc8e Actually publish distroless containers when releasing 
(#35485)
ec5e85fdc8e is described below

commit ec5e85fdc8edcec86bfae162fc481ea26d26cb0a
Author: Danny McCormick <dannymccorm...@google.com>
AuthorDate: Tue Jul 1 10:12:39 2025 -0400

    Actually publish distroless containers when releasing (#35485)
    
    * Actually publish distroless containers when releasing
    
    * Put distroless publish in java publish
---
 sdks/java/container/build.gradle              | 1 +
 sdks/python/container/build.gradle            | 1 +
 sdks/python/container/distroless/build.gradle | 8 ++++++--
 3 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/sdks/java/container/build.gradle b/sdks/java/container/build.gradle
index bc9bc45ec37..711b34b38b8 100644
--- a/sdks/java/container/build.gradle
+++ b/sdks/java/container/build.gradle
@@ -83,4 +83,5 @@ task pushAll {
   dependsOn ":sdks:java:container:java11:docker"
   dependsOn ":sdks:java:container:java17:docker"
   dependsOn ":sdks:java:container:java21:docker"
+  dependsOn ":sdks:java:container:distroless:pushAll"
 }
diff --git a/sdks/python/container/build.gradle 
b/sdks/python/container/build.gradle
index 861d90b6e6b..f4de804b80b 100644
--- a/sdks/python/container/build.gradle
+++ b/sdks/python/container/build.gradle
@@ -70,6 +70,7 @@ for(int i=min_python_version; i<=max_python_version; ++i) {
 }
 
 tasks.register("pushAll") {
+  dependsOn ':sdks:python:container:distroless: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
diff --git a/sdks/python/container/distroless/build.gradle 
b/sdks/python/container/distroless/build.gradle
index a967a80f4fc..314484ade61 100644
--- a/sdks/python/container/distroless/build.gradle
+++ b/sdks/python/container/distroless/build.gradle
@@ -38,7 +38,9 @@ for(int i=min_python_version; i<=max_python_version; ++i) {
         if (cur != min_version) {
             // Enforce ordering to allow the prune step to happen between runs.
             // This will ensure we don't use up too much space (especially in 
CI environments)
-            mustRunAfter(":sdks:python:container:distroless:push" + prev)
+            if (!project.hasProperty("skip-python-3" + prev + "-images")) {
+                mustRunAfter(":sdks:python:container:distroless:push" + prev)
+            }
         }
         dependsOn ':sdks:python:container:distroless:py' + cur + ':docker'
 
@@ -55,6 +57,8 @@ for(int i=min_python_version; i<=max_python_version; ++i) {
 
 tasks.register("pushAll") {
     for(int ver=min_python_version; ver<=max_python_version; ++ver) {
-        dependsOn ':sdks:python:container:distroless:push3' + ver
+        if (!project.hasProperty("skip-python-3" + ver + "-images")) {
+            dependsOn ':sdks:python:container:distroless:push3' + ver
+        }
     }
 }