From f82a32fbe4a09ef7fa4d39d151ad5d236f08f9c6 Mon Sep 17 00:00:00 2001 From: admin Date: Mon, 23 Mar 2026 13:16:30 +0700 Subject: [PATCH] =?UTF-8?q?260323:1316=20fix=20CI=20:=20Verify=20relaase?= =?UTF-8?q?=20:=20=F0=9F=90=8B=20Login=20to=20Internal=20Registry=20#03?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .gitea/workflows/cd.yml | 26 ++++++++++++++------------ scripts/deploy.sh | 10 ++++++++++ 2 files changed, 24 insertions(+), 12 deletions(-) diff --git a/.gitea/workflows/cd.yml b/.gitea/workflows/cd.yml index 7cb6382..ad31de9 100644 --- a/.gitea/workflows/cd.yml +++ b/.gitea/workflows/cd.yml @@ -72,29 +72,29 @@ jobs: echo "VERSION=$VERSION" >> $GITHUB_OUTPUT echo "Releasing version: $VERSION" - - name: 🐋 Login to Internal Registry + - name: 🐋 Login to Gitea Container Registry uses: docker/login-action@v3 with: - registry: ${{ secrets.REGISTRY_URL }} - username: ${{ secrets.REGISTRY_USERNAME }} - password: ${{ secrets.REGISTRY_PASSWORD }} + registry: git.np-dms.work + username: ${{ github.repository_owner }} + password: ${{ secrets.GITHUB_TOKEN }} - name: 🏗️ Build & Push Backend run: | docker build -f backend/Dockerfile \ - -t ${{ secrets.REGISTRY_URL }}/lcbp3-backend:${{ steps.pkg-version.outputs.VERSION }} \ - -t ${{ secrets.REGISTRY_URL }}/lcbp3-backend:latest . - docker push ${{ secrets.REGISTRY_URL }}/lcbp3-backend:${{ steps.pkg-version.outputs.VERSION }} - docker push ${{ secrets.REGISTRY_URL }}/lcbp3-backend:latest + -t git.np-dms.work/${{ github.repository_owner }}/lcbp3-backend:${{ steps.pkg-version.outputs.VERSION }} \ + -t git.np-dms.work/${{ github.repository_owner }}/lcbp3-backend:latest . + docker push git.np-dms.work/${{ github.repository_owner }}/lcbp3-backend:${{ steps.pkg-version.outputs.VERSION }} + docker push git.np-dms.work/${{ github.repository_owner }}/lcbp3-backend:latest - name: 🏗️ Build & Push Frontend run: | docker build -f frontend/Dockerfile \ --build-arg NEXT_PUBLIC_API_URL=${{ secrets.NEXT_PUBLIC_API_URL }} \ - -t ${{ secrets.REGISTRY_URL }}/lcbp3-frontend:${{ steps.pkg-version.outputs.VERSION }} \ - -t ${{ secrets.REGISTRY_URL }}/lcbp3-frontend:latest . - docker push ${{ secrets.REGISTRY_URL }}/lcbp3-frontend:${{ steps.pkg-version.outputs.VERSION }} - docker push ${{ secrets.REGISTRY_URL }}/lcbp3-frontend:latest + -t git.np-dms.work/${{ github.repository_owner }}/lcbp3-frontend:${{ steps.pkg-version.outputs.VERSION }} \ + -t git.np-dms.work/${{ github.repository_owner }}/lcbp3-frontend:latest . + docker push git.np-dms.work/${{ github.repository_owner }}/lcbp3-frontend:${{ steps.pkg-version.outputs.VERSION }} + docker push git.np-dms.work/${{ github.repository_owner }}/lcbp3-frontend:latest # ============================================================ # JOB 3 : Deploy — Trigger Blue-Green on QNAP @@ -130,4 +130,6 @@ jobs: echo "🚀 Executing Blue-Green deployment..." # Pass registry credentials if needed by the pull command in deploy.sh export DB_PASSWORD="${{ secrets.DB_PASSWORD }}" + export REGISTRY_USER="${{ github.repository_owner }}" + export REGISTRY_TOKEN="${{ secrets.GITHUB_TOKEN }}" ./scripts/deploy.sh diff --git a/scripts/deploy.sh b/scripts/deploy.sh index b29a325..f32afba 100644 --- a/scripts/deploy.sh +++ b/scripts/deploy.sh @@ -46,6 +46,16 @@ echo "✓ Backup created: $BACKUP_FILE.gz" # Step 2: Pull latest images from registry echo "[2/9] Pulling latest Docker images from internal registry..." cd "$LCBP3_DIR/$TARGET" + +if [ -n "$REGISTRY_TOKEN" ] && [ -n "$REGISTRY_USER" ]; then + echo "Logging into Gitea Container Registry..." + echo "$REGISTRY_TOKEN" | docker login git.np-dms.work -u "$REGISTRY_USER" --password-stdin + + echo "Updating docker-compose.yml to use Gitea registry images..." + sed -i -E "s|image: (git\.np-dms\.work/[^/]+/)?lcbp3-backend|image: git.np-dms.work/$REGISTRY_USER/lcbp3-backend|g" docker-compose.yml + sed -i -E "s|image: (git\.np-dms\.work/[^/]+/)?lcbp3-frontend|image: git.np-dms.work/$REGISTRY_USER/lcbp3-frontend|g" docker-compose.yml +fi + docker-compose pull echo "✓ Images pulled"