From 216c40a60c1a03e4084c63c46935e745f9b350c1 Mon Sep 17 00:00:00 2001
From: Dan Grebb <dan@dgrebb.com>
Date: Sun, 26 Nov 2023 23:21:21 -0500
Subject: [PATCH] ci(github): build and push docker image in one step

---
 .github/workflows/docker-build.yml | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

diff --git a/.github/workflows/docker-build.yml b/.github/workflows/docker-build.yml
index 2e40b8e4e..dd146cdf9 100644
--- a/.github/workflows/docker-build.yml
+++ b/.github/workflows/docker-build.yml
@@ -56,15 +56,15 @@ jobs:
         run: |
           npm run --verbose --foreground-scripts init-docker-builder
 
-      - name: 🐳 Build Docker
+      - name: 🐳 Build & Push Docker
         run: |
-          npm run --verbose --foreground-scripts build-docker
+          docker buildx build --push --platform linux/amd64,linux/arm64 -t $REGISTRY/$IMAGE_NAME_LC:$TAG --build-arg BACKSTOPJS_VERSION=$PV docker
 
-      - name: 🐳 Load Docker
-        run: |
-          npm run --verbose --foreground-scripts load-docker
+      # - name: 🐳 Load Docker
+      #   run: |
+      #     npm run --verbose --foreground-scripts load-docker
 
-      - name: 🐳 Push to ghcr.io
-        run: |
-          docker tag backstopjs/backstopjs:$PV $REGISTRY/$IMAGE_NAME_LC:$TAG
-          docker push $REGISTRY/$IMAGE_NAME_LC:$TAG
+      # - name: 🐳 Push to ghcr.io
+      #   run: |
+      #     docker tag backstopjs/backstopjs:$PV $REGISTRY/$IMAGE_NAME_LC:$TAG
+      #     docker push $REGISTRY/$IMAGE_NAME_LC:$TAG