Skip to content

Commit 05bb94b

Browse files
Fix being able to use docker or podman
1 parent 7db2827 commit 05bb94b

File tree

2 files changed

+4
-1
lines changed

2 files changed

+4
-1
lines changed

.github/workflows/desktop-e2e.yml

+3
Original file line numberDiff line numberDiff line change
@@ -142,7 +142,10 @@ jobs:
142142
- name: Checkout repository
143143
uses: actions/checkout@v4
144144
- name: Build test framework
145+
uses: crazy-max/ghaction-setup-docker@v3
145146
working-directory: test
147+
env:
148+
CONTAINER_RUNNER: docker
146149
run: ./scripts/container-run.sh ./scripts/build.sh
147150
- uses: actions/upload-artifact@v3
148151
with:

test/scripts/container-run.sh

+1-1
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ if [[ "$(uname -s)" != "Linux" ]]; then
2323
fi
2424

2525
container_image=$(cat "$REPO_DIR/building/linux-container-image.txt")
26-
podman build -t mullvadvpn-app-tests --build-arg IMAGE="${container_image}" .
26+
"$CONTAINER_RUNNER" build -t mullvadvpn-app-tests --build-arg IMAGE="${container_image}" .
2727

2828
exec "$CONTAINER_RUNNER" run --rm -it \
2929
-v "${CARGO_REGISTRY_VOLUME_NAME}":/root/.cargo/registry:Z \

0 commit comments

Comments
 (0)