This is an automated email from the ASF dual-hosted git repository.
chamikaramj 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 4621a0b229f Revert "[Experimental] Use zstd compression in Docker
builds" (#40105)
4621a0b229f is described below
commit 4621a0b229f31e94a819eb5c28bc9b95435f4524
Author: Chamikara Jayalath <[email protected]>
AuthorDate: Sat Sep 12 09:08:54 2026 -0700
Revert "[Experimental] Use zstd compression in Docker builds" (#40105)
---
...tCommit_Python_ValidatesContainer_Dataflow.json | 2 +-
.../beam_PreCommit_Flink_Container.json | 2 +-
.../org/apache/beam/gradle/BeamDockerPlugin.groovy | 24 +++++-----------------
3 files changed, 7 insertions(+), 21 deletions(-)
diff --git
a/.github/trigger_files/beam_PostCommit_Python_ValidatesContainer_Dataflow.json
b/.github/trigger_files/beam_PostCommit_Python_ValidatesContainer_Dataflow.json
index 327fe1987c5..60eb7272a93 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": 5
+ "modification": 4
}
\ No newline at end of file
diff --git a/.github/trigger_files/beam_PreCommit_Flink_Container.json
b/.github/trigger_files/beam_PreCommit_Flink_Container.json
index 62ae7886c57..bbdc3a3910e 100644
--- a/.github/trigger_files/beam_PreCommit_Flink_Container.json
+++ b/.github/trigger_files/beam_PreCommit_Flink_Container.json
@@ -1,4 +1,4 @@
{
"comment": "Modify this file in a trivial way to cause this test suite to
run",
- "modification": 4
+ "modification": 3
}
diff --git
a/buildSrc/src/main/groovy/org/apache/beam/gradle/BeamDockerPlugin.groovy
b/buildSrc/src/main/groovy/org/apache/beam/gradle/BeamDockerPlugin.groovy
index bfde0155be9..9aaeaea9695 100644
--- a/buildSrc/src/main/groovy/org/apache/beam/gradle/BeamDockerPlugin.groovy
+++ b/buildSrc/src/main/groovy/org/apache/beam/gradle/BeamDockerPlugin.groovy
@@ -61,7 +61,6 @@ class BeamDockerPlugin implements Plugin<Project> {
boolean push = false
String builder = null
String target = null
- String compression = 'zstd'
File resolvedDockerfile = null
File resolvedDockerComposeTemplate = null
@@ -73,9 +72,6 @@ class BeamDockerPlugin implements Plugin<Project> {
DockerExtension(Project project) {
this.project = project
this.copySpec = project.copySpec()
- if (project.hasProperty('docker-compression')) {
- this.compression = project.property('docker-compression')
- }
}
void resolvePathsAndValidate() {
@@ -241,23 +237,13 @@ class BeamDockerPlugin implements Plugin<Project> {
if (!ext.platform.isEmpty()) {
buildCommandLine.addAll('--platform', String.join(',', ext.platform))
}
- if (ext.load && ext.push) {
- throw new Exception("cannot combine 'push' and 'load' options")
+ if (ext.load) {
+ buildCommandLine.add '--load'
}
- if (ext.compression != null && !ext.compression.isEmpty()) {
- if (ext.push) {
- buildCommandLine.add
"--output=type=registry,compression=${ext.compression},force-compression=true,oci-mediatypes=true"
- } else if (ext.load) {
- buildCommandLine.add '--load'
- } else {
- buildCommandLine.add
"--output=type=image,compression=${ext.compression},force-compression=true,oci-mediatypes=true"
- }
- } else {
+ if (ext.push) {
+ buildCommandLine.add '--push'
if (ext.load) {
- buildCommandLine.add '--load'
- }
- if (ext.push) {
- buildCommandLine.add '--push'
+ throw new Exception("cannot combine 'push' and 'load' options")
}
}
if (ext.builder != null) {
