diff --git a/.github/ISSUE_TEMPLATE/needdelete.md b/.github/ISSUE_TEMPLATE/needdelete.md deleted file mode 100644 index 8b137891..00000000 --- a/.github/ISSUE_TEMPLATE/needdelete.md +++ /dev/null @@ -1 +0,0 @@ - diff --git "a/.github/ISSUE_TEMPLATE/\353\260\261\354\227\224\353\223\234-\354\235\264\354\212\210.md" "b/.github/ISSUE_TEMPLATE/\353\260\261\354\227\224\353\223\234-\354\235\264\354\212\210.md" new file mode 100644 index 00000000..f728915f --- /dev/null +++ "b/.github/ISSUE_TEMPLATE/\353\260\261\354\227\224\353\223\234-\354\235\264\354\212\210.md" @@ -0,0 +1,14 @@ +--- +name: 백엔드 이슈 +about: 백엔드와 관련된 이슈 +title: "[백엔드] " +labels: Backend +assignees: '' + +--- + +# 이슈 내용 + + +# 작업 목록 +- [ ] diff --git a/.github/workflows/deploy-admin-docker.yml b/.github/workflows/deploy-admin-docker.yml index 96786003..7eea527b 100644 --- a/.github/workflows/deploy-admin-docker.yml +++ b/.github/workflows/deploy-admin-docker.yml @@ -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 diff --git a/.github/workflows/deploy-admin.yml b/.github/workflows/deploy-admin.yml index 5c9889c2..e29c7a65 100644 --- a/.github/workflows/deploy-admin.yml +++ b/.github/workflows/deploy-admin.yml @@ -3,7 +3,7 @@ name: Dev Admin CI/CD on: push: branches: - - develop + - legacy paths: - 'nowait-app-admin-api/**' - 'nowait-common/**' diff --git a/.github/workflows/deploy-user-docker.yml b/.github/workflows/deploy-user-docker.yml index c5ad5be8..3836cb6b 100644 --- a/.github/workflows/deploy-user-docker.yml +++ b/.github/workflows/deploy-user-docker.yml @@ -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 diff --git a/.github/workflows/deploy-user.yml b/.github/workflows/deploy-user.yml index 0ec7183e..bf98972d 100644 --- a/.github/workflows/deploy-user.yml +++ b/.github/workflows/deploy-user.yml @@ -3,7 +3,7 @@ name: Dev User CI/CD on: push: branches: - - develop + - legacy paths: - 'nowait-app-user-api/**' - 'nowait-common/**' diff --git a/docker-compose.yml b/docker-compose.yml deleted file mode 100644 index 32947253..00000000 --- a/docker-compose.yml +++ /dev/null @@ -1,44 +0,0 @@ -services: - mysql: - image: mysql:8.0 - container_name: mysql_nowait_container - environment: - MYSQL_ROOT_PASSWORD: gtable1118! - MYSQL_DATABASE: gtable_dev - MYSQL_USER: developer - MYSQL_PASSWORD: gtable1118! - ports: - - "3306:3306" - volumes: - - mysql_data:/var/lib/mysql - - nowait-app-admin-api: -# build: -# context: nowait-app-admin-api -# dockerfile: Dockerfile - image: jihuneddie/nowait_dev:admin - container_name: nowait-app-admin-api - ports: - - "8086:8085" - depends_on: - - mysql - volumes: - - ./nowait-app-admin-api:/app - restart: always - - nowait-app-user-api: -# build: -# context: nowait-app-user-api -# dockerfile: Dockerfile - image: jihuneddie/nowait_dev:user - container_name: nowait-app-user-api - ports: - - "8082:8081" - depends_on: - - mysql - volumes: - - ./nowait-app-user-api:/app - restart: always - -volumes: - mysql_data: diff --git a/nowait-app-admin-api/src/main/java/com/nowait/ApiAdminApplication.java b/nowait-app-admin-api/src/main/java/com/nowait/ApiAdminApplication.java index 1098599d..363e737d 100644 --- a/nowait-app-admin-api/src/main/java/com/nowait/ApiAdminApplication.java +++ b/nowait-app-admin-api/src/main/java/com/nowait/ApiAdminApplication.java @@ -10,3 +10,4 @@ public static void main(String[] args) { org.springframework.boot.SpringApplication.run(ApiAdminApplication.class, args); } } + diff --git a/nowait-app-user-api/src/main/java/com/nowait/ApiUserApplication.java b/nowait-app-user-api/src/main/java/com/nowait/ApiUserApplication.java index 07db6d34..8e25d58f 100644 --- a/nowait-app-user-api/src/main/java/com/nowait/ApiUserApplication.java +++ b/nowait-app-user-api/src/main/java/com/nowait/ApiUserApplication.java @@ -11,3 +11,4 @@ public static void main(String[] args) { SpringApplication.run(ApiUserApplication.class, args); } } + diff --git a/scripts/deploy-admin-docker.sh b/scripts/deploy-admin-docker.sh index b0740906..bbb99588 100644 --- a/scripts/deploy-admin-docker.sh +++ b/scripts/deploy-admin-docker.sh @@ -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") diff --git a/scripts/deploy-user-docker.sh b/scripts/deploy-user-docker.sh index 0b8d7d9a..aa537c8b 100644 --- a/scripts/deploy-user-docker.sh +++ b/scripts/deploy-user-docker.sh @@ -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")