Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions .github/workflows/prod-cd.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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
Expand All @@ -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
6 changes: 3 additions & 3 deletions .github/workflows/stage-cd.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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
Expand All @@ -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
2 changes: 1 addition & 1 deletion Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -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
3 changes: 2 additions & 1 deletion docker-compose.yml → docker-compose.prod.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
- redis
33 changes: 33 additions & 0 deletions docker-compose.stage.yml
Original file line number Diff line number Diff line change
@@ -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
2 changes: 1 addition & 1 deletion src/main/resources/secret