From 9447daaf40b8370447b7b9e82dccbb01347b2978 Mon Sep 17 00:00:00 2001 From: koryeon Date: Tue, 27 Jan 2026 15:36:26 +0900 Subject: [PATCH 1/5] test commit From fa4564663e92a1fd86ebbae5ef1238bb043f3281 Mon Sep 17 00:00:00 2001 From: koryeon Date: Thu, 29 Jan 2026 15:05:36 +0900 Subject: [PATCH 2/5] =?UTF-8?q?ci-ecr=EB=A1=9C=20=EC=9D=B4=EB=AF=B8?= =?UTF-8?q?=EC=A7=80=20=EB=B0=B0=ED=8F=AC?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .github/workflows/aws_ecr.yml | 37 +++++++++++++++++++++++++++++++++++ 1 file changed, 37 insertions(+) create mode 100644 .github/workflows/aws_ecr.yml diff --git a/.github/workflows/aws_ecr.yml b/.github/workflows/aws_ecr.yml new file mode 100644 index 0000000..be4ac73 --- /dev/null +++ b/.github/workflows/aws_ecr.yml @@ -0,0 +1,37 @@ +name: Push Auth Image to ECR + +on: + push: + branches: + - temp-test-branch # 메인 말고 테스트용 브랜치 + +jobs: + build: + runs-on: ubuntu-latest + + steps: + # 코드 체크아웃 + - name: Checkout source code + uses: actions/checkout@v4 + + # AWS 계정 인증 + - name: Configure AWS credentials + uses: aws-actions/configure-aws-credentials@v2 + with: + aws-access-key-id: ${{ secrets.AWS_ACCESS_KEY_ID }} + aws-secret-access-key: ${{ secrets.AWS_SECRET_ACCESS_KEY }} + aws-region: ap-northeast-2 + + # AWS ECR 로그인 + - name: Login to Amazon ECR + uses: aws-actions/amazon-ecr-login@v1 + + # Docker 이미지 빌드 및 ECR 푸시 + - name: Build and push auth image to ECR + uses: docker/build-push-action@v5 + with: + context: santaLog-auth + file: santaLog-auth/Dockerfile + push: true + tags: | + ${{ secrets.AWS_ACCOUNT_ID }}.dkr.ecr.ap-northeast-2.amazonaws.com/santa-auth:latest \ No newline at end of file From d861fbb4e9ed374d0cbee9f8227ca5f8b7e43f5a Mon Sep 17 00:00:00 2001 From: koryeon Date: Thu, 29 Jan 2026 15:25:11 +0900 Subject: [PATCH 3/5] ci-code update --- .github/workflows/aws_ecr.yml | 36 +++++++++++++++++++---------------- 1 file changed, 20 insertions(+), 16 deletions(-) diff --git a/.github/workflows/aws_ecr.yml b/.github/workflows/aws_ecr.yml index be4ac73..7cadef0 100644 --- a/.github/workflows/aws_ecr.yml +++ b/.github/workflows/aws_ecr.yml @@ -3,18 +3,14 @@ name: Push Auth Image to ECR on: push: branches: - - temp-test-branch # 메인 말고 테스트용 브랜치 + - temp-test-branch jobs: - build: + push: runs-on: ubuntu-latest steps: - # 코드 체크아웃 - - name: Checkout source code - uses: actions/checkout@v4 - - # AWS 계정 인증 + # AWS 인증 - name: Configure AWS credentials uses: aws-actions/configure-aws-credentials@v2 with: @@ -22,16 +18,24 @@ jobs: aws-secret-access-key: ${{ secrets.AWS_SECRET_ACCESS_KEY }} aws-region: ap-northeast-2 - # AWS ECR 로그인 + # ECR 로그인 - name: Login to Amazon ECR uses: aws-actions/amazon-ecr-login@v1 - # Docker 이미지 빌드 및 ECR 푸시 - - name: Build and push auth image to ECR - uses: docker/build-push-action@v5 - with: - context: santaLog-auth - file: santaLog-auth/Dockerfile - push: true - tags: | + # Docker Hub 이미지 pull + - name: Pull image from Docker Hub + run: | + docker pull ${{ secrets.DOCKERHUB_USERNAME }}/santa-auth:latest + + # ECR 태그 + - name: Tag image for ECR + run: | + docker tag \ + ${{ secrets.DOCKERHUB_USERNAME }}/santa-auth:latest \ + ${{ secrets.AWS_ACCOUNT_ID }}.dkr.ecr.ap-northeast-2.amazonaws.com/santa-auth:latest + + # ECR push + - name: Push image to ECR + run: | + docker push \ ${{ secrets.AWS_ACCOUNT_ID }}.dkr.ecr.ap-northeast-2.amazonaws.com/santa-auth:latest \ No newline at end of file From 9312efa4aa52a7e172e925ea2d0ab84b43b677a7 Mon Sep 17 00:00:00 2001 From: koryeon Date: Thu, 29 Jan 2026 15:39:18 +0900 Subject: [PATCH 4/5] ci-push article image to ecr --- .github/workflows/aws-ecr-article.yml | 41 +++++++++++++++++++++++++++ 1 file changed, 41 insertions(+) create mode 100644 .github/workflows/aws-ecr-article.yml diff --git a/.github/workflows/aws-ecr-article.yml b/.github/workflows/aws-ecr-article.yml new file mode 100644 index 0000000..60719a4 --- /dev/null +++ b/.github/workflows/aws-ecr-article.yml @@ -0,0 +1,41 @@ +name: Push Article Image to ECR + +on: + push: + branches: + - temp-test-branch # 테스트용 브랜치 (Auth와 동일 패턴) + +jobs: + push: + runs-on: ubuntu-latest + + steps: + # AWS 인증 + - name: Configure AWS credentials + uses: aws-actions/configure-aws-credentials@v2 + with: + aws-access-key-id: ${{ secrets.AWS_ACCESS_KEY_ID }} + aws-secret-access-key: ${{ secrets.AWS_SECRET_ACCESS_KEY }} + aws-region: ap-northeast-2 + + # ECR 로그인 + - name: Login to Amazon ECR + uses: aws-actions/amazon-ecr-login@v1 + + # Docker Hub 이미지 pull + - name: Pull article image from Docker Hub + run: | + docker pull ${{ secrets.DOCKERHUB_USERNAME }}/santa-article:latest + + # ECR 태그 지정 + - name: Tag article image for ECR + run: | + docker tag \ + ${{ secrets.DOCKERHUB_USERNAME }}/santa-article:latest \ + ${{ secrets.AWS_ACCOUNT_ID }}.dkr.ecr.ap-northeast-2.amazonaws.com/santa-article:latest + + # ECR push + - name: Push article image to ECR + run: | + docker push \ + ${{ secrets.AWS_ACCOUNT_ID }}.dkr.ecr.ap-northeast-2.amazonaws.com/santa-article:latest \ No newline at end of file From 70bfec781af823f12a12c17747773f9e9a11f85b Mon Sep 17 00:00:00 2001 From: koryeon Date: Mon, 2 Feb 2026 12:53:41 +0900 Subject: [PATCH 5/5] ci/cd update --- .github/workflows/auth-deploy.yml | 4 ++++ .github/workflows/{aws_ecr.yml => aws-ecr-auth.yml} | 0 2 files changed, 4 insertions(+) rename .github/workflows/{aws_ecr.yml => aws-ecr-auth.yml} (100%) diff --git a/.github/workflows/auth-deploy.yml b/.github/workflows/auth-deploy.yml index 0f4ee84..6029391 100644 --- a/.github/workflows/auth-deploy.yml +++ b/.github/workflows/auth-deploy.yml @@ -50,3 +50,7 @@ jobs: tags: | ${{ secrets.DOCKERHUB_USERNAME }}/santa-auth:${{ github.sha }} ${{ secrets.DOCKERHUB_USERNAME }}/santa-auth:latest + + + + \ No newline at end of file diff --git a/.github/workflows/aws_ecr.yml b/.github/workflows/aws-ecr-auth.yml similarity index 100% rename from .github/workflows/aws_ecr.yml rename to .github/workflows/aws-ecr-auth.yml