From f33069a24d60a8de5feeb92077afc17b5bfe3510 Mon Sep 17 00:00:00 2001 From: unifolio0 Date: Tue, 25 Nov 2025 17:39:49 +0900 Subject: [PATCH 1/7] =?UTF-8?q?chore:=20cd=20=EC=88=98=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .github/workflows/cd-api-dev.yml | 6 ++- docker/dev/docker-compose-dev.yml | 39 +++---------------- .../src/main/resources/application-domain.yml | 2 +- 3 files changed, 11 insertions(+), 36 deletions(-) diff --git a/.github/workflows/cd-api-dev.yml b/.github/workflows/cd-api-dev.yml index 4dd47e8..0b34e9c 100644 --- a/.github/workflows/cd-api-dev.yml +++ b/.github/workflows/cd-api-dev.yml @@ -69,7 +69,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 +100,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 diff --git a/docker/dev/docker-compose-dev.yml b/docker/dev/docker-compose-dev.yml index 23b6815..5ff7ab6 100644 --- a/docker/dev/docker-compose-dev.yml +++ b/docker/dev/docker-compose-dev.yml @@ -38,43 +38,18 @@ services: 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 + command: + - '--mysqld.address=${MYSQL_HOST}:3306' + - '--mysqld.username=${SPRING_DATASOURCE_USERNAME_DEV}' environment: - DATA_SOURCE_NAME: "root:${MYSQL_ROOT_PASSWORD_DEV}@tcp(kokomen-payment-mysql-dev:3306)/" + MYSQLD_EXPORTER_PASSWORD: "${SPRING_DATASOURCE_PASSWORD_DEV}" TZ: Asia/Seoul - expose: - - 9104 - volumes: - - ./my.cnf:/.my.cnf + ports: + - "9104:9104" networks: - dev-kokomen-net @@ -97,8 +72,6 @@ services: - dev-kokomen-net volumes: - payment-mysql-data: - payment-mysql-init: promtail-payment-tmp: networks: diff --git a/domain/src/main/resources/application-domain.yml b/domain/src/main/resources/application-domain.yml index b587d0a..d75b7a6 100644 --- a/domain/src/main/resources/application-domain.yml +++ b/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 From cf9083f414a716f7ae9dba185a439f08799a06d5 Mon Sep 17 00:00:00 2001 From: unifolio0 Date: Tue, 25 Nov 2025 17:41:15 +0900 Subject: [PATCH 2/7] =?UTF-8?q?chore:=20cd=20=EC=88=98=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .github/workflows/cd-api-dev.yml | 1 - .github/workflows/cd-api-prod.yml | 1 - .github/workflows/cd-internal-dev.yml | 1 - .github/workflows/cd-internal-prod.yml | 1 - .github/workflows/ci-api-test.yml | 1 - .github/workflows/ci-internal-test.yml | 1 - 6 files changed, 6 deletions(-) diff --git a/.github/workflows/cd-api-dev.yml b/.github/workflows/cd-api-dev.yml index 0b34e9c..8445372 100644 --- a/.github/workflows/cd-api-dev.yml +++ b/.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 diff --git a/.github/workflows/cd-api-prod.yml b/.github/workflows/cd-api-prod.yml index 570e991..0b3487a 100644 --- a/.github/workflows/cd-api-prod.yml +++ b/.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 diff --git a/.github/workflows/cd-internal-dev.yml b/.github/workflows/cd-internal-dev.yml index c617a95..7739164 100644 --- a/.github/workflows/cd-internal-dev.yml +++ b/.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 diff --git a/.github/workflows/cd-internal-prod.yml b/.github/workflows/cd-internal-prod.yml index edad1a9..a674b73 100644 --- a/.github/workflows/cd-internal-prod.yml +++ b/.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 diff --git a/.github/workflows/ci-api-test.yml b/.github/workflows/ci-api-test.yml index 60f75c7..c09101b 100644 --- a/.github/workflows/ci-api-test.yml +++ b/.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 diff --git a/.github/workflows/ci-internal-test.yml b/.github/workflows/ci-internal-test.yml index cf12117..b29029b 100644 --- a/.github/workflows/ci-internal-test.yml +++ b/.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 From 68223f1430dac8110095d018b7fae5659d55a3a7 Mon Sep 17 00:00:00 2001 From: unifolio0 Date: Tue, 25 Nov 2025 17:42:22 +0900 Subject: [PATCH 3/7] =?UTF-8?q?chore:=20cd=20=EC=88=98=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .github/workflows/cd-internal-dev.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/cd-internal-dev.yml b/.github/workflows/cd-internal-dev.yml index 7739164..45ca476 100644 --- a/.github/workflows/cd-internal-dev.yml +++ b/.github/workflows/cd-internal-dev.yml @@ -68,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 From 27b1c23645a802186a89447d50b05d2ad2023d05 Mon Sep 17 00:00:00 2001 From: unifolio0 Date: Tue, 25 Nov 2025 17:44:06 +0900 Subject: [PATCH 4/7] =?UTF-8?q?chore:=20cd=20=EC=88=98=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .github/workflows/cd-internal-dev.yml | 2 +- docker/dev/my.cnf | 4 ---- 2 files changed, 1 insertion(+), 5 deletions(-) delete mode 100644 docker/dev/my.cnf diff --git a/.github/workflows/cd-internal-dev.yml b/.github/workflows/cd-internal-dev.yml index 45ca476..3196aa7 100644 --- a/.github/workflows/cd-internal-dev.yml +++ b/.github/workflows/cd-internal-dev.yml @@ -102,4 +102,4 @@ jobs: 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 diff --git a/docker/dev/my.cnf b/docker/dev/my.cnf deleted file mode 100644 index 4e6e06c..0000000 --- a/docker/dev/my.cnf +++ /dev/null @@ -1,4 +0,0 @@ -[client] -user=root -password=root -host=kokomen-payment-mysql-dev From 4b0f2248509ba36ce5115fae0ea962d2ce8c6f3d Mon Sep 17 00:00:00 2001 From: unifolio0 Date: Tue, 25 Nov 2025 23:11:15 +0900 Subject: [PATCH 5/7] =?UTF-8?q?chore:=20cd=20=EC=88=98=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- docker/dev/docker-compose-dev.yml | 17 ++--------------- 1 file changed, 2 insertions(+), 15 deletions(-) diff --git a/docker/dev/docker-compose-dev.yml b/docker/dev/docker-compose-dev.yml index 5ff7ab6..6a41c15 100644 --- a/docker/dev/docker-compose-dev.yml +++ b/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,26 +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 - payment-mysql-dev-exporter: - image: prom/mysqld-exporter - container_name: payment-mysql-dev-exporter - restart: unless-stopped - command: - - '--mysqld.address=${MYSQL_HOST}:3306' - - '--mysqld.username=${SPRING_DATASOURCE_USERNAME_DEV}' - environment: - MYSQLD_EXPORTER_PASSWORD: "${SPRING_DATASOURCE_PASSWORD_DEV}" - TZ: Asia/Seoul - ports: - - "9104:9104" - networks: - - dev-kokomen-net - promtail-payment-dev: image: grafana/promtail container_name: promtail-payment-dev From 342b1f96c0be9db2c4c1c23bb9404d14028383ae Mon Sep 17 00:00:00 2001 From: unifolio0 Date: Tue, 25 Nov 2025 23:41:22 +0900 Subject: [PATCH 6/7] =?UTF-8?q?chore:=20cd=20=EC=88=98=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .github/workflows/cd-internal-dev.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/cd-internal-dev.yml b/.github/workflows/cd-internal-dev.yml index 3196aa7..738c9e8 100644 --- a/.github/workflows/cd-internal-dev.yml +++ b/.github/workflows/cd-internal-dev.yml @@ -99,6 +99,7 @@ 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 From 2d409160ef8077bb704d72a2383bf3eeb73bbe7d Mon Sep 17 00:00:00 2001 From: unifolio0 Date: Wed, 26 Nov 2025 21:16:11 +0900 Subject: [PATCH 7/7] =?UTF-8?q?chore:=20cd=20=EC=88=98=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .github/workflows/cd-api-prod.yml | 2 +- .github/workflows/cd-internal-prod.yml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/cd-api-prod.yml b/.github/workflows/cd-api-prod.yml index 0b3487a..f302237 100644 --- a/.github/workflows/cd-api-prod.yml +++ b/.github/workflows/cd-api-prod.yml @@ -68,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 diff --git a/.github/workflows/cd-internal-prod.yml b/.github/workflows/cd-internal-prod.yml index a674b73..5ad53a6 100644 --- a/.github/workflows/cd-internal-prod.yml +++ b/.github/workflows/cd-internal-prod.yml @@ -68,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