Skip to content

Commit

Permalink
Fix for multi-arch docker develop and latest tags (hyperledger#3816)
Browse files Browse the repository at this point in the history
* fix and test docker manifest step for develop and latest tags

Signed-off-by: garyschulte <garyschulte@gmail.com>
  • Loading branch information
garyschulte authored May 11, 2022
1 parent 3869459 commit d3c7268
Showing 1 changed file with 4 additions and 4 deletions.
8 changes: 4 additions & 4 deletions build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -780,19 +780,19 @@ task manifestDocker {
def image = "${dockerImage}:${dockerBuildVersion}"
def archs = ["arm64", "amd64"]
def tags = ["${image}"]

if (project.hasProperty('branch') && project.property('branch') == 'main') {
tags.add("${dockerImage}-develop")
tags.add("${dockerImage}:develop")
}

if (!(dockerBuildVersion ==~ /.*-SNAPSHOT/)) {
tags.add('${dockerImage}-latest')
tags.add('${dockerImage}-' + dockerBuildVersion.split(/\./)[0..1].join('.'))
tags.add('${dockerImage}:latest')
tags.add('${dockerImage}:' + dockerBuildVersion.split(/\./)[0..1].join('.'))
}

doLast {
for (baseTag in tags) {
for (def variant in dockerVariants) {
// Just do variant images for now, later add tags and such
def variantImage = "${baseTag}-${variant}"
def targets = ""
archs.forEach { arch -> targets += "'${variantImage}-${arch}' " }
Expand Down

0 comments on commit d3c7268

Please sign in to comment.