Skip to content

Commit 7390519

Browse files
authoredFeb 21, 2025··
fix distDocker - revert gradle change to providers.exec (#8340)
Signed-off-by: Sally MacFarlane <macfarla.github@gmail.com>
1 parent ecda0cd commit 7390519

File tree

2 files changed

+12
-12
lines changed

2 files changed

+12
-12
lines changed
 

‎build.gradle

+11-11
Original file line numberDiff line numberDiff line change
@@ -826,7 +826,7 @@ task distDocker {
826826
from file("${projectDir}/docker/Dockerfile")
827827
into(dockerBuildDir)
828828
}
829-
providers.exec {
829+
exec {
830830
def image = "${dockerImageName}:${dockerBuildVersion}"
831831
def dockerPlatform = ""
832832
if (project.hasProperty('docker-platform')){
@@ -850,7 +850,7 @@ task testDocker {
850850
}
851851

852852
doLast {
853-
providers.exec {
853+
exec {
854854
def image = project.hasProperty('release.releaseVersion') ? "${dockerImageName}:" + project.property('release.releaseVersion') : "${dockerImageName}:${project.version}"
855855
workingDir "${projectDir}/docker"
856856
executable shell
@@ -874,7 +874,7 @@ task dockerUpload {
874874
}
875875

876876
doLast {
877-
providers.exec {
877+
exec {
878878
def archVariantImage = "${image}-${architecture}"
879879
def cmd = "docker tag '${image}' '${archVariantImage}' && docker push '${archVariantImage}'"
880880
println "Executing '${cmd}'"
@@ -891,28 +891,28 @@ task dockerUploadRelease {
891891
doLast {
892892
for (def architecture in archs) {
893893

894-
providers.exec {
894+
exec {
895895
def cmd = "docker pull '${image}-${architecture}' && docker tag '${image}-${architecture}' '${dockerImageName}:latest-${architecture}'"
896896
println "Executing '${cmd}'"
897897
executable shell
898898
args "-c", cmd
899899
}
900-
providers.exec {
900+
exec {
901901
def cmd = "docker push '${dockerImageName}:latest-${architecture}'"
902902
println "Executing '${cmd}'"
903903
executable shell
904904
args "-c", cmd
905905
}
906906

907907

908-
providers.exec {
908+
exec {
909909
def archImage = "${image}-${architecture}"
910910
def cmd = "docker pull '${archImage}' && docker tag ${archImage} '${dockerImageName}:latest-${architecture}'"
911911
println "Executing '${cmd}'"
912912
executable shell
913913
args "-c", cmd
914914
}
915-
providers.exec {
915+
exec {
916916
def cmd = "docker push '${dockerImageName}:latest-${architecture}'"
917917
println "Executing '${cmd}'"
918918
executable shell
@@ -928,15 +928,15 @@ task manifestDocker {
928928
"arm64",
929929
"amd64"] //TODO: this assumes dockerUpload task has already been run on 2 different archs!
930930
doLast {
931-
providers.exec {
931+
exec {
932932
def targets = ""
933933
archs.forEach { arch -> targets += "'${image}-${arch}' " }
934934
def cmd = "docker manifest create '${image}' ${targets}"
935935
println "Executing '${cmd}'"
936936
executable shell
937937
args "-c", cmd
938938
}
939-
providers.exec {
939+
exec {
940940
def cmd = "docker manifest push '${image}'"
941941
println "Executing '${cmd}'"
942942
executable shell
@@ -951,15 +951,15 @@ task manifestDockerRelease {
951951

952952
doLast {
953953

954-
providers.exec {
954+
exec {
955955
def targets = ""
956956
archs.forEach { arch -> targets += "'${baseTag}-${arch}' " }
957957
def cmd = "docker manifest create '${baseTag}' ${targets} --amend"
958958
println "Executing '${cmd}'"
959959
executable shell
960960
args "-c", cmd
961961
}
962-
providers.exec {
962+
exec {
963963
def cmd = "docker manifest push '${baseTag}'"
964964
println "Executing '${cmd}'"
965965
executable shell

‎ethereum/referencetests/build.gradle

+1-1
Original file line numberDiff line numberDiff line change
@@ -229,7 +229,7 @@ tasks.register('validateReferenceTestSubmodule') {
229229
def expectedHash = '9201075490807f58811078e9bb5ec895b4ac01a5'
230230
def submodulePath = java.nio.file.Path.of("${rootProject.projectDir}", "ethereum/referencetests/src/reference-test/external-resources").toAbsolutePath()
231231
try {
232-
providers.exec {
232+
exec {
233233
commandLine 'git', 'submodule', 'status', submodulePath
234234
standardOutput = result
235235
errorOutput = result

0 commit comments

Comments
 (0)
Please sign in to comment.