Skip to content

Commit ffd7d42

Browse files
committed
test-devcontainer: Build image before testing
The test was pulling pre-built images from the registry, but those don't have the selftest script until this PR is merged. Build the image locally first using the existing just targets. Also switch from docker to podman for consistency with the build. Signed-off-by: Colin Walters <walters@verbum.org>
1 parent deb2cb8 commit ffd7d42

2 files changed

Lines changed: 5 additions & 10 deletions

File tree

.github/workflows/test-devcontainer.yml

Lines changed: 3 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -27,12 +27,8 @@ jobs:
2727
- name: Set up runner
2828
uses: bootc-dev/actions/bootc-ubuntu-setup@main
2929

30-
- name: Login to GitHub Container Registry
31-
uses: docker/login-action@v3
32-
with:
33-
registry: ${{ env.REGISTRY }}
34-
username: ${{ github.repository_owner }}
35-
password: ${{ secrets.GITHUB_TOKEN }}
30+
- name: Build devcontainer image
31+
run: just devenv-build-${{ matrix.os }}
3632

3733
- name: Test nested podman in devcontainer
38-
run: just devcontainer-test ${{ env.REGISTRY }}/${{ github.repository_owner }}/devenv-${{ matrix.os }}:latest
34+
run: just devcontainer-test localhost/bootc-devenv-${{ matrix.os }}:latest

Justfile

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,6 @@ devenv-build: devenv-build-debian
1515

1616
# Test nested podman and VMs work in a devcontainer image
1717
# Usage: just devcontainer-test <image>
18-
# Example: just devcontainer-test ghcr.io/bootc-dev/devenv-debian:latest
19-
# Note: Uses --privileged because Docker doesn't support podman's unmask=/proc/* option
18+
# Example: just devcontainer-test localhost/bootc-devenv-debian:latest
2019
devcontainer-test image:
21-
docker run --rm --privileged "{{ image }}" /usr/libexec/devenv-selftest.sh
20+
podman run --rm --privileged "{{ image }}" /usr/libexec/devenv-selftest.sh

0 commit comments

Comments
 (0)