RELEASE : 0.1.0

Author: jhkim31

Dockerfile

@@ -1,5 +1,7 @@
 FROM openjdk:17-oracle
 
+ARG VERSION
+
 ARG MYSQL_HOST
 ARG MYSQL_PORT
 ARG MYSQL_PASSWORD
@@ -11,7 +13,6 @@ ARG REDIS_HOST
 ARG REDIS_PORT
 ARG REDIS_PASSWORD
 
-
 ENV MYSQL_HOST=${MYSQL_HOST}
 ENV MYSQL_PORT=${MYSQL_PORT}
 ENV MYSQL_PASSWORD=${MYSQL_PASSWORD}
@@ -22,6 +23,7 @@ ENV JWT_SECRET_KEY=${JWT_SECRET_KEY}
 ENV REDIS_HOST=${REDIS_HOST}
 ENV REDIS_PORT=${REDIS_PORT}
 ENV REDIS_PASSWORD=${REDIS_PASSWORD}
+ENV VERSION=${VERSION}
 
 RUN microdnf install findutils
 
@@ -31,4 +33,4 @@ COPY . /app
 RUN chmod +x ./gradlew
 RUN ./gradlew build -x test
 
-CMD ["java", "-jar", "-Dspring.profiles.active=product",  "build/libs/jshop-0.0.6-hotfix.1.jar"]
+CMD ["java", "-jar", "-Dspring.profiles.active=product",  "build/libs/web-$VERSION.jar"]

build.gradle

@@ -5,7 +5,7 @@ plugins {
 
 allprojects {
     group = 'jshop'
-    version = '0.0.6-hotfix.1'
+    version = '0.1.0'
 
     java {
         sourceCompatibility = '17'

jenkins/deploy.jenkins

@@ -15,8 +15,8 @@ pipeline {
         REDIS_HOST = credentials('REDIS_HOST')
         REDIS_PORT = credentials('REDIS_PORT')
         REDIS_PASSWORD = credentials('REDIS_PASSWORD')
-
-        IMAGE = 'jshop.kr.ncr.ntruss.com/jshop:v0.0.6-hotfix.1'
+        VERSION = '0.1.0'
+        IMAGE = 'jshop.kr.ncr.ntruss.com/jshop'
     }
 
     stages {
@@ -35,7 +35,7 @@ pipeline {
             steps {
                 script {
                     echo 'build'
-                    sh "docker build -t ${IMAGE} --build-arg MYSQL_HOST=${MYSQL_HOST} --build-arg MYSQL_PORT=${MYSQL_PORT} --build-arg MYSQL_USERNAME=${MYSQL_USERNAME} --build-arg MYSQL_PASSWORD=${MYSQL_PASSWORD} --build-arg JWT_SECRET_KEY=${JWT_SECRET_KEY} --build-arg REDIS_HOST=${REDIS_HOST} --build-arg REDIS_PORT=${REDIS_PORT} --build-arg REDIS_PASSWORD=${REDIS_PASSWORD} ."
+                    sh "docker build -t ${IMAGE}:${VERSION} --build-arg MYSQL_HOST=${MYSQL_HOST} --build-arg MYSQL_PORT=${MYSQL_PORT} --build-arg MYSQL_USERNAME=${MYSQL_USERNAME} --build-arg MYSQL_PASSWORD=${MYSQL_PASSWORD} --build-arg JWT_SECRET_KEY=${JWT_SECRET_KEY} --build-arg REDIS_HOST=${REDIS_HOST} --build-arg REDIS_PORT=${REDIS_PORT} --build-arg REDIS_PASSWORD=${REDIS_PASSWORD} ."
                 }
             }
         }
@@ -45,7 +45,7 @@ pipeline {
                 script {
                     echo 'push'
                     sh "echo ${NCLOUD_SECRET_KEY} | docker login jshop.kr.ncr.ntruss.com -u ${NCLOUD_ACCESS_KEY_ID} --password-stdin"                
-                    sh "docker push ${IMAGE}"
+                    sh "docker push ${IMAGE}:${VERSION}"
                 }
             }
         }
@@ -64,7 +64,7 @@ pipeline {
                     SERVERS.each { server ->
                         sshagent(['ssh-deploy-key']) {
                             sh "ssh jhkim@${server} 'echo $NCLOUD_SECRET_KEY | docker login jshop.kr.ncr.ntruss.com -u ${NCLOUD_ACCESS_KEY_ID} --password-stdin'"
-                            sh "ssh jhkim@${server} 'docker service update --image ${IMAGE} jshop_jshop --with-registry-auth'"
+                            sh "ssh jhkim@${server} 'docker service update --image ${IMAGE}:${VERSION} jshop_jshop --with-registry-auth'"
                         }
                     }                                            
                 }