Skip to content

Only disable sandbox while builing the builder, keep it enabled for actual builds #338

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

Open
gyscos wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Only disable sandbox while builing the builder, keep it enabled for actual builds #338

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
19 changes: 13 additions & 6 deletions docker/add-aur.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,12 +13,18 @@ if [ "$TARGETPLATFORM" = "linux/amd64" ]; then
cp /etc/pacman.conf.amd64 /etc/pacman.conf
fi

# fix landlock errors in container builds
sed -i '/^\[options\]/a DisableSandbox' /etc/pacman.conf
# Pacman's landlock sandboxing requires kernel support.
# When building with docker-container buildkit locally, landlock isn't available
# and pacman fails with "switching to sandbox user 'alpm' failed".
# In CI (GitHub Actions), landlock works so this isn't needed.
# Use --build-arg DISABLE_SANDBOX=1 to enable this workaround.
PACMAN_FLAGS="--noconfirm --noprogressbar"
if [ "${DISABLE_SANDBOX:-0}" = "1" ]; then
PACMAN_FLAGS="$PACMAN_FLAGS --disable-sandbox"
fi

# we're gonna need sudo to use the helper properly
pacman -Syyu --noconfirm
pacman --sync --needed --noconfirm --noprogressbar pacman-contrib
pacman $PACMAN_FLAGS -Syyu
pacman $PACMAN_FLAGS --sync --needed pacman-contrib

# repopulate keychain
pacman-key --init
Expand All @@ -36,7 +42,8 @@ sed -i 's/^#Server/Server/' /etc/pacman.d/mirrorlist.backup
rankmirrors -n 10 /etc/pacman.d/mirrorlist.backup > /etc/pacman.d/mirrorlist
rm /etc/pacman.d/mirrorlist.backup

pacman --sync --needed --noconfirm --noprogressbar sudo base-devel git rust || echo "Nothing to do"
# we're gonna need sudo to use the helper properly
pacman $PACMAN_FLAGS --sync --needed sudo base-devel git rust || echo "Nothing to do"
git config --global --add safe.directory '*'

# create the user
Expand Down
Loading