From d53a01432ed6c5d87a2b8a02f164967ad12b2112 Mon Sep 17 00:00:00 2001 From: icurfer Date: Wed, 22 Oct 2025 18:11:46 +0900 Subject: [PATCH] update v0.0.7-r1 --- .github/workflows/build.yaml | 56 ++++++++++++------------------------ version | 2 +- 2 files changed, 20 insertions(+), 38 deletions(-) diff --git a/.github/workflows/build.yaml b/.github/workflows/build.yaml index 9fe7da3..752d16d 100644 --- a/.github/workflows/build.yaml +++ b/.github/workflows/build.yaml @@ -24,26 +24,26 @@ jobs: uses: juliangruber/read-file-action@v1 with: path: ./version -### off-test ### - # - name: Install Docker // Docker 설치 - # run: | - # curl -fsSL https://get.docker.com -o get-docker.sh - # sh get-docker.sh - # if: runner.os == 'Linux' - # - name: Set up Docker Buildx - # # uses: https://github.com/docker/setup-buildx-action@v1 - # uses: docker/setup-buildx-action@v1 + - name: Install Docker // Docker 설치 + run: | + curl -fsSL https://get.docker.com -o get-docker.sh + sh get-docker.sh + if: runner.os == 'Linux' - # - name: Login to Registry - # run: docker login -u ${{ secrets.DOCKER_ID }} -p ${{ secrets.DOCKER_PW }} https://harbor.icurfer.com + - name: Set up Docker Buildx + # uses: https://github.com/docker/setup-buildx-action@v1 + uses: docker/setup-buildx-action@v1 - # - name: build - # run: docker build -t harbor.icurfer.com/msa-demo/msa-django-ansible:${{ steps.img-ver.outputs.content }} . + - name: Login to Registry + run: docker login -u ${{ secrets.DOCKER_ID }} -p ${{ secrets.DOCKER_PW }} https://harbor.icurfer.com + + - name: build + run: docker build -t harbor.icurfer.com/msa-demo/msa-django-ansible:${{ steps.img-ver.outputs.content }} . + + - name: Push to Docker + run: docker push harbor.icurfer.com/msa-demo/msa-django-ansible:${{ steps.img-ver.outputs.content }} - # - name: Push to Docker - # run: docker push harbor.icurfer.com/msa-demo/msa-django-ansible:${{ steps.img-ver.outputs.content }} -### off-test ### ## pre cd - name: Setup Kustomize uses: yokawasa/action-setup-kube-tools@v0.9.2 @@ -58,30 +58,12 @@ jobs: token: ${{ secrets.ACTION_TOKEN }} path: cd-msa-django-ansible - - name: Update container image Tag + - name: Update Kubernetes resources run: | cd cd-msa-django-ansible/overlays/dev/ kustomize edit set image harbor.icurfer.com/msa-demo/msa-django-ansible:${{ steps.img-ver.outputs.content }} cat kustomization.yaml - - - name: Update container name - run: | - cd cd-msa-django-ansible/overlays/dev/ - - echo "✅ Installing yq..." - wget -qO /usr/local/bin/yq https://github.com/mikefarah/yq/releases/download/v4.44.3/yq_linux_amd64 - chmod +x /usr/local/bin/yq - - echo "✅ Updating container name in patch-deployment.yaml..." - VERSION="${{ steps.img-ver.outputs.content }}" - VERSION_SAFE=$(echo "$VERSION" | tr '.' 'd') - - yq e -i ".spec.template.spec.containers[0].name = \"msa-django-ansible-${VERSION_SAFE}\"" patch-deployment.yaml - - echo "✅ Final patch-deployment.yaml content:" - cat patch-deployment.yaml - - + ## cd commit - name: Commit files run: | @@ -89,4 +71,4 @@ jobs: git config --global user.email "icurfer@gmail.com" git config --global user.name "icurfer" git commit -am "Update image tag" - git push -u origin main \ No newline at end of file + git push -u origin main \ No newline at end of file diff --git a/version b/version index c41f466..999d800 100644 --- a/version +++ b/version @@ -1 +1 @@ -v0.0.7-r1 \ No newline at end of file +v0.0.7-r2 \ No newline at end of file