From cc9eef07375049cab8801db7f094cadb72e8d06b Mon Sep 17 00:00:00 2001 From: Mayne0213 Date: Wed, 3 Dec 2025 15:00:50 +0900 Subject: [PATCH 1/3] CHORE(ci): update CI/CD to support develop branch - Add develop branch to CI triggers - Enable multi-branch deployments --- .github/workflows/build.yml | 89 +++++++++++++++++++++++-------------- 1 file changed, 56 insertions(+), 33 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 4734f65..3cc1592 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -2,7 +2,7 @@ name: Build Docker Image on: push: - branches: [main] + branches: [main, develop] tags: - 'v*' workflow_dispatch: @@ -75,33 +75,37 @@ jobs: echo "All tags:" echo "$TAGS" echo "---" - + # Get commit SHA (full 40 characters) COMMIT_SHA="${{ github.sha }}" - + + # Get current branch name + BRANCH_NAME="${{ github.ref_name }}" + echo "Branch: $BRANCH_NAME" + # Method 1: Extract the full SHA tag from docker/metadata-action output - # docker/metadata-action creates: main-sha- - SHA_TAG=$(echo "$TAGS" | grep -oE 'main-sha-[a-f0-9]{40}' | head -n 1) - - # Method 2: If not found, try to extract any main-sha- tag (fallback) + # docker/metadata-action creates: -sha- + SHA_TAG=$(echo "$TAGS" | grep -oE "${BRANCH_NAME}-sha-[a-f0-9]{40}" | head -n 1) + + # Method 2: If not found, try to extract any branch-sha- tag (fallback) if [ -z "$SHA_TAG" ]; then - SHA_TAG=$(echo "$TAGS" | grep -oE 'main-sha-[a-f0-9]+' | head -n 1) + SHA_TAG=$(echo "$TAGS" | grep -oE "${BRANCH_NAME}-sha-[a-f0-9]+" | head -n 1) if [ -n "$SHA_TAG" ]; then echo "⚠️ Found SHA tag (may not be full 40 chars): $SHA_TAG" fi fi - + # Method 3: Fallback to commit SHA directly (construct the tag) if [ -z "$SHA_TAG" ]; then - SHA_TAG="main-sha-$COMMIT_SHA" + SHA_TAG="${BRANCH_NAME}-sha-$COMMIT_SHA" echo "⚠️ Could not extract from tags, using commit SHA: $SHA_TAG" fi - + if [ -z "$SHA_TAG" ]; then echo "❌ ERROR: Failed to extract SHA tag" exit 1 fi - + echo "sha-tag=$SHA_TAG" >> $GITHUB_OUTPUT echo "✅ Extracted SHA tag: $SHA_TAG" @@ -118,31 +122,50 @@ jobs: echo "❌ ERROR: SHA_TAG is empty, cannot update kustomization" exit 1 fi - - echo "📝 Updating kustomization.yaml with tag: $SHA_TAG" - - # Update kustomization.yaml with new image tag - # Handle both cases: newTag: (with value) and newTag: (empty) - sed -i.bak "s|newTag:.*|newTag: $SHA_TAG|" deploy/k8s/overlays/prod/kustomization.yaml - - # Verify the update was successful - if grep -q "newTag: $SHA_TAG" deploy/k8s/overlays/prod/kustomization.yaml; then - echo "✅ Successfully updated kustomization.yaml" - rm -f deploy/k8s/overlays/prod/kustomization.yaml.bak + + # Determine overlay based on branch + BRANCH_NAME="${{ github.ref_name }}" + if [ "$BRANCH_NAME" = "main" ]; then + OVERLAY="prod" + elif [ "$BRANCH_NAME" = "develop" ]; then + OVERLAY="dev" else - echo "❌ ERROR: Failed to update kustomization.yaml" - cat deploy/k8s/overlays/prod/kustomization.yaml - exit 1 + echo "⚠️ Unknown branch: $BRANCH_NAME, skipping kustomization update" + exit 0 fi - # Commit and push if there are changes - if git diff --quiet; then - echo "No changes to commit" + KUSTOMIZATION_FILE="deploy/k8s/overlays/$OVERLAY/kustomization.yaml" + + # Check if kustomization file has images section + if grep -q "images:" "$KUSTOMIZATION_FILE"; then + echo "📝 Updating $KUSTOMIZATION_FILE with tag: $SHA_TAG" + + # Update kustomization.yaml with new image tag + # Handle both cases: newTag: (with value) and newTag: (empty) + sed -i.bak "s|newTag:.*|newTag: $SHA_TAG|" "$KUSTOMIZATION_FILE" + + # Verify the update was successful + if grep -q "newTag: $SHA_TAG" "$KUSTOMIZATION_FILE"; then + echo "✅ Successfully updated kustomization.yaml" + rm -f "$KUSTOMIZATION_FILE.bak" + else + echo "❌ ERROR: Failed to update kustomization.yaml" + cat "$KUSTOMIZATION_FILE" + exit 1 + fi + + # Commit and push if there are changes + if git diff --quiet; then + echo "No changes to commit" + else + git add "$KUSTOMIZATION_FILE" + git commit -m "Update $OVERLAY image to $SHA_TAG" + git push + echo "✅ Kustomization updated with new image tag: $SHA_TAG" + fi else - git add deploy/k8s/overlays/prod/kustomization.yaml - git commit -m "Update image to $SHA_TAG" - git push - echo "✅ Kustomization updated with new image tag: $SHA_TAG" + echo "ℹ️ $OVERLAY overlay uses base image (latest tag), skipping kustomization update" + echo " Image built with tag: $SHA_TAG" fi - name: Display image information From 1b7dcf110d2845909d4e2b5093d0e416fb52ddbe Mon Sep 17 00:00:00 2001 From: Mayne0213 Date: Wed, 3 Dec 2025 15:27:29 +0900 Subject: [PATCH 2/3] CHORE(app): add images to kustomization - Add images section for CD pipeline - Enable image tag updates --- deploy/k8s/overlays/dev/kustomization.yaml | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/deploy/k8s/overlays/dev/kustomization.yaml b/deploy/k8s/overlays/dev/kustomization.yaml index 9de6f59..a44a985 100644 --- a/deploy/k8s/overlays/dev/kustomization.yaml +++ b/deploy/k8s/overlays/dev/kustomization.yaml @@ -11,5 +11,10 @@ resources: commonLabels: environment: development +# 이미지 태그 설정 +images: + - name: ghcr.io/mayne0213/jovies + newTag: develop-sha-latest + patchesStrategicMerge: - deployment-patch.yaml From 8037c0a241988c5c5c12606fb1e93b75ee5e5a7e Mon Sep 17 00:00:00 2001 From: Mayne0213 Date: Thu, 4 Dec 2025 22:05:59 +0900 Subject: [PATCH 3/3] PERF(docker): optimize for arm64 only - Optimize for arm64 only - Remove multi-platform build --- .github/workflows/build.yml | 2 +- deploy/k8s/overlays/dev/kustomization.yaml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 3cc1592..f3ca174 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -61,7 +61,7 @@ jobs: context: ./services/nextjs file: ./deploy/docker/Dockerfile.prod push: true - platforms: linux/amd64,linux/arm64 + platforms: linux/arm64 tags: ${{ steps.meta.outputs.tags }} labels: ${{ steps.meta.outputs.labels }} cache-from: type=gha diff --git a/deploy/k8s/overlays/dev/kustomization.yaml b/deploy/k8s/overlays/dev/kustomization.yaml index a44a985..1a32e91 100644 --- a/deploy/k8s/overlays/dev/kustomization.yaml +++ b/deploy/k8s/overlays/dev/kustomization.yaml @@ -14,7 +14,7 @@ commonLabels: # 이미지 태그 설정 images: - name: ghcr.io/mayne0213/jovies - newTag: develop-sha-latest + newTag: develop-sha-9abc720e2b5164520d27d028073b97213c39bc66 patchesStrategicMerge: - deployment-patch.yaml