Skip to content

Commit

Permalink
fixing some small issues
Browse files Browse the repository at this point in the history
Signed-off-by: jason yang <jasonyangshadow@gmail.com>
  • Loading branch information
JasonYangShadow committed Jun 7, 2024
1 parent 2fa6b13 commit 2ffd3a1
Show file tree
Hide file tree
Showing 2 changed files with 21 additions and 1 deletion.
3 changes: 2 additions & 1 deletion INSTALL.md
Original file line number Diff line number Diff line change
Expand Up @@ -215,7 +215,8 @@ sudo tee /etc/apparmor.d/apptainer << 'EOF'
# Permit unprivileged user namespace creation for apptainer starter
abi <abi/4.0>,
include <tunables/global>
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 <local/apptainer>
Expand Down
19 changes: 19 additions & 0 deletions scripts/ci-deb-build-test
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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 \
Expand All @@ -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

Expand Down

0 comments on commit 2ffd3a1

Please sign in to comment.