From 75e3b9e41cc7a810993302f66c1b1eb76df77953 Mon Sep 17 00:00:00 2001 From: Eduardo Fraga Date: Fri, 9 Aug 2024 13:21:38 -0300 Subject: [PATCH] Changes to be committed: modified: .github/workflows/docker-publish-nginx.yml modified: .github/workflows/docker-publish-php-fpm.yml --- .github/workflows/docker-publish-nginx.yml | 25 ++++++-------------- .github/workflows/docker-publish-php-fpm.yml | 8 +++---- 2 files changed, 11 insertions(+), 22 deletions(-) diff --git a/.github/workflows/docker-publish-nginx.yml b/.github/workflows/docker-publish-nginx.yml index 7773375..2e3b09f 100644 --- a/.github/workflows/docker-publish-nginx.yml +++ b/.github/workflows/docker-publish-nginx.yml @@ -1,15 +1,6 @@ name: Nginx on: - # workflow_run: - # workflows: ["PHP"] - # types: - # - completed - # branches: - # - "latest" - # - "10.0.*" - #schedule: - # - cron: '1 1 1 * *' push: branches: - "latest" @@ -17,7 +8,6 @@ on: types: - published - env: REGISTRY: "docker.io" IMAGE_NAME: ${{ github.repository }} @@ -36,11 +26,11 @@ jobs: uses: actions/checkout@v4 - name: Setup Docker buildx - uses: docker/setup-buildx-action@aa33708b10e362ff993539393ff100fa93ed6a27 + uses: docker/setup-buildx-action@v3 - name: Log into registry ${{ env.REGISTRY }} if: github.event_name != 'pull_request' - uses: docker/login-action@9780b0c442fbb1117ed29e0efdff1e18412f7567 + uses: docker/login-action@v3 with: registry: ${{ env.REGISTRY }} username: ${{ secrets.DOCKERHUB_USERNAME }} @@ -48,19 +38,18 @@ jobs: - name: Extract Docker metadata id: meta - uses: docker/metadata-action@8e5442c4ef9f78752691e2d8f8d19755c6f78e81 + uses: docker/metadata-action@v5 with: images: ${{ env.REGISTRY }}/${{ env.IMAGE_NAME }} flavors: | - latest=true - preffix=nginx- + latest=false tags: | - type=semver,pattern={{version}} - type=sha,format=long + type=semver,pattern={{version}},preffix=nginx- + type=sha,format=long,preffix=nginx- - name: Build and push Docker image id: build-and-push - uses: docker/build-push-action@5176d81f87c23d6fc96624dfdbcd9f3830bbe445 + uses: docker/build-push-action@v5 with: context: ./docker/nginx/ platforms: linux/amd64,linux/arm64 diff --git a/.github/workflows/docker-publish-php-fpm.yml b/.github/workflows/docker-publish-php-fpm.yml index 383df76..bd83d2d 100644 --- a/.github/workflows/docker-publish-php-fpm.yml +++ b/.github/workflows/docker-publish-php-fpm.yml @@ -27,11 +27,11 @@ jobs: uses: actions/checkout@v4 - name: Setup Docker buildx - uses: docker/setup-buildx-action@aa33708b10e362ff993539393ff100fa93ed6a27 + uses: docker/setup-buildx-action@v3 - name: Log into registry ${{ env.REGISTRY }} if: github.event_name != 'pull_request' - uses: docker/login-action@9780b0c442fbb1117ed29e0efdff1e18412f7567 + uses: docker/login-action@v3 with: registry: ${{ env.REGISTRY }} username: ${{ secrets.DOCKERHUB_USERNAME }} @@ -39,7 +39,7 @@ jobs: - name: Extract Docker metadata id: meta - uses: docker/metadata-action@8e5442c4ef9f78752691e2d8f8d19755c6f78e81 + uses: docker/metadata-action@v5 with: images: ${{ env.REGISTRY }}/${{ env.IMAGE_NAME }} flavor: | @@ -51,7 +51,7 @@ jobs: - name: Build and push Docker image id: build-and-push - uses: docker/build-push-action@5176d81f87c23d6fc96624dfdbcd9f3830bbe445 + uses: docker/build-push-action@v5 with: context: ./docker/php/ platforms: linux/amd64,linux/arm64