CHORE(ci): update CI/CD to support develop branch

- Add develop branch to CI triggers
- Enable multi-branch deployments
This commit is contained in:
2025-12-03 15:00:50 +09:00
parent ad867df573
commit cc9eef0737

View File

@@ -2,7 +2,7 @@ name: Build Docker Image
on: on:
push: push:
branches: [main] branches: [main, develop]
tags: tags:
- 'v*' - 'v*'
workflow_dispatch: workflow_dispatch:
@@ -79,13 +79,17 @@ jobs:
# Get commit SHA (full 40 characters) # Get commit SHA (full 40 characters)
COMMIT_SHA="${{ github.sha }}" COMMIT_SHA="${{ github.sha }}"
# Method 1: Extract the full SHA tag from docker/metadata-action output # Get current branch name
# docker/metadata-action creates: main-sha-<full-40-char-sha> BRANCH_NAME="${{ github.ref_name }}"
SHA_TAG=$(echo "$TAGS" | grep -oE 'main-sha-[a-f0-9]{40}' | head -n 1) echo "Branch: $BRANCH_NAME"
# Method 2: If not found, try to extract any main-sha- tag (fallback) # Method 1: Extract the full SHA tag from docker/metadata-action output
# docker/metadata-action creates: <branch>-sha-<full-40-char-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 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 if [ -n "$SHA_TAG" ]; then
echo "⚠️ Found SHA tag (may not be full 40 chars): $SHA_TAG" echo "⚠️ Found SHA tag (may not be full 40 chars): $SHA_TAG"
fi fi
@@ -93,7 +97,7 @@ jobs:
# Method 3: Fallback to commit SHA directly (construct the tag) # Method 3: Fallback to commit SHA directly (construct the tag)
if [ -z "$SHA_TAG" ]; then 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" echo "⚠️ Could not extract from tags, using commit SHA: $SHA_TAG"
fi fi
@@ -119,19 +123,34 @@ jobs:
exit 1 exit 1
fi fi
echo "📝 Updating kustomization.yaml with tag: $SHA_TAG" # 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 "⚠️ Unknown branch: $BRANCH_NAME, skipping kustomization update"
exit 0
fi
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 # Update kustomization.yaml with new image tag
# Handle both cases: newTag: (with value) and newTag: (empty) # Handle both cases: newTag: (with value) and newTag: (empty)
sed -i.bak "s|newTag:.*|newTag: $SHA_TAG|" deploy/k8s/overlays/prod/kustomization.yaml sed -i.bak "s|newTag:.*|newTag: $SHA_TAG|" "$KUSTOMIZATION_FILE"
# Verify the update was successful # Verify the update was successful
if grep -q "newTag: $SHA_TAG" deploy/k8s/overlays/prod/kustomization.yaml; then if grep -q "newTag: $SHA_TAG" "$KUSTOMIZATION_FILE"; then
echo "✅ Successfully updated kustomization.yaml" echo "✅ Successfully updated kustomization.yaml"
rm -f deploy/k8s/overlays/prod/kustomization.yaml.bak rm -f "$KUSTOMIZATION_FILE.bak"
else else
echo "❌ ERROR: Failed to update kustomization.yaml" echo "❌ ERROR: Failed to update kustomization.yaml"
cat deploy/k8s/overlays/prod/kustomization.yaml cat "$KUSTOMIZATION_FILE"
exit 1 exit 1
fi fi
@@ -139,11 +158,15 @@ jobs:
if git diff --quiet; then if git diff --quiet; then
echo "No changes to commit" echo "No changes to commit"
else else
git add deploy/k8s/overlays/prod/kustomization.yaml git add "$KUSTOMIZATION_FILE"
git commit -m "Update image to $SHA_TAG" git commit -m "Update $OVERLAY image to $SHA_TAG"
git push git push
echo "✅ Kustomization updated with new image tag: $SHA_TAG" echo "✅ Kustomization updated with new image tag: $SHA_TAG"
fi fi
else
echo " $OVERLAY overlay uses base image (latest tag), skipping kustomization update"
echo " Image built with tag: $SHA_TAG"
fi
- name: Display image information - name: Display image information
run: | run: |