From e247bc0ff8b7fb096cbf36bd1e444b8ef37e0cad Mon Sep 17 00:00:00 2001
From: NaMinhyeok <nmh9097@gmail.com>
Date: Fri, 7 Feb 2025 00:29:44 +0900
Subject: [PATCH] =?UTF-8?q?[#68]=20fix:=20amd64=EB=A7=8C=20=EB=B9=8C?=
 =?UTF-8?q?=EB=93=9C=ED=95=98=EB=8F=84=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

- registry cache 사용
---
 .github/workflows/cd.yml | 17 +++++++++--------
 1 file changed, 9 insertions(+), 8 deletions(-)

diff --git a/.github/workflows/cd.yml b/.github/workflows/cd.yml
index d7b5a9d..6d7ea0c 100644
--- a/.github/workflows/cd.yml
+++ b/.github/workflows/cd.yml
@@ -4,6 +4,7 @@ on:
   push:
     branches:
       - main
+      - fix/**
 
 env:
   NCP_ACCESS_KEY: ${{ secrets.NCP_ACCESS_KEY }}
@@ -34,7 +35,7 @@ jobs:
         id: ip
         run: |
           PUBLIC_IP=$(curl -s https://ifconfig.me)
-          echo "::set-output name=public_ip::$PUBLIC_IP"
+          echo "PUBLIC_IP=$PUBLIC_IP" >> $GITHUB_ENV
 
       - name: Set up Docker Buildx
         uses: docker/setup-buildx-action@v3
@@ -52,12 +53,12 @@ jobs:
           context: .
           file: ./jaknaeso-server/Dockerfile
           push: true
-          platforms: linux/amd64,linux/arm64
+          platforms: linux/amd64
           tags: |
             ${{ env.REGISTRY_URL }}/${{ env.SERVICE_NAME }}:${{ env.BUILD_NUMBER }}
             ${{ env.REGISTRY_URL }}/${{ env.SERVICE_NAME }}:latest
-          cache-from: type=registry,ref=${{ env.REGISTRY_URL }}/${{ env.SERVICE_NAME}}:latest
-          cache-to: type=inline
+          cache-from: type=registry,ref=${{ env.REGISTRY_URL }}/${{ env.SERVICE_NAME}}:buildcache,image-manifest=true,oci-mediatypes=true
+          cache-to: type=registry,ref=${{ env.REGISTRY_URL }}/${{ env.SERVICE_NAME}}:buildcache,mode=max,image-manifest=true,oci-mediatypes=true
 
       - name: Setting NCP CLI & Credentials
         run: |
@@ -73,8 +74,8 @@ jobs:
           cd ~/cli_linux
           ./ncloud vserver addAccessControlGroupInboundRule \
             --regionCode KR --vpcNo ${{ env.NCP_VPC_ID }} \
-            --accessControlGroupNo ${{ secrets.NCP_AGC_ID }} \
-            --accessControlGroupRuleList "protocolTypeCode='TCP', ipBlock='${{ steps.ip.outputs.public_ip }}/32', portRange='22'" > /dev/null 2>&1
+            --accessControlGroupNo ${{ env.NCP_AGC_ID }} \
+            --accessControlGroupRuleList "protocolTypeCode='TCP', ipBlock='${{ env.PUBLIC_IP }}/32', portRange='22'" > /dev/null 2>&1
 
       - name: Create .env file
         run: |
@@ -111,7 +112,7 @@ jobs:
             docker login ${{ env.REGISTRY_URL }} -u ${{ env.NCP_ACCESS_KEY }} -p ${{ env.NCP_SECRET_KEY }}
 
             docker-compose -f ~/docker-compose.yml pull
-            docker-compose -f ~/docker-compose.yml up -d
+            docker-compose -f ~/docker-compose.yml up -d --remove-orphans
             docker-compose exec nginx nginx -s reload
             
             chmod +x ~/scripts/server/register-certbot-cron-job.sh
@@ -125,4 +126,4 @@ jobs:
           ./ncloud vserver removeAccessControlGroupInboundRule \
             --regionCode KR --vpcNo ${{ env.NCP_VPC_ID }} \
             --accessControlGroupNo ${{ env.NCP_AGC_ID }} \
-            --accessControlGroupRuleList "protocolTypeCode='TCP', ipBlock='${{ steps.ip.outputs.public_ip }}/32', portRange='22'" > /dev/null 2>&1
\ No newline at end of file
+            --accessControlGroupRuleList "protocolTypeCode='TCP', ipBlock='${{ env.PUBLIC_IP }}/32', portRange='22'" > /dev/null 2>&1
\ No newline at end of file