diff --git a/INSTALL.md b/INSTALL.md index 658d591f6..e4f472de7 100644 --- a/INSTALL.md +++ b/INSTALL.md @@ -215,7 +215,8 @@ sudo tee /etc/apparmor.d/apptainer << 'EOF' # Permit unprivileged user namespace creation for apptainer starter abi , include -profile apptainer /usr/local/libexec/apptainer/bin/starter{,-suid} flags=(unconfined) { +profile apptainer /usr/local/libexec/apptainer/bin/starter{,-suid} +flags=(unconfined) { userns, # Site-specific additions and overrides. See local/README for details. include if exists diff --git a/scripts/ci-deb-build-test b/scripts/ci-deb-build-test index 4d60a3e98..bc164f840 100755 --- a/scripts/ci-deb-build-test +++ b/scripts/ci-deb-build-test @@ -6,6 +6,8 @@ # this script runs as root under docker --privileged +OS_MAJOR=$(grep ^VERSION_ID /etc/os-release | cut -d'=' -f2 | sed 's/\"//gI' | cut -d'.' -f1) + # install dependencies apt-get update export DEBIAN_FRONTEND=noninteractive @@ -19,6 +21,21 @@ apt-get install -y \ cryptsetup \ tzdata \ curl wget git + +if [ $OS_MAJOR -gt 23 ]; then +# install dependencies for 24.04 (ubuntu 24.04 does not have python2) +apt-get install -y \ + devscripts \ + debhelper \ + dh-autoreconf \ + help2man \ + libarchive-dev \ + libssl-dev \ + python3 \ + uuid-dev \ + golang-go \ + dh-apparmor +else apt-get install -y \ devscripts \ debhelper \ @@ -30,6 +47,8 @@ apt-get install -y \ uuid-dev \ golang-go \ dh-apparmor +fi + # for squashfuse_ll build apt-get install -y autoconf automake libtool pkg-config libfuse3-dev zlib1g-dev