From fb85c00711e7fd029163977f51ccb294b811e070 Mon Sep 17 00:00:00 2001 From: Ty Eggen Date: Tue, 25 Jun 2024 09:57:43 -0700 Subject: [PATCH] ci: refactored actions config --- .github/workflows/docker-image.yml | 78 ++++++++++++++++-------------- 1 file changed, 41 insertions(+), 37 deletions(-) diff --git a/.github/workflows/docker-image.yml b/.github/workflows/docker-image.yml index 41beda4..7f397dc 100644 --- a/.github/workflows/docker-image.yml +++ b/.github/workflows/docker-image.yml @@ -1,41 +1,45 @@ -name: ci +name: Docker Image CI on: - push: - branches: - - 'main' - - 'master' - - 'trunk' - tags: - - 'v*' - pull_request: - branches: - - 'main' - - 'master' - - 'trunk' - workflow_dispatch: + push: + branches: + - 'main' + - 'master' + - 'trunk' + tags: + - 'v*' + pull_request: + branches: + - 'main' + - 'master' + - 'trunk' + workflow_dispatch: jobs: - docker: - runs-on: ubuntu-latest - steps: - - name: Checkout - uses: actions/checkout@v2 - - name: Docker meta - id: meta - uses: docker/metadata-action@v3 - with: - images: ${{ vars.DOCKERHUB_TEMPLATE }} - - name: Login to DockerHub - if: github.event_name != 'pull_request' - uses: docker/login-action@v1 - with: - username: ${{ secrets.DOCKERHUB_USERNAME }} - password: ${{ secrets.DOCKERHUB_TOKEN }} - - name: Build and push - uses: docker/build-push-action@v2 - with: - context: . - push: ${{ github.event_name != 'pull_request' }} - tags: ${{ steps.meta.outputs.tags }}, ${{ vars.DOCKERHUB_TEMPLATE }}:latest - labels: ${{ steps.meta.outputs.labels }} + docker: + runs-on: ubuntu-latest + + steps: + - name: Checkout + uses: actions/checkout@v4 + + - name: Docker meta + id: meta + uses: docker/metadata-action@v5 + with: + images: ${{ vars.DOCKERHUB_TEMPLATE }} + + - name: Login to DockerHub + if: github.event_name != 'pull_request' + uses: docker/login-action@v3 + with: + username: ${{ secrets.DOCKERHUB_USERNAME }} + password: ${{ secrets.DOCKERHUB_TOKEN }} + + - name: Build and push + uses: docker/build-push-action@v5 + with: + context: . + push: ${{ github.event_name != 'pull_request' }} + tags: ${{ steps.meta.outputs.tags }}, ${{ vars.DOCKERHUB_TEMPLATE }}:latest + labels: ${{ steps.meta.outputs.labels }}