From 6a3fbf196c8229372556dae8e9bd40a5fe7bf2eb Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=EC=9D=B4=ED=95=9C=EC=9D=8C?=
 <leehaneum160924@kyonggi.ac.kr>
Date: Wed, 27 Nov 2024 09:53:31 +0900
Subject: [PATCH] =?UTF-8?q?Revert=20"fix/#111=20CD=20=EC=9B=8C=ED=81=AC?=
 =?UTF-8?q?=ED=94=8C=EB=A1=9C=20=EC=8B=A4=ED=96=89=20=EB=B2=84=EA=B7=B8=20?=
 =?UTF-8?q?=ED=94=BD=EC=8A=A4=20(#112)"?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

This reverts commit 186f82cf68525d5e168c7a67cacfc64c4da17ba3.
---
 .github/workflows/dev-build-deploy.yml      | 21 +++++++++------------
 aics-api/src/main/resources/application.yml |  2 +-
 2 files changed, 10 insertions(+), 13 deletions(-)

diff --git a/.github/workflows/dev-build-deploy.yml b/.github/workflows/dev-build-deploy.yml
index da1ba4ac..43a64065 100644
--- a/.github/workflows/dev-build-deploy.yml
+++ b/.github/workflows/dev-build-deploy.yml
@@ -1,16 +1,11 @@
 name: Build and Deploy to Dev Server
 
 on:
-  push:
-    branches:
-      - develop
   workflow_dispatch:
 
 jobs:
   build-docker-image:
     runs-on: ubuntu-latest
-    environment: dev
-
     steps:
       - name: get repo from github
         uses: actions/checkout@v3
@@ -38,21 +33,23 @@ jobs:
 
       # Docker 이미지 빌드
       - name: Docker image build
+        env:
+          IMAGE_TAG: ${{ github.sha }}
         run: |
-          docker build -t ${{ secrets.DOCKERHUB_USERNAME }}/aics-server:${{ github.sha }} .
-          docker tag ${{ secrets.DOCKERHUB_USERNAME }}/aics-server:${{ github.sha }} ${{ secrets.DOCKERHUB_USERNAME }}/aics-server:latest
+          docker build -t ${{ secrets.DOCKERHUB_USERNAME }}/aics-api:$IMAGE_TAG .
+          docker tag ${{ secrets.DOCKERHUB_USERNAME }}/aics-api:$IMAGE_TAG ${{ secrets.DOCKERHUB_USERNAME }}/aics-api:latest
 
       # Docker Hub 이미지 푸시
       - name: docker Hub push
         run: |
-          docker push ${{ secrets.DOCKERHUB_USERNAME }}/aics-server:${{ github.sha }}
-          docker push ${{ secrets.DOCKERHUB_USERNAME }}/aics-server:latest
+          docker push ${{ secrets.DOCKERHUB_USERNAME }}/aics-api:$IMAGE_TAG
+          docker push ${{ secrets.DOCKERHUB_USERNAME }}/aics-api:latest
 
   deploy-to-dev:
     runs-on: ubuntu-latest
     needs: build-docker-image
     steps:
-      - name: SSH to server and deploy
+      - name: Deploy to dev
         uses: appleboy/ssh-action@v1.1.0
         with:
           host: ${{ secrets.SERVER_HOST }}
@@ -60,5 +57,5 @@ jobs:
           password: ${{ secrets.SERVER_PASSWORD }}
           port: ${{ secrets.SERVER_PORT }}
           script: |
-            sudo -E docker-compose -f ${{ secrets.DOCKER_COMPOSE_YAML_PATH }} pull || exit 1
-            sudo -E docker-compose -f ${{ secrets.DOCKER_COMPOSE_YAML_PATH }} up -d || exit 1
+            sudo docker-compose pull ${{ secrets.DOCKERHUB_USERNAME }}/aics-api:latest
+            sudo docker-compose up -d
\ No newline at end of file
diff --git a/aics-api/src/main/resources/application.yml b/aics-api/src/main/resources/application.yml
index 8438e189..1b7563f2 100644
--- a/aics-api/src/main/resources/application.yml
+++ b/aics-api/src/main/resources/application.yml
@@ -1,6 +1,6 @@
 spring:
   application:
-    name: aics-server
+    name: aics-api
 
   datasource:
     url: jdbc:postgresql://${DB_HOST:localhost}:${DB_PORT:5432}/${DB_NAME:aics}