From ca1177632ec2416441bf8d5e17598a540be8cb20 Mon Sep 17 00:00:00 2001 From: nayonsoso Date: Sun, 16 Feb 2025 16:32:00 +0900 Subject: [PATCH 1/4] =?UTF-8?q?chore:=20spring=20profile=EC=9D=84=20docker?= =?UTF-8?q?=20file=EC=97=90=EC=84=9C=20=EC=A7=80=EC=A0=95=ED=95=98?= =?UTF-8?q?=EC=A7=80=20=EC=95=8A=EB=8F=84=EB=A1=9D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index 4742ac87a..773d1ba16 100644 --- a/Dockerfile +++ b/Dockerfile @@ -8,7 +8,7 @@ ARG JAR_FILE=./build/libs/solid-connection-0.0.1-SNAPSHOT.jar COPY ${JAR_FILE} app.jar # 시스템 진입점 정의 -ENTRYPOINT ["java", "-jar", "/app.jar", "--spring.profiles.active=prod"] +ENTRYPOINT ["java", "-jar", "/app.jar"] # 볼륨 설정 VOLUME /tmp From 751e2e4ef49148ca271918f7c006c340fc6f6cb1 Mon Sep 17 00:00:00 2001 From: nayonsoso Date: Sun, 16 Feb 2025 17:53:43 +0900 Subject: [PATCH 2/4] =?UTF-8?q?chore:=20docker=20compose=20=ED=8C=8C?= =?UTF-8?q?=EC=9D=BC=20prod,=20stage=20=EB=B6=84=EB=A6=AC?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- docker-compose.yml => docker-compose.prod.yml | 3 +- docker-compose.stage.yml | 33 +++++++++++++++++++ 2 files changed, 35 insertions(+), 1 deletion(-) rename docker-compose.yml => docker-compose.prod.yml (92%) create mode 100644 docker-compose.stage.yml diff --git a/docker-compose.yml b/docker-compose.prod.yml similarity index 92% rename from docker-compose.yml rename to docker-compose.prod.yml index 8813a4e58..9517a07aa 100644 --- a/docker-compose.yml +++ b/docker-compose.prod.yml @@ -25,7 +25,8 @@ services: ports: - "8080:8080" environment: + - SPRING_PROFILES_ACTIVE=prod - SPRING_DATA_REDIS_HOST=redis - SPRING_DATA_REDIS_PORT=6379 depends_on: - - redis \ No newline at end of file + - redis diff --git a/docker-compose.stage.yml b/docker-compose.stage.yml new file mode 100644 index 000000000..3a97a6411 --- /dev/null +++ b/docker-compose.stage.yml @@ -0,0 +1,33 @@ +version: '3.8' + +services: + redis: + image: redis:latest + container_name: redis + ports: + - "6379:6379" + network_mode: host + + redis-exporter: + image: oliver006/redis_exporter + container_name: redis-exporter + ports: + - "9121:9121" + environment: + REDIS_ADDR: "localhost:6379" + depends_on: + - redis + network_mode: host + + solid-connection-stage: + build: + context: . + dockerfile: Dockerfile + container_name: solid-connection-stage + ports: + - "8080:8080" + environment: + - SPRING_PROFILES_ACTIVE=stage + depends_on: + - redis + network_mode: host From a5f0bc4e417e8e993ab4912df0a7c81c452837e2 Mon Sep 17 00:00:00 2001 From: nayonsoso Date: Sun, 16 Feb 2025 17:54:44 +0900 Subject: [PATCH 3/4] =?UTF-8?q?chore:=20cd=EC=97=90=EC=84=9C=20=ED=99=98?= =?UTF-8?q?=EA=B2=BD=EC=97=90=20=EB=A7=9E=EB=8A=94=20docker-compse?= =?UTF-8?q?=EB=A5=BC=20=EC=93=B0=EB=8F=84=EB=A1=9D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .github/workflows/prod-cd.yml | 6 +++--- .github/workflows/stage-cd.yml | 6 +++--- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/.github/workflows/prod-cd.yml b/.github/workflows/prod-cd.yml index 7a2601800..75d9e7c11 100644 --- a/.github/workflows/prod-cd.yml +++ b/.github/workflows/prod-cd.yml @@ -33,7 +33,7 @@ jobs: run: chmod +x ./gradlew - name: Build with Gradle - run: ./gradlew bootJar -Dspring.profiles.active=prod + run: ./gradlew bootJar - name: Copy jar file to remote uses: appleboy/scp-action@master @@ -59,7 +59,7 @@ jobs: host: ${{ secrets.HOST }} username: ${{ secrets.USERNAME }} key: ${{ secrets.PRIVATE_KEY }} - source: "./docker-compose.yml" + source: "./docker-compose.prod.yml" target: "/home/${{ secrets.USERNAME }}/solid-connect-server/" - name: Run docker compose @@ -72,4 +72,4 @@ jobs: script: | cd /home/${{ secrets.USERNAME }}/solid-connect-server docker compose down - docker compose up -d --build + docker compose -f docker-compose.prod.yml up -d --build diff --git a/.github/workflows/stage-cd.yml b/.github/workflows/stage-cd.yml index 3409a3829..cc0972e44 100644 --- a/.github/workflows/stage-cd.yml +++ b/.github/workflows/stage-cd.yml @@ -33,7 +33,7 @@ jobs: run: chmod +x ./gradlew - name: Build with Gradle - run: ./gradlew bootJar -Dspring.profiles.active=stage + run: ./gradlew bootJar - name: Copy jar file to remote uses: appleboy/scp-action@master @@ -59,7 +59,7 @@ jobs: host: ${{ secrets.STAGE_HOST }} username: ${{ secrets.STAGE_USERNAME }} key: ${{ secrets.STAGE_PRIVATE_KEY }} - source: "./docker-compose.yml" + source: "./docker-compose.stage.yml" target: "/home/${{ secrets.STAGE_USERNAME }}/solid-connect-stage/" - name: Run docker compose @@ -72,4 +72,4 @@ jobs: script: | cd /home/${{ secrets.STAGE_USERNAME }}/solid-connect-stage docker compose down - docker compose up -d --build + docker compose -f docker-compose.stage.yml up -d --build From 5cde0f36a5d720610b28d025101b196c666f580d Mon Sep 17 00:00:00 2001 From: nayonsoso Date: Sun, 16 Feb 2025 22:46:08 +0900 Subject: [PATCH 4/4] =?UTF-8?q?chore:=20=EC=84=9C=EB=B8=8C=EB=AA=A8?= =?UTF-8?q?=EB=93=88=20=EC=97=85=EB=8D=B0=EC=9D=B4=ED=8A=B8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/main/resources/secret | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/resources/secret b/src/main/resources/secret index 496ba4a63..f7b34bdc6 160000 --- a/src/main/resources/secret +++ b/src/main/resources/secret @@ -1 +1 @@ -Subproject commit 496ba4a63952ff154508f60b66c456bfd125e519 +Subproject commit f7b34bdc615f141ac82ed05c10557f95f5b45a04