Skip to content

fix(image): probe bwrap after the runner user exists #322

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

Merged
rldyourmnd merged 1 commit into from
Aug 31, 2026
Merged

fix(image): probe bwrap after the runner user exists #322

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
18 changes: 9 additions & 9 deletions internal/imagebuild/assets/provision.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,6 +44,15 @@ ln -sfn /usr/bin/pip3 /usr/local/bin/pip3
python --version >/dev/null
pip --version >/dev/null

systemctl disable --now apt-daily.timer apt-daily-upgrade.timer unattended-upgrades.service 2>/dev/null || true
git lfs install --system
groupadd --force docker
groupadd --force lxd

if ! id runner >/dev/null 2>&1; then
useradd --create-home --home-dir /home/runner --shell /bin/bash --groups sudo runner
fi

# bubblewrap is on the image for consumers that need a network isolator, but
# a binary on disk is not a capability: Ubuntu 24.04 ships
# kernel.apparmor_restrict_unprivileged_userns=1, and without an AppArmor
Expand All @@ -61,15 +70,6 @@ APPARMOR
chmod 0644 /etc/apparmor.d/bwrap-userns
apparmor_parser --replace /etc/apparmor.d/bwrap-userns
runuser -u runner -- env HOME=/home/runner bwrap --ro-bind / / true

systemctl disable --now apt-daily.timer apt-daily-upgrade.timer unattended-upgrades.service 2>/dev/null || true
git lfs install --system
groupadd --force docker
groupadd --force lxd

if ! id runner >/dev/null 2>&1; then
useradd --create-home --home-dir /home/runner --shell /bin/bash --groups sudo runner
fi
install -d -o root -g root -m 0750 /etc/sudoers.d
printf 'runner ALL=(ALL) NOPASSWD:ALL\n' >/etc/sudoers.d/90-nddev-runner
chmod 0440 /etc/sudoers.d/90-nddev-runner
Expand Down
2 changes: 1 addition & 1 deletion internal/imagebuild/orchestrator_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -164,7 +164,7 @@ func TestRecipeFingerprintIsDeterministic(t *testing.T) {
// alias is part of the recipe, so a manifest whose contents changed under an
// unchanged alias would otherwise ask the builder to produce different bytes
// for a name that is already promoted.
if first != "sha256:835c7ed10be62b3ac1cca36572c08b8661b0df5451f1b594bbb4ce7cf19f9ebf" {
if first != "sha256:4cc00e2ee72d7ed4646f84229f3b6a2d5c6d4aeeb05aae29f15f4e1bd381eeb1" {
t.Fatalf("deployed standard recipe fingerprint drifted: %q", first)
}
smoke, err := SmokeFingerprint(plan)
Expand Down