diff --git a/.github/trigger_files/beam_PostCommit_Python_ValidatesContainer_Dataflow.json b/.github/trigger_files/beam_PostCommit_Python_ValidatesContainer_Dataflow.json index 327fe1987c50..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": 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 62ae7886c573..bbdc3a3910ef 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 bfde0155be92..9aaeaea96950 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 { 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 { 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 { 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) {