From 51562d6f8c9e25e4a698ca0c67a525e415a194b6 Mon Sep 17 00:00:00 2001 From: EmilioStuart <157625546+EmilioStuart@users.noreply.github.com> Date: Sat, 1 Nov 2025 12:34:45 -0300 Subject: [PATCH 1/6] (cis): Refactor deploy script to remove sudo commands --- .github/workflows/deploy.yml | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/.github/workflows/deploy.yml b/.github/workflows/deploy.yml index c08c0ad..302ffdc 100644 --- a/.github/workflows/deploy.yml +++ b/.github/workflows/deploy.yml @@ -64,20 +64,20 @@ jobs: username: ${{ secrets.EC2_USER }} key: ${{ secrets.EC2_SSH_KEY }} script: | - # 1. Loga o Docker - echo ${{ secrets.GHCR_PAT }} | sudo docker login ghcr.io -u ${{ secrets.GHCR_USER }} --password-stdin + # 1. Loga o Docker da EC2 no GHCR + echo ${{ secrets.GHCR_PAT }} | docker login ghcr.io -u ${{ secrets.GHCR_USER }} --password-stdin # 2. Puxa a imagem nova - sudo docker pull ${{ secrets.IMAGE_NAME }}:latest + docker pull ${{ secrets.IMAGE_NAME }}:latest # 3. Para o container antigo - sudo docker stop api-pg || true + docker stop api-pg || true # 4. Remove o container antigo - sudo docker rm api-pg || true + docker rm api-pg || true - # 5. Sobe o NOVO container - sudo docker run -d \ + # 5. Sobe o NOVO container com a TAG ESPECÍFICA + docker run -d \ -p 80:8081 \ --name api-pg \ --restart unless-stopped \ @@ -85,4 +85,4 @@ jobs: ${{ secrets.IMAGE_NAME }}:latest # 6. Limpa imagens antigas - sudo docker image prune -af + docker image prune -af From 7470f26e1fb03916796abce4a9f57e0966b1e000 Mon Sep 17 00:00:00 2001 From: EmilioStuart <157625546+EmilioStuart@users.noreply.github.com> Date: Sat, 1 Nov 2025 12:48:08 -0300 Subject: [PATCH 2/6] (ci): Use sudo for Docker commands in deploy workflow --- .github/workflows/deploy.yml | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/.github/workflows/deploy.yml b/.github/workflows/deploy.yml index 302ffdc..709154c 100644 --- a/.github/workflows/deploy.yml +++ b/.github/workflows/deploy.yml @@ -64,25 +64,25 @@ jobs: username: ${{ secrets.EC2_USER }} key: ${{ secrets.EC2_SSH_KEY }} script: | - # 1. Loga o Docker da EC2 no GHCR - echo ${{ secrets.GHCR_PAT }} | docker login ghcr.io -u ${{ secrets.GHCR_USER }} --password-stdin + # 1. Loga o Docker + echo ${{ secrets.GHCR_PAT }} | sudo docker login ghcr.io -u ${{ secrets.GHCR_USER }} --password-stdin # 2. Puxa a imagem nova - docker pull ${{ secrets.IMAGE_NAME }}:latest + sudo docker pull ${{ secrets.IMAGE_NAME }}:latest # 3. Para o container antigo - docker stop api-pg || true + sudo docker stop api-pg || true # 4. Remove o container antigo - docker rm api-pg || true + sudo docker rm api-pg || true - # 5. Sobe o NOVO container com a TAG ESPECÍFICA - docker run -d \ + # 5. Sobe o NOVO container + sudo docker run -d \ -p 80:8081 \ --name api-pg \ --restart unless-stopped \ --env-file /home/ubuntu/api.env \ - ${{ secrets.IMAGE_NAME }}:latest + ghcr.io/projectpurpura/api-pg:latest # 6. Limpa imagens antigas - docker image prune -af + sudo docker image prune -af From a02be9a540a841171558823a57c6886795b9b5f4 Mon Sep 17 00:00:00 2001 From: EmilioStuart <157625546+EmilioStuart@users.noreply.github.com> Date: Sat, 1 Nov 2025 12:59:11 -0300 Subject: [PATCH 3/6] (ci): Update Docker commands in deploy workflow --- .github/workflows/deploy.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/deploy.yml b/.github/workflows/deploy.yml index 709154c..e50aa07 100644 --- a/.github/workflows/deploy.yml +++ b/.github/workflows/deploy.yml @@ -64,11 +64,11 @@ jobs: username: ${{ secrets.EC2_USER }} key: ${{ secrets.EC2_SSH_KEY }} script: | - # 1. Loga o Docker + # 1. Loga o Docker (T echo ${{ secrets.GHCR_PAT }} | sudo docker login ghcr.io -u ${{ secrets.GHCR_USER }} --password-stdin # 2. Puxa a imagem nova - sudo docker pull ${{ secrets.IMAGE_NAME }}:latest + sudo docker pull ghcr.io/projectpurpura/api-pg:latest # 3. Para o container antigo sudo docker stop api-pg || true From bfca9528ea0f45fc61544751246a8d59033cf5ce Mon Sep 17 00:00:00 2001 From: EmilioStuart <157625546+EmilioStuart@users.noreply.github.com> Date: Sat, 1 Nov 2025 13:11:12 -0300 Subject: [PATCH 4/6] (ci): Update GitHub Actions workflow for deployment --- .github/workflows/deploy.yml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/.github/workflows/deploy.yml b/.github/workflows/deploy.yml index e50aa07..6d6a159 100644 --- a/.github/workflows/deploy.yml +++ b/.github/workflows/deploy.yml @@ -11,17 +11,17 @@ jobs: steps: - name: Checkout repository - uses: actions/checkout@v3 + uses: actions/checkout@v4 - name: Log in to GHCR - uses: docker/login-action@v2 + uses: docker/login-action@v3 with: registry: ghcr.io username: ${{ github.repository_owner }} password: ${{ secrets.GHCR_PAT }} - name: Build and push Docker image - uses: docker/build-push-action@v4 + uses: docker/build-push-action@v6 with: context: . push: true @@ -64,7 +64,7 @@ jobs: username: ${{ secrets.EC2_USER }} key: ${{ secrets.EC2_SSH_KEY }} script: | - # 1. Loga o Docker (T + # 1. Loga o Docker echo ${{ secrets.GHCR_PAT }} | sudo docker login ghcr.io -u ${{ secrets.GHCR_USER }} --password-stdin # 2. Puxa a imagem nova From 9d33c7f5a2429db998fa8d6ef040534968df6cfc Mon Sep 17 00:00:00 2001 From: EmilioStuart <157625546+EmilioStuart@users.noreply.github.com> Date: Sat, 1 Nov 2025 13:25:03 -0300 Subject: [PATCH 5/6] (ci): Update GitHub Actions workflow to use lower versions --- .github/workflows/deploy.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/deploy.yml b/.github/workflows/deploy.yml index 6d6a159..a4639b9 100644 --- a/.github/workflows/deploy.yml +++ b/.github/workflows/deploy.yml @@ -11,17 +11,17 @@ jobs: steps: - name: Checkout repository - uses: actions/checkout@v4 + uses: actions/checkout@v3 - name: Log in to GHCR - uses: docker/login-action@v3 + uses: docker/login-action@v2 with: registry: ghcr.io username: ${{ github.repository_owner }} password: ${{ secrets.GHCR_PAT }} - name: Build and push Docker image - uses: docker/build-push-action@v6 + uses: docker/build-push-action@v4 with: context: . push: true From a90acde58aef595799696e6c5dc35b8d2db12e93 Mon Sep 17 00:00:00 2001 From: EmilioStuart <157625546+EmilioStuart@users.noreply.github.com> Date: Sat, 1 Nov 2025 13:32:04 -0300 Subject: [PATCH 6/6] (ci): Update Docker login command in deploy workflow --- .github/workflows/deploy.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/deploy.yml b/.github/workflows/deploy.yml index a4639b9..ed31e35 100644 --- a/.github/workflows/deploy.yml +++ b/.github/workflows/deploy.yml @@ -65,7 +65,7 @@ jobs: key: ${{ secrets.EC2_SSH_KEY }} script: | # 1. Loga o Docker - echo ${{ secrets.GHCR_PAT }} | sudo docker login ghcr.io -u ${{ secrets.GHCR_USER }} --password-stdin + printf '%s' "${{ secrets.GHCR_PAT }}" | sudo docker login ghcr.io -u "${{ secrets.GHCR_USER }}" --password-stdin # 2. Puxa a imagem nova sudo docker pull ghcr.io/projectpurpura/api-pg:latest