diff --git a/.github/workflows/docker-publish.yml b/.github/workflows/docker-publish.yml index c202c22..7c14c5d 100644 --- a/.github/workflows/docker-publish.yml +++ b/.github/workflows/docker-publish.yml @@ -4,7 +4,9 @@ on: #schedule: # - cron: '40 18 * * *' push: - branches: [ "master" ] + branches: + - "master" + - "valitri" # Publish semver tags as releases. tags: [ 'v*.*.*' ] pull_request: diff --git a/.github/workflows/validtri-publish.yml b/.github/workflows/validtri-publish.yml deleted file mode 100644 index 1428f11..0000000 --- a/.github/workflows/validtri-publish.yml +++ /dev/null @@ -1,62 +0,0 @@ -name: Docker-validtri - -on: - #schedule: - # - cron: '40 18 * * *' - push: - branches: [ "valitri" ] - -env: - # Use docker.io for Docker Hub if empty - REGISTRY: ghcr.io - # github.repository as / - IMAGE_NAME: ${{ github.repository }}-validtri - - -jobs: - build: - - runs-on: ubuntu-latest - permissions: - contents: read - packages: write - - steps: - - name: Checkout repository - uses: actions/checkout@v4 - - # Workaround: https://github.com/docker/build-push-action/issues/461 - - name: Setup Docker buildx - uses: docker/setup-buildx-action@v2 - - # Login against a Docker registry except on PR - # https://github.com/docker/login-action - - name: Log into registry ${{ env.REGISTRY }} - if: github.event_name != 'pull_request' - uses: docker/login-action@v2 - with: - registry: ${{ env.REGISTRY }} - username: ${{ github.actor }} - password: ${{ secrets.GITHUB_TOKEN }} - - # Extract metadata (tags, labels) for Docker - # https://github.com/docker/metadata-action - - name: Extract Docker metadata - id: meta - uses: docker/metadata-action@v3 - with: - images: ${{ env.REGISTRY }}/${{ env.IMAGE_NAME }} - - # Build and push Docker image with Buildx (don't push on PR) - # https://github.com/docker/build-push-action - - name: Build and push Docker image - id: build-and-push - uses: docker/build-push-action@v3 - with: - context: . - file: .docker/Dockerfile - push: ${{ github.event_name != 'pull_request' }} - tags: ${{ steps.meta.outputs.tags }} - labels: ${{ steps.meta.outputs.labels }} - cache-from: type=gha - cache-to: type=gha,mode=max