@@ -57,7 +57,7 @@ def buildTime() {
5757// set the shell command to use according to os
5858def shell = org.gradle.internal.os.OperatingSystem . current(). isWindows() ? " ${ projectDir} \\ wslsh.bat" : ' /bin/bash'
5959
60- def dockerBuildVersion = project. hasProperty(' release.releaseVersion' ) ? project. getProperty(' release.releaseVersion' ) : " ${ version } "
60+ def dockerBuildVersion = project. hasProperty(' release.releaseVersion' ) ? project. getProperty(' release.releaseVersion' ) : " latest "
6161def dockerOrgName = project. hasProperty(' dockerOrgName' ) ? project. getProperty(" dockerOrgName" ) : " tronprotocol"
6262def dockerArtifactName = project. hasProperty(" dockerArtifactName" ) ? project. getProperty(" dockerArtifactName" ) : " java-tron"
6363def dockerImageName = " ${ dockerOrgName} /${ dockerArtifactName} "
@@ -92,13 +92,6 @@ task sourceDocker {
9292 }
9393}
9494
95- // Takes the version and if it contains SNAPSHOT, alpha, beta or RC in version then return true indicating an interim build
96- def isInterimBuild (dockerBuildVersion ) {
97- return (dockerBuildVersion ==~ / .*-SNAPSHOT/ ) || (dockerBuildVersion ==~ / .*-alpha/ )
98- || (dockerBuildVersion ==~ / .*-beta/ ) || (dockerBuildVersion ==~ / .*-RC.*/ )
99- || (dockerBuildVersion ==~ / .*develop.*/ )
100- }
101-
10295
10396task testDocker {
10497 dependsOn sourceDocker
@@ -121,25 +114,11 @@ task testDocker {
121114// Make sure to `docker login` first
122115task dockerUpload {
123116 dependsOn sourceDocker
124- def architecture = System . getenv(' architecture' )
125- if (architecture == null ) {
126- architecture = " amd64" // set default as amd64
127- }
128117 def image = " ${ dockerImageName} :${ dockerBuildVersion} "
129- def additionalTags = []
130-
131- if (project. hasProperty(' branch' ) && project. property(' branch' ) == ' main' ) {
132- additionalTags. add(' develop' )
133- }
134-
135- if (! isInterimBuild(dockerBuildVersion)) {
136- additionalTags. add(dockerBuildVersion. split(/ \. / )[0 .. 1 ]. join(' .' ))
137- }
138118
139119 doLast {
140120 exec {
141- def archVariantImage = " ${ image} -${ architecture} "
142- def cmd = " docker tag '${ image} ' '${ archVariantImage} ' && docker push '${ archVariantImage} '"
121+ def cmd = " docker push '${ image} '"
143122 println " Executing '${ cmd} '"
144123 executable shell
145124 args " -c" , cmd
0 commit comments