diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 23f3e836..c9e4ed4c 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -3,38 +3,43 @@ name: Docker Image CI on: 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 + - name: Checkout + uses: actions/checkout@v4 + + - name: Docker meta id: meta - uses: docker/metadata-action@v3 + uses: docker/metadata-action@v5 with: - images: ${{ secrets.DOCKERHUB_TEMPLATE }} - - - name: Login to DockerHub + images: ${{ vars.DOCKERHUB_TEMPLATE }} + + - name: Login to DockerHub if: github.event_name != 'pull_request' - uses: docker/login-action@v1 + uses: docker/login-action@v3 with: username: ${{ secrets.DOCKERHUB_USERNAME }} password: ${{ secrets.DOCKERHUB_TOKEN }} - - - name: Build and push - uses: docker/build-push-action@v2 + + - name: Build and push + uses: docker/build-push-action@v5 with: context: . push: ${{ github.event_name != 'pull_request' }} - tags: ${{ steps.meta.outputs.tags }}, ${{ secrets.DOCKERHUB_TEMPLATE }}:latest + tags: ${{ steps.meta.outputs.tags }}, ${{ vars.DOCKERHUB_TEMPLATE }}:latest labels: ${{ steps.meta.outputs.labels }}