From 99f46e969ab22c3d2db4c3976ea0eef86a2b2c90 Mon Sep 17 00:00:00 2001 From: liferoad Date: Sat, 14 Jun 2025 16:26:58 -0400 Subject: [PATCH 1/2] try buildah to replace kaniko --- .../runners/portability/sdk_container_builder.py | 16 +++++++++------- 1 file changed, 9 insertions(+), 7 deletions(-) diff --git a/sdks/python/apache_beam/runners/portability/sdk_container_builder.py b/sdks/python/apache_beam/runners/portability/sdk_container_builder.py index 489973304f5f..0b7e1f28d007 100644 --- a/sdks/python/apache_beam/runners/portability/sdk_container_builder.py +++ b/sdks/python/apache_beam/runners/portability/sdk_container_builder.py @@ -247,16 +247,18 @@ def _invoke_docker_build_and_push(self, container_image_name): build.options.machineType = self._cloud_build_machine_type build.steps = [] step = cloudbuild.BuildStep() - step.name = 'gcr.io/kaniko-project/executor:latest' - # Disable compression caching to allow for large images to be cached. - # See: https://github.com/GoogleContainerTools/kaniko/issues/1669 + step.name = 'quay.io/buildah/stable:latest' + step.entrypoint = 'sh' step.args = [ - '--destination=' + container_image_name, - '--cache=true', - '--compressed-caching=false', + '-c', + # The --storage-driver=vfs option is used to run buildah in a + # rootless environment. + ( + 'buildah bud --storage-driver=vfs -t {0} . && ' + 'buildah push --storage-driver=vfs {0} docker://{0}' + ).format(container_image_name), ] step.dir = SOURCE_FOLDER - build.steps.append(step) source = cloudbuild.Source() From 88ba70c0774b5ccd06cabaf88ff5d04ea6d5c830 Mon Sep 17 00:00:00 2001 From: liferoad Date: Mon, 16 Jun 2025 09:55:31 -0400 Subject: [PATCH 2/2] trigger post-commit --- .../beam_PostCommit_Python_ValidatesContainer_Dataflow.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/trigger_files/beam_PostCommit_Python_ValidatesContainer_Dataflow.json b/.github/trigger_files/beam_PostCommit_Python_ValidatesContainer_Dataflow.json index 12b91fa89ae4..60eb7272a936 100644 --- a/.github/trigger_files/beam_PostCommit_Python_ValidatesContainer_Dataflow.json +++ b/.github/trigger_files/beam_PostCommit_Python_ValidatesContainer_Dataflow.json @@ -1,4 +1,4 @@ { "comment": "Modify this file in a trivial way to cause this test suite to run", - "modification": 3 + "modification": 4 } \ No newline at end of file