deploy: prod & dev가 같은 이미지를 사용하는 오류 수정 (#144)

PrayHelper · Feb 22, 2024 · 6405868 · 6405868
2 parents 08a48f8 + b9d4dcd
commit 6405868
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 14 deletions.
diff --git a/.github/workflows/deploy.dev3.yml b/.github/workflows/deploy.dev3.yml
@@ -11,12 +11,10 @@ permissions:
   contents: read
 
 env:
-  HOST: ${{ secrets.HOST }}
-  USERNAME: ${{ secrets.USERNAME }}
-  KEY: ${{ secrets.SSH_KEY }}
-  PORT: ${{ secrets.PORT }}
   IMAGE_NAME: registry.uspray.kr/uspray-server-dev:latest
   PROJECT_NAME: uspray-server-dev
+  DOMAIN_HOST: api.dev.uspray.kr
+
 
 jobs:
   deliver:
@@ -70,8 +68,9 @@ jobs:
 
       - name: Deploy Docker image
         env:
-          SERVICE_NAME: uspray-spring-dev
-          DOMAIN_HOST: api.dev.uspray.kr
+            SERVICE_NAME: ${{ env.PROJECT_NAME }}
+            DOMAIN_HOST: ${{ env.DOMAIN_HOST }}
+            IMAGE_NAME: ${{ env.IMAGE_NAME }}
         run: |
           if [ ! -z "$(docker ps -q -f name=${{env.PROJECT_NAME}})" ]; then
             docker compose -p ${{env.PROJECT_NAME}} down

diff --git a/.github/workflows/deploy.prod.yml b/.github/workflows/deploy.prod.yml
@@ -10,12 +10,9 @@ permissions:
   contents: read
 
 env:
-  HOST: ${{ secrets.HOST }}
-  USERNAME: ${{ secrets.USERNAME }}
-  KEY: ${{ secrets.SSH_KEY }}
-  PORT: ${{ secrets.PORT }}
   IMAGE_NAME: registry.uspray.kr/uspray-server-prod:latest
   PROJECT_NAME: uspray-server-prod
+  DOMAIN_HOST: api.uspray.kr
 
 jobs:
   test:
@@ -100,8 +97,9 @@ jobs:
 
       - name: Deploy Docker image
         env:
-          SERVICE_NAME: uspray-spring-prod
-          DOMAIN_HOST: api.uspray.kr
+          SERVICE_NAME: ${{ env.PROJECT_NAME }}
+          DOMAIN_HOST: ${{ env.DOMAIN_HOST }}
+          IMAGE_NAME: ${{ env.IMAGE_NAME }}
         run: |
           if [ ! -z "$(docker ps -q -f name=${{env.PROJECT_NAME}})" ]; then
             docker compose -p ${{env.PROJECT_NAME}} down

diff --git a/docker-compose.yml b/docker-compose.yml
@@ -1,8 +1,9 @@
 version: '3.8'
 
 services:
-  uspray-spring:
-    image: registry.uspray.kr/uspray-server-dev:latest
+  api:
+    container_name: ${SERVICE_NAME}
+    image: ${IMAGE_NAME}
     environment:
       TZ: "Asia/Seoul"
     ports: