Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

ci: Set TEST_DOCKER_IMAGE=centos:5 #260

Merged
merged 3 commits into from
Aug 6, 2023
Merged

ci: Set TEST_DOCKER_IMAGE=centos:5 #260

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
bc14f87
ci: Set TEST_DOCKER_IMAGE=centos:5
JonathonReinhart Jul 11, 2023
6ba0ed5
test: Update pyinstall test to use scuba
JonathonReinhart Jul 11, 2023
9fb10f6
test: Update nss-isolated test to use scuba
JonathonReinhart Jul 11, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 5 additions & 0 deletions .github/workflows/build-test.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,9 @@ jobs:

runs-on: ${{ matrix.os.version }}

env:
TEST_DOCKER_IMAGE: "centos:5"

steps:
- uses: actions/checkout@v3

Expand All @@ -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:"
Expand Down
7 changes: 3 additions & 4 deletions test/nss-isolated/run_test.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
11 changes: 3 additions & 8 deletions test/pyinstall/run_test.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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