Nemcio/SCM-Manager
1
0
Fork 0
mirror of https://github.com/scm-manager/scm-manager.git synced 2025-10-26 08:06:09 +01:00
Code Issues Packages Projects Releases Activity

Remove ARMv7 build due to errors

Browse Source
This commit is contained in:
René Pfeuffer
2023-07-18 13:14:58 +02:00
parent 4a8ca3eca0
commit 618275ecbf
2 changed files with 2 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
scm-packaging/docker/build.gradle
View File

@@ -77,7 +77,7 @@ task setupBuilder() {
}
if (inspect.exitValue != 0) {
exec {
commandLine = ["docker", "run", "--privileged", "--rm", "tonistiigi/binfmt", "--install", "arm,arm64"]
commandLine = ["docker", "run", "--privileged", "--rm", "tonistiigi/binfmt", "--install", "arm64"]
}
exec {
commandLine = ["docker", "buildx", "create", "--name", "scm-builder", "--driver", "docker-container", "--platform", "linux/arm/v7,linux/arm64/v8,linux/amd64"]
@@ -112,27 +112,6 @@ task pushImages(type: Exec) {
}
task publish() {
doLast {
if (!isSnapshot) {
// get digest of debian arm v7 image
def stdout = new ByteArrayOutputStream()
exec {
commandLine = ["docker", "buildx", "imagetools", "inspect", "--raw", "${dockerRepository}:${dockerTag}-debian"]
standardOutput = stdout
}
def inspect = new JsonSlurper().parseText(stdout.toString())
def manifest = inspect.manifests.find { m -> m.platform.architecture == "arm" }
// append arm image to manifest with version and without os suffix
exec {
commandLine = ["docker", "buildx", "imagetools", "create", "--append", "-t", "${dockerRepository}:${dockerTag}", "${dockerRepository}:${dockerTag}-debian@${manifest.digest}"]
}
// append arm image to latest manifest
exec {
commandLine = ["docker", "buildx", "imagetools", "create", "--append", "-t", "${dockerRepository}:latest", "${dockerRepository}:${dockerTag}-debian@${manifest.digest}"]
}
}
}
dependsOn 'pushImages'
}

2
scm-packaging/docker/docker-bake.hcl
View File

@@ -82,5 +82,5 @@ target "debian" {
tags = [
"${IMAGE}:${VERSION}-debian"
]
platforms = ["linux/amd64", "linux/arm64/v8", "linux/arm/v7"]
platforms = ["linux/amd64", "linux/arm64/v8"]
}