Merge branch 'SHIBUI-1970'

TIER · Aug 13, 2021 · 0d0c219 · 0d0c219
2 parents cf007d3 + e95135f
commit 0d0c219
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 4 deletions.
diff --git a/backend/build.gradle b/backend/build.gradle
@@ -4,8 +4,8 @@ plugins {
     id 'org.springframework.boot' version '2.4.2'
     id 'com.gorylenko.gradle-git-properties' version '1.4.21'
     id 'io.freefair.lombok' version '5.3.0'
-    id 'com.palantir.docker' version '0.20.1'
-    id 'com.palantir.docker-run' version '0.20.1'
+    id 'com.palantir.docker' version '0.28.0'
+    id 'com.palantir.docker-run' version '0.28.0'
 }
 
 apply plugin: 'io.spring.dependency-management'
@@ -329,10 +329,15 @@ jacocoTestReport {
     }
 }
 
+ext {
+    now = new Date().format("yyyyMMddHHmmss", TimeZone.getTimeZone('GMT'))
+}
+
 tasks.docker.dependsOn tasks.bootWar
 docker {
     name 'unicon/shibui'
-    tags 'latest'
+    tag 'version', "unicon/shibui:${project.version}${!project.version.endsWith('SNAPSHOT') ? '' : "-${now}"}"
+    tag 'latest', "unicon/shibui:latest"
     pull true
     noCache true
     files tasks.bootWar.outputs

diff --git a/build.gradle b/build.gradle
@@ -10,7 +10,7 @@ subprojects {
     }
 }
 
-tasks.findByName('release').dependsOn project.getTasksByName('test', true)
+// tasks.findByName('release').dependsOn project.getTasksByName('test', true)
 
 githubRelease {
     token project.'i2.github.token'
@@ -21,4 +21,11 @@ githubRelease {
     apiEndpoint project.'i2.github.apiEndpoint'
 }
 
+release {
+    git {
+        putToRemote = 'i2'
+    }
+}
+
 afterReleaseBuild.dependsOn project.getTasksByName('githubRelease', false)
+afterReleaseBuild.dependsOn project.getTasksByName('dockerTagsPush', false)