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:" 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 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