Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
2 changes: 1 addition & 1 deletion .bootc-dev-infra-commit.txt
Original file line number Diff line number Diff line change
@@ -1 +1 @@
e6bcd3444045825b890b2203bed18ea9c1a4df89
e15b9622fcef58276464960124823108858dc646
11 changes: 8 additions & 3 deletions .devcontainer/devcontainer.json
Original file line number Diff line number Diff line change
Expand Up @@ -13,9 +13,14 @@
},
"features": {},
"runArgs": [
// Because we want to be able to run podman and also use e.g. /dev/kvm
// among other things
"--privileged"
// Minimal security options for nested podman (avoids --privileged):
// - label=disable: Required for mounting /proc in nested user namespace
// - unmask=/proc/*: Allows access to /proc paths needed for nested containers
"--security-opt", "label=disable",
"--security-opt", "unmask=/proc/*",
// Device access for nested containers and VMs
"--device", "/dev/net/tun",
"--device", "/dev/kvm"
],
"postCreateCommand": {
// Our init script
Expand Down
12 changes: 8 additions & 4 deletions .github/actions/bootc-ubuntu-setup/action.yml
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,8 @@ runs:
run: |
set -xeuo pipefail
sudo df -h
unwanted_pkgs=('^aspnetcore-.*' '^dotnet-.*' '^llvm-.*' 'php.*' '^mongodb-.*' '^mysql-.*'
# Use globs for package patterns (apt and dpkg both support fnmatch globs)
unwanted_pkgs=('aspnetcore-*' 'dotnet-*' 'llvm-*' 'php*' 'mongodb-*' 'mysql-*'
azure-cli google-chrome-stable firefox mono-devel)
unwanted_dirs=(/usr/share/dotnet /opt/ghc /usr/local/lib/android /opt/hostedtoolcache/CodeQL)
# Start background removal operations as systemd units; if this causes
Expand All @@ -30,9 +31,12 @@ runs:
for x in ${unwanted_dirs[@]}; do
runcleanup rm -rf "$x"
done
# Apt removals in foreground, as we can't parallelize these
# Apt removals in foreground, as we can't parallelize these.
# Only attempt removal if matching packages are installed.
for x in ${unwanted_pkgs[@]}; do
/bin/time -f '%E %C' sudo apt-get remove -y $x
if dpkg -l "$x" >/dev/null 2>&1; then
/bin/time -f '%E %C' sudo apt-get remove -y "$x"
fi
done
# We really want support for heredocs
- name: Update podman and install just
Expand Down Expand Up @@ -67,7 +71,7 @@ runs:
shell: bash
run: |
set -xeuo pipefail
export BCVK_VERSION=0.9.0
export BCVK_VERSION=0.10.0
# see https://github.com/bootc-dev/bcvk/issues/176
/bin/time -f '%E %C' sudo apt install -y libkrb5-dev pkg-config libvirt-dev genisoimage qemu-utils qemu-kvm virtiofsd libvirt-daemon-system python3-virt-firmware
# Something in the stack is overriding this, but we want session right now for bcvk
Expand Down