From bcaa725cc1f6bd0960a135ec2a3bd713b2112819 Mon Sep 17 00:00:00 2001 From: Pierce Thompson Date: Fri, 19 Apr 2024 23:22:38 -0400 Subject: [PATCH] Use env var for whether docker should push or not --- .github/workflows/docker.yml | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/.github/workflows/docker.yml b/.github/workflows/docker.yml index a4af87a..6aae7ed 100644 --- a/.github/workflows/docker.yml +++ b/.github/workflows/docker.yml @@ -5,6 +5,7 @@ on: [ push, pull_request ] env: DOCKER_IMAGE: insprill/intellectual DOCKER_PLATFORMS: linux/amd64,linux/arm64 + DOCKER_PUSH: ${{ !env.ACT && (github.ref == 'refs/heads/master' || startsWith(github.ref, 'refs/tags/v')) && github.event_name != 'pull_request' }} jobs: build-docker: @@ -25,14 +26,14 @@ jobs: - name: Login to DockerHub uses: docker/login-action@v3 - if: ${{ !env.ACT && (github.ref == 'refs/heads/master' || startsWith(github.ref, 'refs/tags/v')) && github.event_name != 'pull_request' }} + if: ${{ env.DOCKER_PUSH }} with: username: ${{ secrets.DOCKERHUB_USERNAME }} password: ${{ secrets.DOCKERHUB_TOKEN }} - name: Docker Hub Description uses: peter-evans/dockerhub-description@v3 - if: $${{ !env.ACT && (github.ref == 'refs/heads/master' || startsWith(github.ref, 'refs/tags/v')) && github.event_name != 'pull_request' }} + if: ${{ env.DOCKER_PUSH }} with: username: ${{ secrets.DOCKERHUB_USERNAME }} password: ${{ secrets.DOCKERHUB_TOKEN }} @@ -52,7 +53,7 @@ jobs: uses: docker/build-push-action@v5 with: context: . # Required for running with act - push: ${{ !env.ACT && (github.ref == 'refs/heads/master' || startsWith(github.ref, 'refs/tags/v')) && github.event_name != 'pull_request' }} + push: ${{ env.DOCKER_PUSH }} tags: ${{ env.DOCKER_IMAGE }}:${{ startsWith(github.ref, 'refs/tags/v') && 'latest' || 'develop' }} platforms: ${{ env.DOCKER_PLATFORMS }} cache-from: type=gha