From adfa6f77ba9cbdaf4dbdefdb39904ae093740941 Mon Sep 17 00:00:00 2001 From: Wibaek Park Date: Mon, 28 Apr 2025 09:45:52 +0900 Subject: [PATCH 1/3] =?UTF-8?q?rename:=20=EB=8F=84=EC=BB=A4=20=ED=8C=8C?= =?UTF-8?q?=EC=9D=BC=EB=AA=85=20=EB=B3=80=EA=B2=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .github/workflows/stage-cd.yml | 2 +- docker-compose.stage.yml => docker-compose.dev.yml | 0 2 files changed, 1 insertion(+), 1 deletion(-) rename docker-compose.stage.yml => docker-compose.dev.yml (100%) diff --git a/.github/workflows/stage-cd.yml b/.github/workflows/stage-cd.yml index 41ff68b37..c3b6eadb2 100644 --- a/.github/workflows/stage-cd.yml +++ b/.github/workflows/stage-cd.yml @@ -59,7 +59,7 @@ jobs: host: ${{ secrets.STAGE_HOST }} username: ${{ secrets.STAGE_USERNAME }} key: ${{ secrets.STAGE_PRIVATE_KEY }} - source: "./docker-compose.stage.yml" + source: "./docker-compose.dev.yml" target: "/home/${{ secrets.STAGE_USERNAME }}/solid-connect-stage/" - name: Run docker compose diff --git a/docker-compose.stage.yml b/docker-compose.dev.yml similarity index 100% rename from docker-compose.stage.yml rename to docker-compose.dev.yml From 3172d91eecc937c9b433e2cb38ea20c5267d6984 Mon Sep 17 00:00:00 2001 From: Wibaek Park Date: Mon, 28 Apr 2025 09:56:02 +0900 Subject: [PATCH 2/3] =?UTF-8?q?rename:=20stage=20->=20dev=20=ED=99=98?= =?UTF-8?q?=EA=B2=BD=EB=AA=85=20=EB=B3=80=EA=B2=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .github/workflows/stage-cd.yml | 2 +- docker-compose.dev.yml | 8 ++++---- src/main/resources/logback-spring.xml | 2 +- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/.github/workflows/stage-cd.yml b/.github/workflows/stage-cd.yml index c3b6eadb2..9aebbfe95 100644 --- a/.github/workflows/stage-cd.yml +++ b/.github/workflows/stage-cd.yml @@ -1,4 +1,4 @@ -name: "[STAGE] Build Gradle and Deploy" +name: "[DEV] Build Gradle and Deploy" on: push: diff --git a/docker-compose.dev.yml b/docker-compose.dev.yml index c4ccd687f..a37ef4c55 100644 --- a/docker-compose.dev.yml +++ b/docker-compose.dev.yml @@ -19,15 +19,15 @@ services: - redis network_mode: host - solid-connection-stage: + solid-connection-dev: build: context: . dockerfile: Dockerfile - container_name: solid-connection-stage + container_name: solid-connection-dev ports: - "8080:8080" environment: - - SPRING_PROFILES_ACTIVE=stage + - SPRING_PROFILES_ACTIVE=dev volumes: - ./logs:/var/log/spring depends_on: @@ -43,4 +43,4 @@ services: - ./logs:/var/log/spring - ./docs/config.alloy:/etc/alloy/config.alloy:ro environment: - - ALLOY_ENV=stage + - ALLOY_ENV=dev diff --git a/src/main/resources/logback-spring.xml b/src/main/resources/logback-spring.xml index 390c7c606..e179be0fb 100644 --- a/src/main/resources/logback-spring.xml +++ b/src/main/resources/logback-spring.xml @@ -27,7 +27,7 @@ - + From e650833641eb918161ea438abf582f2f819800e9 Mon Sep 17 00:00:00 2001 From: Wibaek Park Date: Mon, 28 Apr 2025 10:04:23 +0900 Subject: [PATCH 3/3] =?UTF-8?q?chore:=20dev=ED=99=98=EA=B2=BD=EC=9D=B4=20d?= =?UTF-8?q?evelop=20=EB=B8=8C=EB=9E=9C=EC=B9=98=EB=A5=BC=20=EC=B6=94?= =?UTF-8?q?=EC=A0=81=ED=95=98=EA=B2=8C=20=EB=B3=80=EA=B2=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .github/workflows/{stage-cd.yml => dev-cd.yml} | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) rename .github/workflows/{stage-cd.yml => dev-cd.yml} (98%) diff --git a/.github/workflows/stage-cd.yml b/.github/workflows/dev-cd.yml similarity index 98% rename from .github/workflows/stage-cd.yml rename to .github/workflows/dev-cd.yml index 9aebbfe95..793f3dea3 100644 --- a/.github/workflows/stage-cd.yml +++ b/.github/workflows/dev-cd.yml @@ -2,7 +2,7 @@ name: "[DEV] Build Gradle and Deploy" on: push: - branches: [ "release" ] + branches: [ "develop" ] workflow_dispatch: jobs: