From b8fbe681fc3c53d9107d051d7c6b147e4becda6b Mon Sep 17 00:00:00 2001
From: Joe Corall <jjc223@lehigh.edu>
Date: Wed, 30 Oct 2024 07:49:37 -0400
Subject: [PATCH] fixup

---
 .github/workflows/build-push.yml | 10 ++++++++--
 scripts/docker-entrypoint.sh     |  1 +
 2 files changed, 9 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/build-push.yml b/.github/workflows/build-push.yml
index e400863..b8db9d0 100644
--- a/.github/workflows/build-push.yml
+++ b/.github/workflows/build-push.yml
@@ -46,10 +46,16 @@ jobs:
           fi
         fi
         echo "tag=$TAG" >> $GITHUB_OUTPUT
-        DRUPAL_MAJOR_MINOR=$(echo "${{ matrix.drupal-version }}" | cut -d. -f1 -f2)
+        DRUPAL_MAJOR_MINOR=$(echo "${{ matrix.drupal-version }}" | cut -d. -f1,2)
         echo "drupal_version=$DRUPAL_MAJOR_MINOR" >> $GITHUB_OUTPUT
       id: extract_tag
 
+    - name: Set up QEMU
+      uses: docker/setup-qemu-action@v3
+
+    - name: Set up Docker Buildx
+      uses: docker/setup-buildx-action@v3
+
     - name: Docker Hub Login
       uses: docker/login-action@v3
       with:
@@ -58,7 +64,7 @@ jobs:
         password: ${{ secrets.DOCKER_PASSWORD }}
 
     - name: Build and push dockerhub
-      uses: docker/build-push-action@v5
+      uses: docker/build-push-action@v6
       with:
         platforms: |
           linux/amd64
diff --git a/scripts/docker-entrypoint.sh b/scripts/docker-entrypoint.sh
index 53b3b73..f76893c 100755
--- a/scripts/docker-entrypoint.sh
+++ b/scripts/docker-entrypoint.sh
@@ -68,5 +68,6 @@ drush rs --quiet 127.0.0.1:8282 &
 until curl -s http://127.0.0.1:8282/; do true; done > /dev/null
 
 echo "Running phpunit"
+cp "$PHPUNIT_FILE" web/core/phpunit.xml
 cd "$DRUPAL_DIR/web/core"
 "$DRUPAL_DIR"/vendor/bin/phpunit --debug