[chore] jib 설정분기

Author: jickDo

.github/workflows/deploy-dev.yml

@@ -13,7 +13,7 @@ jobs:
     env:
       DOCKER_USERNAME: ${{ secrets.DOCKER_USERNAME }}
       DOCKER_DEV_REPO: ${{ secrets.DOCKER_DEV_REPO }}
-      CONTAINER_PORT_DEV: ${{ secrets.CONTAINER_PORT_DEV }}
+      CONTAINER_PORT: ${{ secrets.CONTAINER_PORT_DEV }}
     steps:
       - name: 리포지토리를 가져옵니다
         uses: actions/checkout@v4

.github/workflows/deploy-test.yml

@@ -12,8 +12,8 @@ jobs:
     runs-on: ubuntu-latest
     env:
       DOCKER_USERNAME: ${{ secrets.DOCKER_USERNAME }}
-      DOCKER_DEV_REPO: ${{ secrets.DOCKER_TEST_REPO }}
-      CONTAINER_PORT_DEV: ${{ secrets.CONTAINER_PORT_DEV }}
+      DOCKER_TEST_REPO: ${{ secrets.DOCKER_TEST_REPO }}
+      CONTAINER_PORT: ${{ secrets.CONTAINER_PORT_DEV }}
     steps:
       - name: 리포지토리를 가져옵니다
         uses: actions/checkout@v4
@@ -46,7 +46,7 @@ jobs:
     runs-on: ubuntu-latest
     env:
       DOCKER_USERNAME: ${{ secrets.DOCKER_USERNAME }}
-      DOCKER_DEV_REPO: ${{ secrets.DOCKER_TEST_REPO }}
+      DOCKER_TEST_REPO: ${{ secrets.DOCKER_TEST_REPO }}
     steps:
       - name: AWS Credentials 설정
         uses: aws-actions/configure-aws-credentials@v4
@@ -55,7 +55,7 @@ jobs:
           aws-secret-access-key: ${{ secrets.AWS_SECRET_KEY }}
           aws-region: ap-northeast-2
 
-      - name: 개발 서버 배포
+      - name: 테스트 서버 배포
         uses: appleboy/ssh-action@v1.0.3
         with:
           host: ${{ secrets.TEST_AWS_EC2_PUBLIC_IP }}

build.gradle

@@ -91,34 +91,18 @@ tasks.register('copySecret', Copy) {
     into('src/main/resources')
 }
 
-project.ext {
-    dockerUser = System.getenv('DOCKER_USERNAME')
-    containerPort = System.getenv('CONTAINER_PORT') ?: '8081'
-    activeProfile = System.getProperty('spring.profiles.active') ?: System.getenv('ACTIVE_PROFILE') ?: 'dev'
-}
-
-
-def getDockerImage() {
-    switch (activeProfile) {
-        case 'dev':
-            return System.getenv('DOCKER_DEV_REPO')
-        case 'test':
-            return System.getenv('DOCKER_TEST_REPO')
-        default:
-            return System.getenv('DOCKER_DEV_REPO')
-    }
-}
+def isTestEnvironment = System.getenv('DOCKER_TEST_REPO') != null
 
 jib {
     from {
         image = 'eclipse-temurin:21-jre-alpine'
     }
     to {
-        image = "${dockerUser}/${getDockerImage()}"
-        tags = ["latest"]
+        image = System.getenv('DOCKER_USERNAME') + '/' + (isTestEnvironment ? System.getenv('DOCKER_TEST_REPO') : System.getenv('DOCKER_DEV_REPO'))
+        tags = ['latest']
     }
     container {
-        jvmFlags = ["-Dspring.profiles.active=${activeProfile}", '-Dfile.encoding=UTF-8']
-        ports = [containerPort]
+        jvmFlags = ["-Dspring.profiles.active=${isTestEnvironment ? 'test' : 'dev'}", '-Dfile.encoding=UTF-8']
+        ports = ['8081']
     }
 }