vacp2p/status-linea-besu
1
0
Fork 0
mirror of https://github.com/vacp2p/status-linea-besu.git synced 2026-01-09 22:07:59 -05:00
Code Issues Packages Projects Releases Wiki Activity

fixing the docker tags version (#248)

Browse Source 
Signed-off-by: Joshua Fernandes <joshua.fernandes@consensys.net>
This commit is contained in:
Joshua Fernandes
2019-12-11 10:26:32 +10:00
committed by GitHub
parent ac9912d5f2
commit 9d33fda0d0
1 changed files with 6 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
build.gradle
View File

@@ -531,7 +531,8 @@ tasks.register("dockerDistUntar") {
task distDocker(type: Exec) {
dependsOn dockerDistUntar
def dockerBuildVersion = project.hasProperty('release.releaseVersion') ? project.property('release.releaseVersion') : "${rootProject.version}"
def image = project.hasProperty('release.releaseVersion') ? "hyperledger/besu:" + project.property('release.releaseVersion') : "hyperledger/besu:${project.version}"
def imageName = "hyperledger/besu"
def image = "${imageName}:${dockerBuildVersion}"
def dockerBuildDir = "build/docker-besu/"
workingDir "${dockerBuildDir}"
@@ -562,9 +563,10 @@ task testDocker(type: Exec) {
task dockerUpload(type: Exec) {
dependsOn distDocker
def dockerBuildVersion = project.hasProperty('release.releaseVersion') ? project.property('release.releaseVersion') : "${rootProject.version}"
def imageName = "hyperledger/besu"
def azureImageName = "hyperledger.azurecr.io/besu"
def image = project.hasProperty('release.releaseVersion') ? "${imageName}:" + project.property('release.releaseVersion') : "${imageName}:${project.version}"
def image = "${imageName}:${dockerBuildVersion}"
def cmd = "docker push '${image}'"
def additionalTags = []
@@ -572,9 +574,9 @@ task dockerUpload(type: Exec) {
additionalTags.add('develop')
}
if (! version ==~ /.*-SNAPSHOT/) {
if (!(dockerBuildVersion ==~ /.*-SNAPSHOT/)) {
additionalTags.add('latest')
additionalTags.add(version.split(/\./)[0..1].join('.'))
additionalTags.add(dockerBuildVersion.split(/\./)[0..1].join('.'))
}
additionalTags.each { tag ->