From 4a01dd9ad0bc1c6b75896d91f2c0f0743aa6e627 Mon Sep 17 00:00:00 2001
From: uommou <ffffff.990917@gmail.com>
Date: Wed, 20 Mar 2024 11:54:08 +0900
Subject: [PATCH] =?UTF-8?q?fix:=20=EC=9A=A9=EB=9F=89=20=ED=99=95=EB=B3=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .github/workflows/cicd.yml | 37 +++++++++++++++++++++++++++++--------
 1 file changed, 29 insertions(+), 8 deletions(-)

diff --git a/.github/workflows/cicd.yml b/.github/workflows/cicd.yml
index 0fbea5c..cfc07f8 100644
--- a/.github/workflows/cicd.yml
+++ b/.github/workflows/cicd.yml
@@ -47,11 +47,32 @@ jobs:
           push: true
           tags: ${{ env.DOCKER_IMAGE }}:latest
 
+#  deploy:
+#    needs: build
+#    name: Deploy
+#    runs-on: [ self-hosted, label-NESS ]
+#    # label-newproject 라는 이름으로 AWS EC2 가 Runner 를 작동시킬 때 사용했던 그 label
+#    steps:
+#      - name: Login to ghcr
+#        uses: docker/login-action@v1
+#        with:
+#          registry: ghcr.io
+#          username: ${{ github.actor }}
+#          password: ${{ secrets.GHCR_TOKEN }}
+#
+#      - name: Docker run
+#        run: |
+#          docker stop ${{ env.NAME }} && docker rm ${{ env.NAME }} && docker rmi ${{ env.DOCKER_IMAGE }}:latest
+#          docker run -d -p 3000:3000 --name ness-fastapi --restart always ${{ env.DOCKER_IMAGE }}:latest
+##          docker pull ${{ env.DOCKER_IMAGE }}:latest
+##          docker stop ${{ env.NAME }} || true
+##          docker rm ${{ env.NAME }} || true
+##          docker rmi ${{ env.DOCKER_IMAGE }}:latest || true
+##          docker run -d -p 3000:3000 --name ${{ env.NAME }} --restart always ${{ env.DOCKER_IMAGE }}:latest
   deploy:
     needs: build
     name: Deploy
     runs-on: [ self-hosted, label-NESS ]
-    # label-newproject 라는 이름으로 AWS EC2 가 Runner 를 작동시킬 때 사용했던 그 label
     steps:
       - name: Login to ghcr
         uses: docker/login-action@v1
@@ -60,12 +81,12 @@ jobs:
           username: ${{ github.actor }}
           password: ${{ secrets.GHCR_TOKEN }}
 
+      - name: Remove old Docker image
+        run: docker rmi -f ${{ env.DOCKER_IMAGE }}:latest || true
+
       - name: Docker run
         run: |
-          docker stop ${{ env.NAME }} && docker rm ${{ env.NAME }} && docker rmi ${{ env.DOCKER_IMAGE }}:latest
-          docker run -d -p 3000:3000 --name ness-fastapi --restart always ${{ env.DOCKER_IMAGE }}:latest
-#          docker pull ${{ env.DOCKER_IMAGE }}:latest
-#          docker stop ${{ env.NAME }} || true
-#          docker rm ${{ env.NAME }} || true
-#          docker rmi ${{ env.DOCKER_IMAGE }}:latest || true
-#          docker run -d -p 3000:3000 --name ${{ env.NAME }} --restart always ${{ env.DOCKER_IMAGE }}:latest
\ No newline at end of file
+          docker pull ${{ env.DOCKER_IMAGE }}:latest
+          docker stop ${{ env.NAME }} || true
+          docker rm ${{ env.NAME }} || true
+          docker run -d -p 3000:3000 --name ${{ env.NAME }} --restart always ${{ env.DOCKER_IMAGE }}:latest
\ No newline at end of file