Skip to content

refactor: docker compose 파일 환경별로 분리 #101

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
Jjiggu merged 1 commit into from
Jul 9, 2025
Merged

refactor: docker compose 파일 환경별로 분리 #101

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
1 change: 0 additions & 1 deletion .github/ISSUE_TEMPLATE/needdelete.md
View file
Open in desktop

This file was deleted.

14 changes: 14 additions & 0 deletions .github/ISSUE_TEMPLATE/백엔드-이슈.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,14 @@
---
name: 백엔드 이슈
about: 백엔드와 관련된 이슈
title: "[백엔드] "
labels: Backend
assignees: ''

---

# 이슈 내용


# 작업 목록
- [ ]
4 changes: 2 additions & 2 deletions .github/workflows/deploy-admin-docker.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -70,14 +70,14 @@ jobs:
- name: Checkout
uses: actions/checkout@v3

- name: Copy docker-compose.yml to EC2
- name: Copy docker-compose.admin.yml to EC2
uses: appleboy/scp-action@master
with:
host: ${{ secrets.EC2_HOST }}
username: ${{ secrets.EC2_USER }}
key: ${{ secrets.EC2_SSH_KEY }}
port: ${{ secrets.EC2_PORT }}
source: "docker-compose.yml"
source: "docker-compose.admin.yml"
target: ${{ env.EC2_DEPLOY_PATH }}

- name: Copy deploy-admin-docker.sh to EC2
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/deploy-admin.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ name: Dev Admin CI/CD
on:
push:
branches:
- develop
- legacy
paths:
- 'nowait-app-admin-api/**'
- 'nowait-common/**'
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/deploy-user-docker.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -67,14 +67,14 @@ jobs:
- name: Checkout
uses: actions/checkout@v3

- name: Copy docker-compose.yml to EC2
- name: Copy docker-compose.user.yml to EC2
uses: appleboy/scp-action@master
with:
host: ${{ secrets.EC2_HOST }}
username: ${{ secrets.EC2_USER }}
key: ${{ secrets.EC2_SSH_KEY }}
port: ${{ secrets.EC2_PORT }}
source: "docker-compose.yml"
source: "docker-compose.user.yml"
target: ${{ env.EC2_DEPLOY_PATH }}

- name: Copy deploy-user-docker to EC2
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/deploy-user.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ name: Dev User CI/CD
on:
push:
branches:
- develop
- legacy
paths:
- 'nowait-app-user-api/**'
- 'nowait-common/**'
Expand Down
44 changes: 0 additions & 44 deletions docker-compose.yml
View file
Open in desktop

This file was deleted.

1 change: 1 addition & 0 deletions nowait-app-admin-api/src/main/java/com/nowait/ApiAdminApplication.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,3 +10,4 @@ public static void main(String[] args) {
org.springframework.boot.SpringApplication.run(ApiAdminApplication.class, args);
}
}

1 change: 1 addition & 0 deletions nowait-app-user-api/src/main/java/com/nowait/ApiUserApplication.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,3 +11,4 @@ public static void main(String[] args) {
SpringApplication.run(ApiUserApplication.class, args);
}
}

4 changes: 2 additions & 2 deletions scripts/deploy-admin-docker.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,8 +17,8 @@ else
fi

echo "3. start container"
sudo docker-compose -p nowait_dev pull nowait-app-admin-api
sudo docker-compose -p nowait_dev up -d nowait-app-admin-api
sudo docker-compose -f docker-compose.admin.yml -p nowait_dev pull nowait-app-admin-api
sudo docker-compose -f docker-compose.admin.yml -p nowait_dev up -d nowait-app-admin-api

echo "4. check container status"
NEW_CONTAINER_ID=$(docker ps -q --filter "name=nowait-app-admin-api")
Expand Down
4 changes: 2 additions & 2 deletions scripts/deploy-user-docker.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,8 +17,8 @@ else
fi

echo "3. start container"
sudo docker-compose -p nowait_dev pull nowait-app-user-api
sudo docker-compose -p nowait_dev up -d nowait-app-user-api
sudo docker-compose -f docker-compose.user.yml -p nowait_dev pull nowait-app-user-api
sudo docker-compose -f docker-compose.user.yml -p nowait_dev up -d nowait-app-user-api

echo "4. check container status"
NEW_CONTAINER_ID=$(docker ps -q --filter "name=nowait-app-user-api")
Expand Down