AtHeartEngineer/linea-besu
1
0
Fork 0
mirror of https://github.com/vacp2p/linea-besu.git synced 2026-01-09 15:37:54 -05:00
Code Issues Packages Projects Releases Wiki Activity

fix distDocker - revert gradle change to providers.exec (#8340)

Browse Source 
Signed-off-by: Sally MacFarlane <macfarla.github@gmail.com>
This commit is contained in:
Sally MacFarlane
2025-02-21 19:20:41 +10:00
committed by GitHub
parent ecda0cdbb2
commit 7390519095
2 changed files with 12 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
build.gradle
View File

@@ -826,7 +826,7 @@ task distDocker {
from file("${projectDir}/docker/Dockerfile")
into(dockerBuildDir)
}
providers.exec {
exec {
def image = "${dockerImageName}:${dockerBuildVersion}"
def dockerPlatform = ""
if (project.hasProperty('docker-platform')){
@@ -850,7 +850,7 @@ task testDocker {
}
doLast {
providers.exec {
exec {
def image = project.hasProperty('release.releaseVersion') ? "${dockerImageName}:" + project.property('release.releaseVersion') : "${dockerImageName}:${project.version}"
workingDir "${projectDir}/docker"
executable shell
@@ -874,7 +874,7 @@ task dockerUpload {
}
doLast {
providers.exec {
exec {
def archVariantImage = "${image}-${architecture}"
def cmd = "docker tag '${image}' '${archVariantImage}' && docker push '${archVariantImage}'"
println "Executing '${cmd}'"
@@ -891,13 +891,13 @@ task dockerUploadRelease {
doLast {
for (def architecture in archs) {
providers.exec {
exec {
def cmd = "docker pull '${image}-${architecture}' && docker tag '${image}-${architecture}' '${dockerImageName}:latest-${architecture}'"
println "Executing '${cmd}'"
executable shell
args "-c", cmd
}
providers.exec {
exec {
def cmd = "docker push '${dockerImageName}:latest-${architecture}'"
println "Executing '${cmd}'"
executable shell
@@ -905,14 +905,14 @@ task dockerUploadRelease {
}
providers.exec {
exec {
def archImage = "${image}-${architecture}"
def cmd = "docker pull '${archImage}' && docker tag ${archImage} '${dockerImageName}:latest-${architecture}'"
println "Executing '${cmd}'"
executable shell
args "-c", cmd
}
providers.exec {
exec {
def cmd = "docker push '${dockerImageName}:latest-${architecture}'"
println "Executing '${cmd}'"
executable shell
@@ -928,7 +928,7 @@ task manifestDocker {
"arm64",
"amd64"] //TODO: this assumes dockerUpload task has already been run on 2 different archs!
doLast {
providers.exec {
exec {
def targets = ""
archs.forEach { arch -> targets += "'${image}-${arch}' " }
def cmd = "docker manifest create '${image}' ${targets}"
@@ -936,7 +936,7 @@ task manifestDocker {
executable shell
args "-c", cmd
}
providers.exec {
exec {
def cmd = "docker manifest push '${image}'"
println "Executing '${cmd}'"
executable shell
@@ -951,7 +951,7 @@ task manifestDockerRelease {
doLast {
providers.exec {
exec {
def targets = ""
archs.forEach { arch -> targets += "'${baseTag}-${arch}' " }
def cmd = "docker manifest create '${baseTag}' ${targets} --amend"
@@ -959,7 +959,7 @@ task manifestDockerRelease {
executable shell
args "-c", cmd
}
providers.exec {
exec {
def cmd = "docker manifest push '${baseTag}'"
println "Executing '${cmd}'"
executable shell

2
ethereum/referencetests/build.gradle
View File

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