From bc14f87c6ed1ed24c0590a589f9be13bac5a945d Mon Sep 17 00:00:00 2001
From: Jonathon Reinhart <Jonathon.Reinhart@gmail.com>
Date: Tue, 11 Jul 2023 02:28:40 -0400
Subject: [PATCH 1/3] ci: Set TEST_DOCKER_IMAGE=centos:5

This is what was used in .travis.yml

Closes #258
---
 .github/workflows/build-test.yml | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/.github/workflows/build-test.yml b/.github/workflows/build-test.yml
index d82a86d..b493d52 100644
--- a/.github/workflows/build-test.yml
+++ b/.github/workflows/build-test.yml
@@ -26,6 +26,9 @@ jobs:
 
     runs-on: ${{ matrix.os.version }}
 
+    env:
+      TEST_DOCKER_IMAGE: "centos:5"
+
     steps:
     - uses: actions/checkout@v3
 
@@ -49,6 +52,8 @@ jobs:
         sudo apt-get update
         sudo apt-get install -y busybox musl-tools scons
 
+        docker pull $TEST_DOCKER_IMAGE
+
     - name: List version info
       run: |
         echo "Installed version info:"

From 6ba0ed53d277ec8dfe37103fd1de7400e2e85a8b Mon Sep 17 00:00:00 2001
From: Jonathon Reinhart <Jonathon.Reinhart@gmail.com>
Date: Tue, 11 Jul 2023 03:34:18 -0400
Subject: [PATCH 2/3] test: Update pyinstall test to use scuba

---
 test/pyinstall/run_test.sh | 11 +++--------
 1 file changed, 3 insertions(+), 8 deletions(-)

diff --git a/test/pyinstall/run_test.sh b/test/pyinstall/run_test.sh
index 067cceb..88509d3 100755
--- a/test/pyinstall/run_test.sh
+++ b/test/pyinstall/run_test.sh
@@ -33,15 +33,10 @@ $outfile
 # Run it under an old distro
 if [ -n "$TEST_DOCKER_IMAGE" ]; then
     echo -e "\nRunning staticx executable under $TEST_DOCKER_IMAGE"
-    docker run --rm -it \
-        -v "$(pwd):$(pwd):ro" -w $(pwd) \
-        $TEST_DOCKER_IMAGE \
-        $outfile
+    scuba --image $TEST_DOCKER_IMAGE $outfile
 
     echo -e "\nRunning staticx executable under $TEST_DOCKER_IMAGE with broken NSS"
-    docker run --rm -it \
-        -v "$(pwd):$(pwd):ro" -w $(pwd) \
-        -v "$(realpath ./bad_nsswitch.conf):/etc/nsswitch.conf:ro" \
-        $TEST_DOCKER_IMAGE \
+    scuba --image $TEST_DOCKER_IMAGE \
+        --docker-arg="-v $(realpath ./bad_nsswitch.conf):/etc/nsswitch.conf:ro" \
         $outfile
 fi

From 9fb10f646bf9948dc242a8d13d4eac3010b965ce Mon Sep 17 00:00:00 2001
From: Jonathon Reinhart <Jonathon.Reinhart@gmail.com>
Date: Tue, 11 Jul 2023 03:36:59 -0400
Subject: [PATCH 3/3] test: Update nss-isolated test to use scuba

---
 test/nss-isolated/run_test.sh | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/test/nss-isolated/run_test.sh b/test/nss-isolated/run_test.sh
index 443122c..8faec6e 100755
--- a/test/nss-isolated/run_test.sh
+++ b/test/nss-isolated/run_test.sh
@@ -27,9 +27,8 @@ $outfile
 # Run it under Docker
 if [ -n "$TEST_DOCKER_IMAGE" ]; then
     echo -e "\nRunning staticx executable under $TEST_DOCKER_IMAGE"
-    docker run --rm -it \
-        -v "$(pwd):$(pwd):ro" -w $(pwd) \
-        -v "$(realpath ./bad_nsswitch.conf):/etc/nsswitch.conf:ro" \
-        $TEST_DOCKER_IMAGE \
+
+    scuba --image $TEST_DOCKER_IMAGE \
+        --docker-arg="-v $(realpath ./bad_nsswitch.conf):/etc/nsswitch.conf:ro" \
         $outfile
 fi