From d4c64d6cd2545e4d10c15d165eb3c19ed73985f9 Mon Sep 17 00:00:00 2001
From: KIMB0B <axzsd96301@gmail.com>
Date: Fri, 20 Mar 2026 21:00:27 +0900
Subject: [PATCH 1/8] =?UTF-8?q?build:=20CI/CD=20=EA=B5=AC=ED=98=84?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .github/workflows/cd.yml | 61 ++++++++++++++++++++++++++++++++++++++++
 .github/workflows/ci.yml | 53 ++++++++++++++++++++++++++++++++++
 Dockerfile               | 23 +++++++++------
 docker-compose.prod.yaml | 45 +++++++++++++++++++++++++++++
 docker-compose.yaml      |  2 +-
 nginx.conf               | 24 ++++++++++++++++
 6 files changed, 198 insertions(+), 10 deletions(-)
 create mode 100644 .github/workflows/cd.yml
 create mode 100644 .github/workflows/ci.yml
 create mode 100644 docker-compose.prod.yaml
 create mode 100644 nginx.conf

diff --git a/.github/workflows/cd.yml b/.github/workflows/cd.yml
new file mode 100644
index 0000000..cbb0d59
--- /dev/null
+++ b/.github/workflows/cd.yml
@@ -0,0 +1,61 @@
+name: CD
+
+on:
+  push:
+    branches:
+      - 'build/6-ci-cd-deploy'
+
+env:
+  IMAGE_NAME: ghcr.io/${{ github.repository }}/backend
+
+jobs:
+  deploy:
+    runs-on: ubuntu-latest
+    permissions:
+      contents: read
+      packages: write
+
+    steps:
+      - name: 코드 체크아웃
+        uses: actions/checkout@v4
+
+      - name: 이미지 태그 생성
+        id: vars
+        run: echo "tag=${GITHUB_SHA}" >> $GITHUB_OUTPUT
+
+      - name: GHCR 로그인
+        run: echo "${{ secrets.GITHUB_TOKEN }}" | docker login ghcr.io -u ${{ github.actor }} --password-stdin
+
+      - name: 도커 이미지 빌드
+        run: |
+          docker build \
+            -f Dockerfile \
+            -t $IMAGE_NAME:${{ steps.vars.outputs.tag }} \
+            -t $IMAGE_NAME:latest \
+            .
+
+      - name: 도커 이미지 푸시
+        run: |
+          docker push $IMAGE_NAME:${{ steps.vars.outputs.tag }}
+          docker push $IMAGE_NAME:latest
+
+      - name: 서버 배포 실행
+        uses: appleboy/ssh-action@v1.0.3
+        with:
+          host: ${{ secrets.DEPLOY_HOST }}
+          username: ${{ secrets.DEPLOY_USER }}
+          key: ${{ secrets.DEPLOY_KEY }}
+          port: ${{ secrets.DEPLOY_PORT }}
+          script: |
+            cd /home/${{ secrets.DEPLOY_USER }}/teampling
+
+            export IMAGE_TAG=${{ steps.vars.outputs.tag }}
+
+            docker login ghcr.io -u ${{ github.actor }} -p ${{ secrets.GHCR_PAT }}
+
+            docker compose -f docker-compose.prod.yml pull app
+
+            docker compose -f docker-compose.prod.yml run --rm app alembic upgrade head
+
+            docker compose -f docker-compose.prod.yml up -d app nginx
+            docker image prune -f
\ No newline at end of file
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
new file mode 100644
index 0000000..7b88292
--- /dev/null
+++ b/.github/workflows/ci.yml
@@ -0,0 +1,53 @@
+name: CI
+
+on:
+  pull_request:
+  push:
+    branches: #[develop, main]
+      - 'build/6-ci-cd-deploy'
+jobs:
+  test:
+    runs-on: ubuntu-latest
+
+    services:
+      postgres:
+        image: postgres:16
+        env:
+          POSTGRES_USER: testuser
+          POSTGRES_PASSWORD: testpass
+          POSTGRES_DB: testdb
+        ports:
+          - 5432:5432
+        options: >-
+          --health-cmd="pg_isready -U testuser -d testdb"
+          --health-interval=5s
+          --health-timeout=5s
+          --health-retries=10
+
+    steps:
+      - name: 코드 체크아웃
+        uses: actions/checkout@v4
+
+      - name: 파이썬 환경 설정
+        uses: actions/setup-python@v5
+        with:
+          python-version: "3.12"
+
+      - name: 의존성 설치
+        run: |
+          pip install poetry
+          poetry config virtualenvs.create false
+          poetry install --no-interaction --no-ansi
+
+      - name: 테스트 실행
+        env:
+          DATABASE_URL: postgresql+psycopg://testuser:testpass@localhost:5432/testdb
+        run: pytest -q
+
+      - name: Alembic 마이그레이션 테스트
+        env:
+          DATABASE_URL: postgresql+psycopg://testuser:testpass@localhost:5432/testdb
+        run: alembic upgrade head
+
+      - name: 도커 빌드 테스트
+        run: docker build -f Dockerfile -t backend:test .
\ No newline at end of file
diff --git a/Dockerfile b/Dockerfile
index 7d884c5..727ec88 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,17 +1,22 @@
 FROM python:3.12-slim
 
-RUN pip install poetry
+ENV PYTHONDONTWRITEBYTECODE=1
+ENV PYTHONUNBUFFERED=1
 
-WORKDIR /teampling
+WORKDIR /app
 
-RUN pip install --no-cache-dir --upgrade pip
+RUN apt-get update && apt-get install -y --no-install-recommends \
+    build-essential \
+    libpq-dev \
+    curl \
+    && rm -rf /var/lib/apt/lists/*
 
-COPY pyproject.toml poetry.lock ./
+COPY pyproject.toml poetry.lock* /app/
 
-RUN poetry config virtualenvs.create false
+RUN pip install --no-cache-dir poetry && \
+    poetry config virtualenvs.create false && \
+    poetry install --only main --no-interaction --no-ansi
 
-RUN poetry install --no-root --only main
+COPY . /app
 
-COPY . .
-
-EXPOSE 8000
\ No newline at end of file
+CMD ["uvicorn", "app.main:app", "--host", "0.0.0.0", "--port", "8000"]
\ No newline at end of file
diff --git a/docker-compose.prod.yaml b/docker-compose.prod.yaml
new file mode 100644
index 0000000..ee5f05b
--- /dev/null
+++ b/docker-compose.prod.yaml
@@ -0,0 +1,45 @@
+services:
+  db:
+    image: postgres:16
+    container_name: teampling-db
+    environment:
+      POSTGRES_USER: ${POSTGRES_USER}
+      POSTGRES_PASSWORD: ${POSTGRES_PASSWORD}
+      POSTGRES_DB: ${POSTGRES_DB}
+    volumes:
+      - postgres_data:/var/lib/postgresql/data
+    healthcheck:
+      test: ["CMD-SHELL", "pg_isready -U ${POSTGRES_USER} -d ${POSTGRES_DB}"]
+      interval: 5s
+      timeout: 5s
+      retries: 10
+    restart: always
+
+  app:
+    image: ghcr.io/teampling/backend_main/backend:${IMAGE_TAG}
+    container_name: teampling-app
+    env_file:
+      - .env
+    depends_on:
+      db:
+        condition: service_healthy
+    expose:
+      - "8000"
+    restart: always
+
+  nginx:
+    image: nginx:stable-alpine
+    container_name: teampling-nginx
+    depends_on:
+      - app
+    ports:
+      - "80:80"
+      # - "443:443"
+    volumes:
+      - ./nginx.conf:/etc/nginx/nginx.conf:ro
+      # - ./certbot/conf:/etc/letsencrypt
+      # - ./certbot/www:/var/www/certbot
+    restart: always
+
+volumes:
+  postgres_data:
\ No newline at end of file
diff --git a/docker-compose.yaml b/docker-compose.yaml
index 6c97f74..af26851 100644
--- a/docker-compose.yaml
+++ b/docker-compose.yaml
@@ -29,7 +29,7 @@ services:
     ports:
       - "8000:8000"
     volumes:
-      - ./app:/teampling/app  # 코드 바뀌면 바로 반영(개발용)
+      - ./app:/app/app
     command: >
       uvicorn app.main:app
       --host 0.0.0.0
diff --git a/nginx.conf b/nginx.conf
new file mode 100644
index 0000000..f83bedf
--- /dev/null
+++ b/nginx.conf
@@ -0,0 +1,24 @@
+events {}
+
+http {
+    upstream backend {
+        server app:8000;
+    }
+
+    server {
+        listen 80;
+        server_name _;
+
+        client_max_body_size 20M;
+
+        location / {
+            proxy_pass http://backend;
+            proxy_http_version 1.1;
+
+            proxy_set_header Host $host;
+            proxy_set_header X-Real-IP $remote_addr;
+            proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
+            proxy_set_header X-Forwarded-Proto $scheme;
+        }
+    }
+}
\ No newline at end of file

From da19023d056f74ba4df48df207c5b450752604e7 Mon Sep 17 00:00:00 2001
From: KIMB0B <axzsd96301@gmail.com>
Date: Fri, 20 Mar 2026 21:16:09 +0900
Subject: [PATCH 2/8] =?UTF-8?q?build:=20CI/CD=20=EA=B2=BD=EB=A1=9C=20?=
 =?UTF-8?q?=EC=88=98=EC=A0=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .github/workflows/cd.yml | 6 +++++-
 .github/workflows/ci.yml | 2 ++
 2 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/.github/workflows/cd.yml b/.github/workflows/cd.yml
index cbb0d59..a968af1 100644
--- a/.github/workflows/cd.yml
+++ b/.github/workflows/cd.yml
@@ -6,7 +6,7 @@ on:
       - 'build/6-ci-cd-deploy'
 
 env:
-  IMAGE_NAME: ghcr.io/${{ github.repository }}/backend
+  IMAGE_NAME: ghcr.io/${{ steps.repo.outputs.repo }}/backend
 
 jobs:
   deploy:
@@ -26,6 +26,10 @@ jobs:
       - name: GHCR 로그인
         run: echo "${{ secrets.GITHUB_TOKEN }}" | docker login ghcr.io -u ${{ github.actor }} --password-stdin
 
+      - name: 레포 이름 소문자 변환
+        id: repo
+        run: echo "repo=$(echo '${{ github.repository }}' | tr '[:upper:]' '[:lower:]')" >> $GITHUB_OUTPUT
+
       - name: 도커 이미지 빌드
         run: |
           docker build \
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 7b88292..1a52235 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -41,11 +41,13 @@ jobs:
 
       - name: 테스트 실행
         env:
+          PYTHONPATH: ${{ github.workspace }}
           DATABASE_URL: postgresql+psycopg://testuser:testpass@localhost:5432/testdb
         run: pytest -q
 
       - name: Alembic 마이그레이션 테스트
         env:
+          PYTHONPATH: ${{ github.workspace }}
           DATABASE_URL: postgresql+psycopg://testuser:testpass@localhost:5432/testdb
         run: alembic upgrade head
 

From d7e29f8a9307d5c900b74681d92888b2ea1c4c96 Mon Sep 17 00:00:00 2001
From: KIMB0B <axzsd96301@gmail.com>
Date: Fri, 20 Mar 2026 21:29:34 +0900
Subject: [PATCH 3/8] =?UTF-8?q?build:=20CI/CD=20env=20=EB=B6=88=EB=9F=AC?=
 =?UTF-8?q?=EC=98=A4=EB=8A=94=EC=A4=91=20=EC=98=A4=EB=A5=98=20=EC=88=98?=
 =?UTF-8?q?=EC=A0=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .github/workflows/cd.yml | 12 +++++-------
 .github/workflows/ci.yml |  4 +++-
 2 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/.github/workflows/cd.yml b/.github/workflows/cd.yml
index a968af1..041a037 100644
--- a/.github/workflows/cd.yml
+++ b/.github/workflows/cd.yml
@@ -5,9 +5,6 @@ on:
     branches:
       - 'build/6-ci-cd-deploy'
 
-env:
-  IMAGE_NAME: ghcr.io/${{ steps.repo.outputs.repo }}/backend
-
 jobs:
   deploy:
     runs-on: ubuntu-latest
@@ -23,13 +20,14 @@ jobs:
         id: vars
         run: echo "tag=${GITHUB_SHA}" >> $GITHUB_OUTPUT
 
+      - name: 이미지 경로 생성
+        run: |
+          REPO_LOWER=$(echo "${{ github.repository }}" | tr '[:upper:]' '[:lower:]')
+          echo "IMAGE_NAME=ghcr.io/${REPO_LOWER}/backend" >> $GITHUB_ENV
+
       - name: GHCR 로그인
         run: echo "${{ secrets.GITHUB_TOKEN }}" | docker login ghcr.io -u ${{ github.actor }} --password-stdin
 
-      - name: 레포 이름 소문자 변환
-        id: repo
-        run: echo "repo=$(echo '${{ github.repository }}' | tr '[:upper:]' '[:lower:]')" >> $GITHUB_OUTPUT
-
       - name: 도커 이미지 빌드
         run: |
           docker build \
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 1a52235..8c40610 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -13,9 +13,11 @@ jobs:
       postgres:
         image: postgres:16
         env:
+          POSTGRES_DB: testdb
           POSTGRES_USER: testuser
           POSTGRES_PASSWORD: testpass
-          POSTGRES_DB: testdb
+          POSTGRES_HOST: localhost
+          POSTGRES_PORT: "5432"
         ports:
           - 5432:5432
         options: >-

From f4306857ecc3a800daa8966661a102dd1a5dd609 Mon Sep 17 00:00:00 2001
From: KIMB0B <axzsd96301@gmail.com>
Date: Fri, 20 Mar 2026 21:46:50 +0900
Subject: [PATCH 4/8] =?UTF-8?q?build:=20CD=20=EA=B3=BC=EC=A0=95=20?=
 =?UTF-8?q?=EC=A4=91=20=EB=B0=B0=ED=8F=AC=20=EA=B4=80=EB=A0=A8=20=ED=8C=8C?=
 =?UTF-8?q?=EC=9D=BC=20=EC=A0=84=EC=86=A1=20=EA=B3=BC=EC=A0=95=20=EC=B6=94?=
 =?UTF-8?q?=EA=B0=80?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .github/workflows/cd.yml | 20 ++++++++++++++++++++
 .github/workflows/ci.yml |  2 ++
 app/core/config.py       | 17 ++++++++---------
 3 files changed, 30 insertions(+), 9 deletions(-)

diff --git a/.github/workflows/cd.yml b/.github/workflows/cd.yml
index 041a037..be8a433 100644
--- a/.github/workflows/cd.yml
+++ b/.github/workflows/cd.yml
@@ -41,6 +41,26 @@ jobs:
           docker push $IMAGE_NAME:${{ steps.vars.outputs.tag }}
           docker push $IMAGE_NAME:latest
 
+      - name: 서버에 배포 디렉토리 생성
+        uses: appleboy/ssh-action@v1.0.3
+        with:
+          host: ${{ secrets.DEPLOY_HOST }}
+          username: ${{ secrets.DEPLOY_USER }}
+          key: ${{ secrets.DEPLOY_KEY }}
+          port: ${{ secrets.DEPLOY_PORT }}
+          script: |
+            mkdir -p ~/teampling/docker
+
+      - name: 배포 파일 전송
+        uses: appleboy/scp-action@v0.1.7
+        with:
+          host: ${{ secrets.DEPLOY_HOST }}
+          username: ${{ secrets.DEPLOY_USER }}
+          key: ${{ secrets.DEPLOY_KEY }}
+          port: ${{ secrets.DEPLOY_PORT }}
+          source: "docker-compose.prod.yml,nginx.conf"
+          target: "~/teampling"
+
       - name: 서버 배포 실행
         uses: appleboy/ssh-action@v1.0.3
         with:
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 8c40610..21e6d1c 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -13,6 +13,8 @@ jobs:
       postgres:
         image: postgres:16
         env:
+          APP_ENV: test
+          APP_NAME: teampling-test
           POSTGRES_DB: testdb
           POSTGRES_USER: testuser
           POSTGRES_PASSWORD: testpass
diff --git a/app/core/config.py b/app/core/config.py
index 41714d5..c44536e 100644
--- a/app/core/config.py
+++ b/app/core/config.py
@@ -37,7 +37,7 @@ def LOCAL_DATABASE_URL(self) -> str:
         )
 
     # JWT / AUTH
-    JWT_SECRET: str
+    JWT_SECRET: str = ""
     JWT_ALG: str = "HS256"
     ACCESS_TOKEN_MINUTES: int = 30
     REFRESH_TOKEN_DAYS: int = 14
@@ -52,13 +52,12 @@ def LOCAL_DATABASE_URL(self) -> str:
     LOG_LEVEL: str = "INFO"
 
     # Oracle Cloud Storage
-    OCI_USER_OCID: str
-    OCI_API_KEY_PATH: str
-    OCI_FINGERPRINT: str
-    OCI_TENANCY_OCID: str
-    OCI_REGION: str
-
-    OCI_OBJECT_STORAGE_NAMESPACE: str
-    OCI_OBJECT_STORAGE_BUCKET: str
+    OCI_USER_OCID: str = ""
+    OCI_API_KEY_PATH: str = ""
+    OCI_FINGERPRINT: str = ""
+    OCI_TENANCY_OCID: str = ""
+    OCI_REGION: str = ""
+    OCI_OBJECT_STORAGE_NAMESPACE: str = ""
+    OCI_OBJECT_STORAGE_BUCKET: str = ""
 
 settings = Settings()

From d566a8053e85ceb523cfe7efeef52e81aea893d3 Mon Sep 17 00:00:00 2001
From: KIMB0B <axzsd96301@gmail.com>
Date: Fri, 20 Mar 2026 21:57:08 +0900
Subject: [PATCH 5/8] =?UTF-8?q?build:=20CI=20env=20=EC=9C=84=EC=B9=98=20?=
 =?UTF-8?q?=EC=88=98=EC=A0=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .github/workflows/cd.yml |  4 ++--
 .github/workflows/ci.yml | 16 ++++++++++------
 2 files changed, 12 insertions(+), 8 deletions(-)

diff --git a/.github/workflows/cd.yml b/.github/workflows/cd.yml
index be8a433..e865975 100644
--- a/.github/workflows/cd.yml
+++ b/.github/workflows/cd.yml
@@ -49,7 +49,7 @@ jobs:
           key: ${{ secrets.DEPLOY_KEY }}
           port: ${{ secrets.DEPLOY_PORT }}
           script: |
-            mkdir -p ~/teampling/docker
+            mkdir -p ~/teampling
 
       - name: 배포 파일 전송
         uses: appleboy/scp-action@v0.1.7
@@ -58,7 +58,7 @@ jobs:
           username: ${{ secrets.DEPLOY_USER }}
           key: ${{ secrets.DEPLOY_KEY }}
           port: ${{ secrets.DEPLOY_PORT }}
-          source: "docker-compose.prod.yml,nginx.conf"
+          source: "docker-compose.prod.yaml,nginx.conf"
           target: "~/teampling"
 
       - name: 서버 배포 실행
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 21e6d1c..3c76e61 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -13,13 +13,9 @@ jobs:
       postgres:
         image: postgres:16
         env:
-          APP_ENV: test
-          APP_NAME: teampling-test
           POSTGRES_DB: testdb
           POSTGRES_USER: testuser
           POSTGRES_PASSWORD: testpass
-          POSTGRES_HOST: localhost
-          POSTGRES_PORT: "5432"
         ports:
           - 5432:5432
         options: >-
@@ -28,6 +24,16 @@ jobs:
           --health-timeout=5s
           --health-retries=10
 
+    env:
+      PYTHONPATH: ${{ github.workspace }}
+      APP_ENV: test
+      APP_NAME: teampling-test
+      POSTGRES_DB: testdb
+      POSTGRES_USER: testuser
+      POSTGRES_PASSWORD: testpass
+      POSTGRES_HOST: localhost
+      POSTGRES_PORT: "5432"
+
     steps:
       - name: 코드 체크아웃
         uses: actions/checkout@v4
@@ -45,13 +51,11 @@ jobs:
 
       - name: 테스트 실행
         env:
-          PYTHONPATH: ${{ github.workspace }}
           DATABASE_URL: postgresql+psycopg://testuser:testpass@localhost:5432/testdb
         run: pytest -q
 
       - name: Alembic 마이그레이션 테스트
         env:
-          PYTHONPATH: ${{ github.workspace }}
           DATABASE_URL: postgresql+psycopg://testuser:testpass@localhost:5432/testdb
         run: alembic upgrade head
 

From e6ae60abe94c677296d5075d1befacd0569353c4 Mon Sep 17 00:00:00 2001
From: KIMB0B <axzsd96301@gmail.com>
Date: Fri, 20 Mar 2026 22:00:11 +0900
Subject: [PATCH 6/8] =?UTF-8?q?build:=20CD=20=ED=8C=8C=EC=9D=BC=EB=AA=85?=
 =?UTF-8?q?=20=EC=98=A4=EB=A5=98=20=EC=88=98=EC=A0=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .github/workflows/cd.yml | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/.github/workflows/cd.yml b/.github/workflows/cd.yml
index e865975..a7fc83c 100644
--- a/.github/workflows/cd.yml
+++ b/.github/workflows/cd.yml
@@ -75,9 +75,9 @@ jobs:
 
             docker login ghcr.io -u ${{ github.actor }} -p ${{ secrets.GHCR_PAT }}
 
-            docker compose -f docker-compose.prod.yml pull app
+            docker compose -f docker-compose.prod.yaml pull app
 
-            docker compose -f docker-compose.prod.yml run --rm app alembic upgrade head
+            docker compose -f docker-compose.prod.yaml run --rm app alembic upgrade head
 
-            docker compose -f docker-compose.prod.yml up -d app nginx
+            docker compose -f docker-compose.prod.yaml up -d app nginx
             docker image prune -f
\ No newline at end of file

From bee1c74d4bb37490d25311eebbb3d8657406a596 Mon Sep 17 00:00:00 2001
From: KIMB0B <axzsd96301@gmail.com>
Date: Fri, 20 Mar 2026 22:41:49 +0900
Subject: [PATCH 7/8] =?UTF-8?q?build:=20CD=20=EA=B3=BC=EC=A0=95=EC=97=90?=
 =?UTF-8?q?=EC=84=9C=20multi-arch=20=EB=B9=8C=EB=93=9C=EB=A1=9C=20?=
 =?UTF-8?q?=EC=88=98=EC=A0=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .github/workflows/cd.yml | 20 +++++++++++---------
 1 file changed, 11 insertions(+), 9 deletions(-)

diff --git a/.github/workflows/cd.yml b/.github/workflows/cd.yml
index a7fc83c..8d47237 100644
--- a/.github/workflows/cd.yml
+++ b/.github/workflows/cd.yml
@@ -28,19 +28,22 @@ jobs:
       - name: GHCR 로그인
         run: echo "${{ secrets.GITHUB_TOKEN }}" | docker login ghcr.io -u ${{ github.actor }} --password-stdin
 
-      - name: 도커 이미지 빌드
+      - name: QEMU 설정
+        uses: docker/setup-qemu-action@v3
+
+      - name: Buildx 설정
+        uses: docker/setup-buildx-action@v3
+
+      - name: 멀티 아키텍처 이미지 빌드 및 푸시
         run: |
-          docker build \
+          docker buildx build \
+            --platform linux/amd64,linux/arm64 \
             -f Dockerfile \
             -t $IMAGE_NAME:${{ steps.vars.outputs.tag }} \
             -t $IMAGE_NAME:latest \
+            --push \
             .
 
-      - name: 도커 이미지 푸시
-        run: |
-          docker push $IMAGE_NAME:${{ steps.vars.outputs.tag }}
-          docker push $IMAGE_NAME:latest
-
       - name: 서버에 배포 디렉토리 생성
         uses: appleboy/ssh-action@v1.0.3
         with:
@@ -76,8 +79,7 @@ jobs:
             docker login ghcr.io -u ${{ github.actor }} -p ${{ secrets.GHCR_PAT }}
 
             docker compose -f docker-compose.prod.yaml pull app
-
             docker compose -f docker-compose.prod.yaml run --rm app alembic upgrade head
-
             docker compose -f docker-compose.prod.yaml up -d app nginx
+            
             docker image prune -f
\ No newline at end of file

From 3a1a401b054f450943aeada600802ea71e65dc46 Mon Sep 17 00:00:00 2001
From: KIMB0B <axzsd96301@gmail.com>
Date: Fri, 20 Mar 2026 23:11:02 +0900
Subject: [PATCH 8/8] =?UTF-8?q?build:=20main=EB=B8=8C=EB=9E=9C=EC=B9=98=20?=
 =?UTF-8?q?push=EC=8B=9C=20CI/CD=20=EC=9E=91=EB=8F=99=EB=90=98=EB=8F=84?=
 =?UTF-8?q?=EB=A1=9D=20=EB=B3=80=EA=B2=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .github/workflows/cd.yml | 2 +-
 .github/workflows/ci.yml | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/.github/workflows/cd.yml b/.github/workflows/cd.yml
index 8d47237..2b012b9 100644
--- a/.github/workflows/cd.yml
+++ b/.github/workflows/cd.yml
@@ -3,7 +3,7 @@ name: CD
 on:
   push:
     branches:
-      - 'build/6-ci-cd-deploy'
+      - main
 
 jobs:
   deploy:
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 3c76e61..f5db58f 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -3,8 +3,8 @@ name: CI
 on:
   pull_request:
   push:
-    branches: #[develop, main]
-      - 'build/6-ci-cd-deploy'
+    branches: [develop, main]
+
 jobs:
   test:
     runs-on: ubuntu-latest