X-Git-Url: https://git.arvados.org/arvados.git/blobdiff_plain/85e4b825947790d9cde66cb8c390dc2e216dac9a..b02372d2d0ddb9ec7c8a70581b2f4358c6f9c825:/tools/compute-images/scripts/base.sh diff --git a/tools/compute-images/scripts/base.sh b/tools/compute-images/scripts/base.sh index 450a8b3c54..370c3f3a3a 100644 --- a/tools/compute-images/scripts/base.sh +++ b/tools/compute-images/scripts/base.sh @@ -4,6 +4,8 @@ # # SPDX-License-Identifier: Apache-2.0 +set -eu -o pipefail + SUDO=sudo wait_for_apt_locks() { @@ -13,6 +15,9 @@ wait_for_apt_locks() { done } +# $DIST should not have a dot if there is one in /etc/os-release (e.g. 18.04) +DIST=$(. /etc/os-release; echo $ID$VERSION_ID | tr -d '.') + # Run apt-get update $SUDO DEBIAN_FRONTEND=noninteractive apt-get --yes update @@ -34,14 +39,19 @@ fi TMP_LSB=`/usr/bin/lsb_release -c -s` LSB_RELEASE_CODENAME=${TMP_LSB//[$'\t\r\n ']} +SET_RESOLVER= +if [ -n "$RESOLVER" ]; then + SET_RESOLVER="--dns ${RESOLVER}" +fi + # Add the arvados apt repository echo "# apt.arvados.org" |$SUDO tee --append /etc/apt/sources.list.d/apt.arvados.org.list echo "deb http://apt.arvados.org/$LSB_RELEASE_CODENAME $LSB_RELEASE_CODENAME${REPOSUFFIX} main" |$SUDO tee --append /etc/apt/sources.list.d/apt.arvados.org.list # Add the arvados signing key cat /tmp/1078ECD7.asc | $SUDO apt-key add - -# Add the debian keys -wait_for_apt_locks && $SUDO DEBIAN_FRONTEND=noninteractive apt-get install --yes debian-keyring debian-archive-keyring +# Add the debian keys (but don't abort if we can't find them, e.g. on Ubuntu where we don't need them) +wait_for_apt_locks && $SUDO DEBIAN_FRONTEND=noninteractive apt-get install --yes debian-keyring debian-archive-keyring 2>/dev/null || true # Fix locale $SUDO /bin/sed -ri 's/# en_US.UTF-8 UTF-8/en_US.UTF-8 UTF-8/' /etc/locale.gen @@ -58,60 +68,41 @@ wait_for_apt_locks && $SUDO DEBIAN_FRONTEND=noninteractive apt-get -qq --yes ins libcurl4-openssl-dev \ lvm2 \ cryptsetup \ - xfsprogs \ - squashfs-tools + xfsprogs # Install the Arvados packages we need wait_for_apt_locks && $SUDO DEBIAN_FRONTEND=noninteractive apt-get -qq --yes install \ python3-arvados-fuse \ - arvados-docker-cleaner \ - docker.io - -# Get Go and build singularity -goversion=1.17.1 -mkdir -p /var/lib/arvados -rm -rf /var/lib/arvados/go/ -curl -s https://storage.googleapis.com/golang/go${goversion}.linux-amd64.tar.gz | tar -C /var/lib/arvados -xzf - -ln -sf /var/lib/arvados/go/bin/* /usr/local/bin/ - -singularityversion=3.7.4 -curl -Ls https://github.com/sylabs/singularity/archive/refs/tags/v${singularityversion}.tar.gz | tar -C /var/lib/arvados -xzf - -cd /var/lib/arvados/singularity-${singularityversion} + arvados-docker-cleaner -# build dependencies for singularity -wait_for_apt_locks && $SUDO DEBIAN_FRONTEND=noninteractive apt-get -qq --yes install \ - make build-essential libssl-dev uuid-dev cryptsetup - -echo $singularityversion > VERSION -./mconfig --prefix=/var/lib/arvados -make -C ./builddir -make -C ./builddir install -ln -sf /var/lib/arvados/bin/* /usr/local/bin/ - -# set `mksquashfs mem` in the singularity config file if it is configured -if [ "$MKSQUASHFS_MEM" != "" ]; then - echo "mksquashfs mem = ${MKSQUASHFS_MEM}" >> /var/lib/arvados/etc/singularity/singularity.conf +# We want Docker 20.10 or later so that we support glibc 2.33 and up in the container, cf. +# https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=1005906 +dockerversion=5:20.10.13~3-0 +if [[ "$DIST" =~ ^debian ]]; then + family="debian" + if [ "$DIST" == "debian11" ]; then + distro="bullseye" + elif [ "$DIST" == "debian12" ]; then + distro="bookworm" + fi +elif [[ "$DIST" =~ ^ubuntu ]]; then + family="ubuntu" + if [ "$DIST" == "ubuntu2004" ]; then + distro="focal" + elif [ "$DIST" == "ubuntu2204" ]; then + distro="jammy" + fi +else + echo "Unsupported distribution $DIST" + exit 1 fi - -# Print singularity version installed -singularity --version - -# Remove unattended-upgrades if it is installed -wait_for_apt_locks && $SUDO DEBIAN_FRONTEND=noninteractive apt-get -qq --yes remove unattended-upgrades --purge - -# Configure arvados-docker-cleaner -$SUDO mkdir -p /etc/arvados/docker-cleaner -$SUDO echo -e "{\n \"Quota\": \"10G\",\n \"RemoveStoppedContainers\": \"always\"\n}" > /etc/arvados/docker-cleaner/docker-cleaner.json - -# Enable cgroup accounting -$SUDO sed -i 's/GRUB_CMDLINE_LINUX=""/GRUB_CMDLINE_LINUX="cgroup_enable=memory swapaccount=1"/g' /etc/default/grub -$SUDO update-grub +curl -fsSL https://download.docker.com/linux/$family/gpg | $SUDO gpg --dearmor -o /usr/share/keyrings/docker-archive-keyring.gpg +echo deb [arch=amd64 signed-by=/usr/share/keyrings/docker-archive-keyring.gpg] https://download.docker.com/linux/$family/ $distro stable | \ + $SUDO tee /etc/apt/sources.list.d/docker.list +$SUDO apt-get update +$SUDO apt-get -yq --no-install-recommends install docker-ce=${dockerversion}~${family}-${distro} # Set a higher ulimit and the resolver (if set) for docker -if [ "x$RESOLVER" != "x" ]; then - SET_RESOLVER="--dns ${RESOLVER}" -fi - $SUDO sed "s/ExecStart=\(.*\)/ExecStart=\1 --default-ulimit nofile=10000:10000 ${SET_RESOLVER}/g" \ /lib/systemd/system/docker.service \ > /etc/systemd/system/docker.service @@ -122,6 +113,17 @@ $SUDO systemctl daemon-reload # and the BootProbeCommand might be "docker ps -q" $SUDO systemctl disable docker +# Remove unattended-upgrades if it is installed +wait_for_apt_locks && $SUDO DEBIAN_FRONTEND=noninteractive apt-get -qq --yes remove unattended-upgrades --purge + +# Configure arvados-docker-cleaner +$SUDO mkdir -p /etc/arvados/docker-cleaner +$SUDO echo -e "{\n \"Quota\": \"10G\",\n \"RemoveStoppedContainers\": \"always\"\n}" > /etc/arvados/docker-cleaner/docker-cleaner.json + +# Enable cgroup accounting (forcing cgroups v1) +$SUDO echo 'GRUB_CMDLINE_LINUX="$GRUB_CMDLINE_LINUX cgroup_enable=memory swapaccount=1 systemd.unified_cgroup_hierarchy=0"' >> /etc/default/grub +$SUDO update-grub + # Make sure user_allow_other is set in fuse.conf $SUDO sed -i 's/#user_allow_other/user_allow_other/g' /etc/fuse.conf @@ -142,16 +144,34 @@ $SUDO chmod 700 /home/crunch/.ssh/ if [ "x$RESOLVER" != "x" ]; then $SUDO sed -i "s/#prepend domain-name-servers 127.0.0.1;/prepend domain-name-servers ${RESOLVER};/" /etc/dhcp/dhclient.conf fi -# Set up the cloud-init script that will ensure encrypted disks -$SUDO mv /tmp/usr-local-bin-ensure-encrypted-partitions.sh /usr/local/bin/ensure-encrypted-partitions.sh + +# AWS_EBS_AUTOSCALE is not always set, work around unset variable check +EBS_AUTOSCALE=${AWS_EBS_AUTOSCALE:-} + +if [ "$EBS_AUTOSCALE" != "1" ]; then + # Set up the cloud-init script that will ensure encrypted disks + $SUDO mv /tmp/usr-local-bin-ensure-encrypted-partitions.sh /usr/local/bin/ensure-encrypted-partitions.sh +else + wait_for_apt_locks && $SUDO DEBIAN_FRONTEND=noninteractive apt-get -qq --yes install jq unzip + + curl -s "https://awscli.amazonaws.com/awscli-exe-linux-x86_64.zip" -o "/tmp/awscliv2.zip" + unzip -q /tmp/awscliv2.zip -d /tmp && $SUDO /tmp/aws/install + # Pinned to v2.4.5 because we apply a patch below + #export EBS_AUTOSCALE_VERSION=$(curl --silent "https://api.github.com/repos/awslabs/amazon-ebs-autoscale/releases/latest" | jq -r .tag_name) + export EBS_AUTOSCALE_VERSION="ee323f0751c2b6f733692e805b51b9bf3c251bac" + cd /opt && $SUDO git clone https://github.com/arvados/amazon-ebs-autoscale.git + cd /opt/amazon-ebs-autoscale && $SUDO git checkout $EBS_AUTOSCALE_VERSION + + # Set up the cloud-init script that makes use of the AWS EBS autoscaler + $SUDO mv /tmp/usr-local-bin-ensure-encrypted-partitions-aws-ebs-autoscale.sh /usr/local/bin/ensure-encrypted-partitions.sh +fi + $SUDO chmod 755 /usr/local/bin/ensure-encrypted-partitions.sh $SUDO chown root:root /usr/local/bin/ensure-encrypted-partitions.sh $SUDO mv /tmp/etc-cloud-cloud.cfg.d-07_compute_arvados_dispatch_cloud.cfg /etc/cloud/cloud.cfg.d/07_compute_arvados_dispatch_cloud.cfg $SUDO chown root:root /etc/cloud/cloud.cfg.d/07_compute_arvados_dispatch_cloud.cfg if [ "$NVIDIA_GPU_SUPPORT" == "1" ]; then - # $DIST should not have a dot if there is one in /etc/os-release (e.g. 18.04) - DIST=$(. /etc/os-release; echo $ID$VERSION_ID | tr -d '.') # We need a kernel and matching headers if [[ "$DIST" =~ ^debian ]]; then $SUDO apt-get -y install linux-image-cloud-amd64 linux-headers-cloud-amd64 @@ -163,6 +183,7 @@ if [ "$NVIDIA_GPU_SUPPORT" == "1" ]; then # Install CUDA $SUDO apt-key adv --fetch-keys https://developer.download.nvidia.com/compute/cuda/repos/$DIST/x86_64/7fa2af80.pub + $SUDO apt-key adv --fetch-keys https://developer.download.nvidia.com/compute/cuda/repos/$DIST/x86_64/3bf863cc.pub $SUDO apt-get -y install software-properties-common $SUDO add-apt-repository "deb https://developer.download.nvidia.com/compute/cuda/repos/$DIST/x86_64/ /" $SUDO add-apt-repository contrib @@ -187,24 +208,6 @@ if [ "$NVIDIA_GPU_SUPPORT" == "1" ]; then $SUDO tee /etc/apt/sources.list.d/libnvidia-container.list fi - if [ "$DIST" == "debian10" ]; then - # Debian 10 comes with Docker 18.xx, we need 19.03 or later - curl -fsSL https://download.docker.com/linux/debian/gpg | $SUDO gpg --dearmor -o /usr/share/keyrings/docker-archive-keyring.gpg - echo deb [arch=amd64 signed-by=/usr/share/keyrings/docker-archive-keyring.gpg] https://download.docker.com/linux/debian/ buster stable | \ - $SUDO tee /etc/apt/sources.list.d/docker.list - $SUDO apt-get update - $SUDO apt-get -yq --no-install-recommends install docker-ce=5:19.03.15~3-0~debian-buster - - $SUDO sed "s/ExecStart=\(.*\)/ExecStart=\1 --default-ulimit nofile=10000:10000 ${SET_RESOLVER}/g" \ - /lib/systemd/system/docker.service \ - > /etc/systemd/system/docker.service - - $SUDO systemctl daemon-reload - - # docker should not start on boot: we restart it inside /usr/local/bin/ensure-encrypted-partitions.sh, - # and the BootProbeCommand might be "docker ps -q" - $SUDO systemctl disable docker - fi $SUDO apt-get update $SUDO apt-get -y install libnvidia-container1 libnvidia-container-tools nvidia-container-toolkit # This service fails to start when the image is booted without Nvidia GPUs present, which makes @@ -215,4 +218,36 @@ if [ "$NVIDIA_GPU_SUPPORT" == "1" ]; then $SUDO systemctl disable nvidia-persistenced.service fi +# Get Go and build singularity +mkdir -p /var/lib/arvados +rm -rf /var/lib/arvados/go/ +curl -s https://storage.googleapis.com/golang/go${GOVERSION}.linux-amd64.tar.gz | tar -C /var/lib/arvados -xzf - +ln -sf /var/lib/arvados/go/bin/* /usr/local/bin/ + +singularityversion=3.10.4 +cd /var/lib/arvados +git clone --recurse-submodules https://github.com/sylabs/singularity +cd singularity +git checkout v${singularityversion} + +# build dependencies for singularity +wait_for_apt_locks && $SUDO DEBIAN_FRONTEND=noninteractive apt-get -qq --yes install \ + make build-essential libssl-dev uuid-dev cryptsetup \ + squashfs-tools libglib2.0-dev libseccomp-dev + + +echo $singularityversion > VERSION +./mconfig --prefix=/var/lib/arvados +make -C ./builddir +make -C ./builddir install +ln -sf /var/lib/arvados/bin/* /usr/local/bin/ + +# set `mksquashfs mem` in the singularity config file if it is configured +if [ "$MKSQUASHFS_MEM" != "" ]; then + echo "mksquashfs mem = ${MKSQUASHFS_MEM}" >> /var/lib/arvados/etc/singularity/singularity.conf +fi + +# Print singularity version installed +singularity --version + $SUDO apt-get clean