From a8e7868c7a1f24f2d211fb470a24aaa0b87e4c23 Mon Sep 17 00:00:00 2001 From: Marcus Date: Sat, 31 Jan 2026 10:56:39 -0300 Subject: [PATCH] ajustes --- .forgejo/workflows/deploy.yaml | 68 +++++++++++++++++--------- k8s/dev/backend-deployment-dev.yaml | 2 +- k8s/dev/backoffice-deployment-dev.yaml | 2 +- 3 files changed, 46 insertions(+), 26 deletions(-) diff --git a/.forgejo/workflows/deploy.yaml b/.forgejo/workflows/deploy.yaml index faea836..e030803 100644 --- a/.forgejo/workflows/deploy.yaml +++ b/.forgejo/workflows/deploy.yaml @@ -10,8 +10,8 @@ jobs: build-and-push: runs-on: docker-ready env: - REGISTRY: pipe.gohorsejobs.com DOCKER_API_VERSION: "1.43" + REGISTRY: pipe.gohorsejobs.com defaults: run: shell: sh @@ -19,39 +19,55 @@ jobs: - name: Install Dependencies run: | sed -i 's/dl-cdn.alpinelinux.org/mirror.leaseweb.com/g' /etc/apk/repositories - apk add --no-cache git docker-cli nodejs + apk add --no-cache git docker-cli docker-cli-buildx nodejs - name: Checkout code uses: actions/checkout@v4 with: fetch-depth: 1 - - name: Login to Registry + - name: Set up Docker Buildx run: | - echo "${{ secrets.FORGEJO_TOKEN }}" | docker login ${{ env.REGISTRY }} -u bohessefm --password-stdin + docker buildx create --use --driver docker-container --name local-builder || docker buildx use local-builder + docker buildx inspect --bootstrap + + - name: Login to Forgejo Registry + uses: docker/login-action@v3 + with: + registry: ${{ env.REGISTRY }} + username: bohessefm + password: ${{ secrets.FORGEJO_TOKEN }} - name: Build and Push Backend - run: | - cd backend - docker build -t ${{ env.REGISTRY }}/bohessefm/gohorsejobs:latest -t ${{ env.REGISTRY }}/bohessefm/gohorsejobs:${{ github.sha }} . - docker push ${{ env.REGISTRY }}/bohessefm/gohorsejobs:latest - docker push ${{ env.REGISTRY }}/bohessefm/gohorsejobs:${{ github.sha }} + uses: docker/build-push-action@v5 + with: + context: ./backend + file: ./backend/Dockerfile + push: true + provenance: false + tags: | + ${{ env.REGISTRY }}/bohessefm/gohorsejobs:latest + ${{ env.REGISTRY }}/bohessefm/gohorsejobs:${{ github.sha }} - name: Build and Push Backoffice - run: | - cd backoffice - docker build -t ${{ env.REGISTRY }}/bohessefm/backoffice:latest -t ${{ env.REGISTRY }}/bohessefm/backoffice:${{ github.sha }} . - docker push ${{ env.REGISTRY }}/bohessefm/backoffice:latest - docker push ${{ env.REGISTRY }}/bohessefm/backoffice:${{ github.sha }} + uses: docker/build-push-action@v5 + with: + context: ./backoffice + file: ./backoffice/Dockerfile + push: true + provenance: false + tags: | + ${{ env.REGISTRY }}/bohessefm/backoffice:latest + ${{ env.REGISTRY }}/bohessefm/backoffice:${{ github.sha }} deploy-to-k3s: needs: build-and-push runs-on: docker-ready defaults: run: - shell: sh # <--- CRUCIAL: Adicionado para evitar erro de 'bash not found' + shell: sh steps: - - name: Install Tools + - name: Install Tools (Git & Kubectl) run: | sed -i 's/dl-cdn.alpinelinux.org/mirror.leaseweb.com/g' /etc/apk/repositories apk add --no-cache git curl @@ -74,22 +90,26 @@ jobs: # 1. Namespace kubectl create namespace gohorsejobsdev --dry-run=client -o yaml | kubectl apply -f - - - # 2. Secret de Pull (Nomeado como registry-auth conforme sua preferência) + + # 2. Secret para o K8s conseguir baixar a imagem (Crucial para o seu spec) kubectl -n gohorsejobsdev create secret docker-registry registry-auth \ --docker-server=${{ env.REGISTRY }} \ --docker-username=bohessefm \ --docker-password='${{ secrets.FORGEJO_TOKEN }}' \ --dry-run=client -o yaml | kubectl apply -f - - # 3. Secrets da Aplicação (Idempotente) + # 3. Secrets da aplicação + kubectl -n gohorsejobsdev delete secret backend-secrets --ignore-not-found kubectl -n gohorsejobsdev create secret generic backend-secrets \ - --from-literal=DATABASE_URL='${{ vars.DATABASE_URL }}' \ - --dry-run=client -o yaml | kubectl apply -f - + --from-literal=DATABASE_URL="${{ vars.DATABASE_URL }}" \ + --from-literal=JWT_SECRET="${{ vars.JWT_SECRET }}" \ + --from-literal=MTU="${{ vars.MTU }}" - # 4. Aplicar Manifestos + # 4. Aplica manifestos kubectl apply -f k8s/dev/ -n gohorsejobsdev - # 5. Atualização Direta de Imagem + # 5. Atualização forçada (SHA garante que o K8s baixe a versão nova) kubectl -n gohorsejobsdev set image deployment/gohorse-backend-dev backend=${{ env.REGISTRY }}/bohessefm/gohorsejobs:${{ github.sha }} - kubectl -n gohorsejobsdev set image deployment/gohorse-backoffice-dev backoffice=${{ env.REGISTRY }}/bohessefm/backoffice:${{ github.sha }} \ No newline at end of file + kubectl -n gohorsejobsdev set image deployment/gohorse-backoffice-dev backoffice=${{ env.REGISTRY }}/bohessefm/backoffice:${{ github.sha }} + + kubectl -n gohorsejobsdev rollout status deployment gohorse-backend-dev \ No newline at end of file diff --git a/k8s/dev/backend-deployment-dev.yaml b/k8s/dev/backend-deployment-dev.yaml index e4e8562..1676b80 100644 --- a/k8s/dev/backend-deployment-dev.yaml +++ b/k8s/dev/backend-deployment-dev.yaml @@ -15,7 +15,7 @@ spec: env: development spec: imagePullSecrets: - - name: forgejo-registry + - name: registry-auth initContainers: - name: set-mtu image: busybox diff --git a/k8s/dev/backoffice-deployment-dev.yaml b/k8s/dev/backoffice-deployment-dev.yaml index c1e57e2..fc636bd 100644 --- a/k8s/dev/backoffice-deployment-dev.yaml +++ b/k8s/dev/backoffice-deployment-dev.yaml @@ -15,7 +15,7 @@ spec: env: development spec: imagePullSecrets: - - name: forgejo-registry + - name: registry-auth initContainers: - name: set-mtu image: busybox