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/01/21 19:39:31 UTC

(beam) branch fix-java-sdk-distroless-snapshots updated (0ae9d218de1 -> 930c1d422aa)

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

damondouglas pushed a change to branch fix-java-sdk-distroless-snapshots
in repository https://gitbox.apache.org/repos/asf/beam.git


    from 0ae9d218de1 Prevent setup python environment for java:container:distroless
     new cb31df99cd8 Revert workflow changes
     new 930c1d422aa Fix defaultDockerImageName

The 2 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails.  The revisions
listed as "add" were already present in the repository and have only
been added to this reference.


Summary of changes:
 .github/workflows/beam_Publish_Beam_SDK_Snapshots.yml | 2 +-
 runners/google-cloud-dataflow-java/build.gradle       | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)


(beam) 02/02: Fix defaultDockerImageName

Posted by da...@apache.org.
This is an automated email from the ASF dual-hosted git repository.

damondouglas pushed a commit to branch fix-java-sdk-distroless-snapshots
in repository https://gitbox.apache.org/repos/asf/beam.git

commit 930c1d422aa252c5ff2201eca23b9d4e4517c332
Author: Damon Douglas <da...@google.com>
AuthorDate: Tue Jan 21 11:39:06 2025 -0800

    Fix defaultDockerImageName
---
 runners/google-cloud-dataflow-java/build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/runners/google-cloud-dataflow-java/build.gradle b/runners/google-cloud-dataflow-java/build.gradle
index 0e91bb2d8a5..5beecd8377d 100644
--- a/runners/google-cloud-dataflow-java/build.gradle
+++ b/runners/google-cloud-dataflow-java/build.gradle
@@ -840,7 +840,7 @@ def buildAndPushDistrolessDockerJavaContainer = tasks.register("buildAndPushDist
   }
   dependsOn ":sdks:java:container:distroless:${javaVer}:docker"
   def defaultDockerImageName = containerImageName(
-          name: "${project.docker_image_default_repo_prefix}${javaVer}_sdk",
+          name: "${project.docker_image_default_repo_prefix}${javaVer}_sdk_distroess",
           root: "apache",
           tag: project.sdk_version)
   doLast {


(beam) 01/02: Revert workflow changes

Posted by da...@apache.org.
This is an automated email from the ASF dual-hosted git repository.

damondouglas pushed a commit to branch fix-java-sdk-distroless-snapshots
in repository https://gitbox.apache.org/repos/asf/beam.git

commit cb31df99cd8d73a0d89555392571e4cfaced0393
Author: Damon Douglas <da...@google.com>
AuthorDate: Tue Jan 21 11:34:02 2025 -0800

    Revert workflow changes
---
 .github/workflows/beam_Publish_Beam_SDK_Snapshots.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/beam_Publish_Beam_SDK_Snapshots.yml b/.github/workflows/beam_Publish_Beam_SDK_Snapshots.yml
index 668c471c158..d17a6c0666b 100644
--- a/.github/workflows/beam_Publish_Beam_SDK_Snapshots.yml
+++ b/.github/workflows/beam_Publish_Beam_SDK_Snapshots.yml
@@ -108,7 +108,7 @@ jobs:
         with:
           java-version: 11
       - name: Setup Python environment
-        if: ${{ startsWith(matrix.container_task, 'python') && !startsWith(matrix.container_task, 'java:container:distroless') }}
+        if: ${{ startsWith(matrix.container_task, 'python') }}
         uses: ./.github/actions/setup-environment-action
         with:
           python-version: default