Prod 배포

.github/workflows/cd-api-dev.yml

@@ -21,7 +21,6 @@ jobs:
 
   build-api:
     needs: detect-changes
-    if: needs.detect-changes.outputs.api_changed == 'true'
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v4
@@ -69,7 +68,7 @@ jobs:
 
   deploy-api:
     needs: build-api
-    runs-on: [ self-hosted, dev-payment ]
+    runs-on: [ self-hosted, org, dev, new ]
     steps:
       - name: Stop existing container
         run: sudo docker rm -f kokomen-payment-dev-api || true
@@ -100,7 +99,9 @@ jobs:
           MYSQL_ROOT_PASSWORD_DEV: ${{ secrets.MYSQL_ROOT_PASSWORD_DEV }}
           SPRING_DATASOURCE_USERNAME_DEV: ${{ secrets.SPRING_DATASOURCE_USERNAME_DEV }}
           SPRING_DATASOURCE_PASSWORD_DEV: ${{ secrets.SPRING_DATASOURCE_PASSWORD_DEV }}
+          SPRING_DATASOURCE_URL_DEV: ${{ secrets.SPRING_DATASOURCE_URL_DEV }}
+          MYSQL_HOST: ${{ secrets.MYSQL_HOST }}
         run: |
           export HOSTNAME=$(hostname)
           cd kokomen-payment/docker/dev
-          sudo -E docker compose -f docker-compose-dev.yml up -d kokomen-payment-dev-api kokomen-payment-mysql-dev
+          sudo -E docker compose -f docker-compose-dev.yml up -d kokomen-payment-dev-api

.github/workflows/cd-api-prod.yml

@@ -21,7 +21,6 @@ jobs:
 
   build-api:
     needs: detect-changes
-    if: needs.detect-changes.outputs.api_changed == 'true'
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v4
@@ -69,7 +68,7 @@ jobs:
 
   deploy-api:
     needs: build-api
-    runs-on: [ self-hosted, prod-payment ]
+    runs-on: [ self-hosted, prod, new, payment ]
     steps:
       - name: Stop existing container
         run: sudo docker rm -f kokomen-payment-api || true

.github/workflows/cd-internal-dev.yml

@@ -21,7 +21,6 @@ jobs:
 
   build-internal:
     needs: detect-changes
-    if: needs.detect-changes.outputs.internal_changed == 'true'
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v4
@@ -69,7 +68,7 @@ jobs:
 
   deploy-internal:
     needs: build-internal
-    runs-on: [ self-hosted, dev-payment ]
+    runs-on: [ self-hosted, org, dev, new ]
     steps:
       - name: Stop existing container
         run: sudo docker rm -f kokomen-payment-dev-internal || true
@@ -100,7 +99,8 @@ jobs:
           MYSQL_ROOT_PASSWORD_DEV: ${{ secrets.MYSQL_ROOT_PASSWORD_DEV }}
           SPRING_DATASOURCE_USERNAME_DEV: ${{ secrets.SPRING_DATASOURCE_USERNAME_DEV }}
           SPRING_DATASOURCE_PASSWORD_DEV: ${{ secrets.SPRING_DATASOURCE_PASSWORD_DEV }}
+          SPRING_DATASOURCE_URL_DEV: ${{ secrets.SPRING_DATASOURCE_URL_DEV }}
         run: |
           export HOSTNAME=$(hostname)
           cd kokomen-payment/docker/dev
-          sudo -E docker compose -f docker-compose-dev.yml up -d kokomen-payment-dev-internal kokomen-payment-mysql-dev
+          sudo -E docker compose -f docker-compose-dev.yml up -d kokomen-payment-dev-internal

.github/workflows/cd-internal-prod.yml

@@ -21,7 +21,6 @@ jobs:
 
   build-internal:
     needs: detect-changes
-    if: needs.detect-changes.outputs.internal_changed == 'true'
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v4
@@ -69,7 +68,7 @@ jobs:
 
   deploy-internal:
     needs: build-internal
-    runs-on: [ self-hosted, prod-payment ]
+    runs-on: [ self-hosted, prod, new, payment ]
 
     steps:
       - name: Stop existing container

.github/workflows/ci-api-test.yml

@@ -20,7 +20,6 @@ jobs:
 
   build:
     needs: detect-changes
-    if: needs.detect-changes.outputs.api_changed == 'true'
     runs-on: ubuntu-latest
     permissions:
       checks: write

.github/workflows/ci-internal-test.yml

@@ -20,7 +20,6 @@ jobs:
 
   build:
     needs: detect-changes
-    if: needs.detect-changes.outputs.internal_changed == 'true'
     runs-on: ubuntu-latest
     permissions:
       checks: write

docker/dev/docker-compose-dev.yml

@@ -14,6 +14,7 @@ services:
       JAVA_TOOL_OPTIONS: -Duser.timezone=Asia/Seoul
       HOSTNAME: ${HOSTNAME}
       SPRING_PROFILES_ACTIVE: dev
+      SPRING_DATASOURCE_URL_DEV: ${SPRING_DATASOURCE_URL_DEV}
       SPRING_DATASOURCE_USERNAME_DEV: ${SPRING_DATASOURCE_USERNAME_DEV}
       SPRING_DATASOURCE_PASSWORD_DEV: ${SPRING_DATASOURCE_PASSWORD_DEV}
     networks:
@@ -33,51 +34,12 @@ services:
       JAVA_TOOL_OPTIONS: -Duser.timezone=Asia/Seoul
       HOSTNAME: ${HOSTNAME}
       SPRING_PROFILES_ACTIVE: dev
+      SPRING_DATASOURCE_URL_DEV: ${SPRING_DATASOURCE_URL_DEV}
       SPRING_DATASOURCE_USERNAME_DEV: ${SPRING_DATASOURCE_USERNAME_DEV}
       SPRING_DATASOURCE_PASSWORD_DEV: ${SPRING_DATASOURCE_PASSWORD_DEV}
     networks:
       - dev-kokomen-net
 
-  kokomen-payment-mysql-dev:
-    image: mysql:8.4.5
-    container_name: kokomen-payment-mysql-dev
-    command:
-      [
-        "mysqld",
-        "--character-set-server=utf8mb4",
-        "--collation-server=utf8mb4_general_ci"
-      ]
-    volumes:
-      - payment-mysql-data:/var/lib/mysql
-      - payment-mysql-init:/docker-entrypoint-initdb.d
-    expose:
-      - 3306
-    restart: always
-    environment:
-      TZ: Asia/Seoul
-      MYSQL_USER: ${SPRING_DATASOURCE_USERNAME_DEV}
-      MYSQL_PASSWORD: ${SPRING_DATASOURCE_PASSWORD_DEV}
-      MYSQL_ROOT_PASSWORD: ${MYSQL_ROOT_PASSWORD_DEV}
-      MYSQL_DATABASE: kokomen-payment-dev
-      LANG: C.UTF-8
-      MYSQL_INIT_CONNECT: "SET NAMES utf8mb4"
-    networks:
-      - dev-kokomen-net
-
-  payment-mysql-dev-exporter:
-    image: prom/mysqld-exporter
-    container_name: payment-mysql-dev-exporter
-    restart: unless-stopped
-    environment:
-      DATA_SOURCE_NAME: "root:${MYSQL_ROOT_PASSWORD_DEV}@tcp(kokomen-payment-mysql-dev:3306)/"
-      TZ: Asia/Seoul
-    expose:
-      - 9104
-    volumes:
-      - ./my.cnf:/.my.cnf
-    networks:
-      - dev-kokomen-net
-
   promtail-payment-dev:
     image: grafana/promtail
     container_name: promtail-payment-dev
@@ -97,8 +59,6 @@ services:
       - dev-kokomen-net
 
 volumes:
-  payment-mysql-data:
-  payment-mysql-init:
   promtail-payment-tmp:
 
 networks:

domain/src/main/resources/application-domain.yml

@@ -33,7 +33,7 @@ spring:
     activate:
       on-profile: dev
   datasource:
-    url: jdbc:mysql://kokomen-payment-mysql-dev:3306/kokomen-payment-dev
+    url: ${SPRING_DATASOURCE_URL_DEV}
     username: ${SPRING_DATASOURCE_USERNAME_DEV}
     password: ${SPRING_DATASOURCE_PASSWORD_DEV}
     driver-class-name: com.mysql.cj.jdbc.Driver