X-Git-Url: https://git.arvados.org/arvados.git/blobdiff_plain/b208afeedeeb697c39cc44fcbe4e34a069e0b1e2..c0acc59c8ae5f3ab7fead209d840587a827767ae:/tools/compute-images/scripts/base.sh diff --git a/tools/compute-images/scripts/base.sh b/tools/compute-images/scripts/base.sh index 5ee52174ae..6ab9de9184 100644 --- a/tools/compute-images/scripts/base.sh +++ b/tools/compute-images/scripts/base.sh @@ -15,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 @@ -36,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 @@ -66,17 +74,53 @@ wait_for_apt_locks && $SUDO DEBIAN_FRONTEND=noninteractive apt-get -qq --yes ins # 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 + arvados-docker-cleaner + +# 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" == "debian10" ]; then + distro="buster" + elif [ "$DIST" == "debian11" ]; then + distro="bullseye" + fi +elif [[ "$DIST" =~ ^ubuntu ]]; then + family="ubuntu" + if [ "$DIST" == "ubuntu1804" ]; then + distro="bionic" + elif [ "$DIST" == "ubuntu2004" ]; then + distro="focal" + fi +else + echo "Unsupported distribution $DIST" + exit 1 +fi +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 +$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 # 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 - +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 +singularityversion=3.9.9 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} @@ -109,21 +153,6 @@ $SUDO echo -e "{\n \"Quota\": \"10G\",\n \"RemoveStoppedContainers\": \"always $SUDO sed -i 's/GRUB_CMDLINE_LINUX=""/GRUB_CMDLINE_LINUX="cgroup_enable=memory swapaccount=1"/g' /etc/default/grub $SUDO update-grub -# 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 - -$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 - # Make sure user_allow_other is set in fuse.conf $SUDO sed -i 's/#user_allow_other/user_allow_other/g' /etc/fuse.conf @@ -176,8 +205,6 @@ $SUDO mv /tmp/etc-cloud-cloud.cfg.d-07_compute_arvados_dispatch_cloud.cfg /etc/c $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 @@ -191,7 +218,8 @@ if [ "$NVIDIA_GPU_SUPPORT" == "1" ]; then $SUDO apt-key adv --fetch-keys https://developer.download.nvidia.com/compute/cuda/repos/$DIST/x86_64/7fa2af80.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 + # Ubuntu 18.04's add-apt-repository does not understand 'contrib' + $SUDO add-apt-repository contrib || true $SUDO apt-get update $SUDO apt-get -y install cuda @@ -213,24 +241,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