From 0dd6b1e1341d1b3ac65027e4f7d9e007b0c8f71b Mon Sep 17 00:00:00 2001
From: Alec Scott <alec@bcs.sh>
Date: Sat, 7 Aug 2021 11:02:02 -0700
Subject: [PATCH] Clean Up PR from Container Builder

---
 .github/workflows/build-containers.yml | 11 ++---------
 1 file changed, 2 insertions(+), 9 deletions(-)

diff --git a/.github/workflows/build-containers.yml b/.github/workflows/build-containers.yml
index e9006b32e8..d2dd2d825e 100644
--- a/.github/workflows/build-containers.yml
+++ b/.github/workflows/build-containers.yml
@@ -49,8 +49,6 @@ jobs:
           fi
 
       - name: Log in to GitHub Container Registry
-        # Don't log into registry on pull request.
-        if: github.event_name != 'pull_request'
         uses: docker/login-action@v1
         with:
           registry: ghcr.io
@@ -63,17 +61,12 @@ jobs:
       - name: Set up Docker Buildx
         uses: docker/setup-buildx-action@v1
 
-      - name: Build ${{ matrix.dockerfile[1] }}
+      - name: Build & Deploy ${{ matrix.dockerfile[1] }}
         uses: docker/build-push-action@v2
         with:
           file: share/spack/docker/${{matrix.dockerfile[1]}}
           platforms: ${{ matrix.dockerfile[2] }}
-          push: false
+          push: true
           tags: |
             ${{ env.container }}
             ${{ env.versioned }}
-
-      - name: Deploy ${{ matrix.dockerfile[1] }}
-        # And don't push the container on a pull request.
-        if: github.event_name != 'pull_request'
-        run: docker push ghcr.io/spack/${{ matrix.dockerfile[0]}} --all-tags