From 988090018968683bb60feecbe379bdba2efd83b5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=EC=A1=B0=EC=9D=B4=EA=B0=95?= <dlrkd1122@gmail.com>
Date: Tue, 8 Oct 2024 13:26:22 +0900
Subject: [PATCH] Update docker-build.yml

---
 .github/workflows/docker-build.yml | 56 ++++++++++++++++--------------
 1 file changed, 30 insertions(+), 26 deletions(-)

diff --git a/.github/workflows/docker-build.yml b/.github/workflows/docker-build.yml
index 8baddc6..9fd5e05 100644
--- a/.github/workflows/docker-build.yml
+++ b/.github/workflows/docker-build.yml
@@ -65,32 +65,36 @@ jobs:
           tags: ${{ env.DOCKER_IMAGE }}:latest
 
   deploy:
-    needs: build
-    runs-on: self-hosted
-    steps: 
-      - name: setup .env
-        run: |
-          echo "DB_HOST=${{ secrets.DB_HOST }}" >> .env
-          echo "DB_PORT=${{ secrets.DB_PORT }}" >> .env
-          echo "DB_PASSWORD=${{ secrets.DB_PASSWORD }}" >> .env
-          echo "DB_USER=${{ secrets.DB_USER }}" >> .env
-          echo "DB_NAME=${{ secrets.DB_NAME }}" >> .env
-          echo "EMAIL_PORT=${{ secrets.EMAIL_PORT}}" >> .env
-          echo "EMAIL_HOST_USER=${{ secrets.EMAIL_HOST_USER }}" >> .env
-          echo "EMAIL_HOST_PASSWORD=${{ secrets.EMAIL_HOST_PASSWORD }}" >> .env
-          echo "DJANGO_SECRET_KEY=${{ secrets.DJANGO_SECRET_KEY }}" >> .env
-          cat .env
+  needs: build
+  runs-on: self-hosted
+  steps: 
+    - name: setup .env
+      run: |
+        echo "DB_HOST=${{ secrets.DB_HOST }}" >> .env
+        echo "DB_PORT=${{ secrets.DB_PORT }}" >> .env
+        echo "DB_PASSWORD=${{ secrets.DB_PASSWORD }}" >> .env
+        echo "DB_USER=${{ secrets.DB_USER }}" >> .env
+        echo "DB_NAME=${{ secrets.DB_NAME }}" >> .env
+        echo "EMAIL_PORT=${{ secrets.EMAIL_PORT}}" >> .env
+        echo "EMAIL_HOST_USER=${{ secrets.EMAIL_HOST_USER }}" >> .env
+        echo "EMAIL_HOST_PASSWORD=${{ secrets.EMAIL_HOST_PASSWORD }}" >> .env
+        echo "DJANGO_SECRET_KEY=${{ secrets.DJANGO_SECRET_KEY }}" >> .env
+        cat .env
 
-      - name: Stop and remove old containers
-        run: |
-          sudo docker stop ${{ env.DOCKER_CONTAINER }} || true && sudo docker rm ${{ env.DOCKER_CONTAINER }} || true
-          sudo docker rmi ${{ env.DOCKER_IMAGE }}:latest || true
+    - name: Stop and remove old containers
+      run: |
+        sudo docker stop ${{ env.DOCKER_CONTAINER }} || true && sudo docker rm ${{ env.DOCKER_CONTAINER }} || true
+        sudo docker stop nginx || true && sudo docker rm nginx || true
+        sudo docker rmi ${{ env.DOCKER_IMAGE }}:latest || true
 
-      - name: Run Django container
-        run: |
-          sudo docker run --env-file ./.env -d --name ${{ env.DOCKER_CONTAINER }} --network bridge -p 8000:8000 --restart always ${{ env.DOCKER_IMAGE }}:latest
+    - name: Create Custom network
+      run: |
+        sudo docker network create kua_network || true
 
-      - name: Run Nginx container
-        run: |
-          sudo docker run -d --name nginx --network bridge -p 80:80 --link ${{ env.DOCKER_CONTAINER }}:backend --restart always nginx:latest
-          echo "Nginx container started"
+    - name: Run Django container
+      run: |
+        sudo docker run --env-file ./.env -d --name ${{ env.DOCKER_CONTAINER }} --network kua_network -p 8000:8000 --restart always ${{ env.DOCKER_IMAGE }}:latest
+
+    - name: Run Nginx container
+      run: |
+        sudo docker run -d --name nginx --network kua_network -p 80:80 --restart always -v ./nginx.conf:/etc/nginx/nginx.conf nginx:latest