projects
/
arvados.git
/ blobdiff
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Make compute node image script compatible with Ubuntu.
[arvados.git]
/
tools
/
compute-images
/
scripts
/
base.sh
diff --git
a/tools/compute-images/scripts/base.sh
b/tools/compute-images/scripts/base.sh
index 260c5d47ee32c8a84af34c6490bcd0a7fa247c00..6ab9de918471da01ebe064a35b0dcebc5e48465a 100644
(file)
--- a/
tools/compute-images/scripts/base.sh
+++ b/
tools/compute-images/scripts/base.sh
@@
-50,8
+50,8
@@
echo "deb http://apt.arvados.org/$LSB_RELEASE_CODENAME $LSB_RELEASE_CODENAME${RE
# Add the arvados signing key
cat /tmp/1078ECD7.asc | $SUDO apt-key add -
# 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
# Fix locale
$SUDO /bin/sed -ri 's/# en_US.UTF-8 UTF-8/en_US.UTF-8 UTF-8/' /etc/locale.gen
@@
-115,13
+115,12
@@
$SUDO systemctl daemon-reload
$SUDO systemctl disable docker
# Get Go and build singularity
$SUDO systemctl disable docker
# Get Go and build singularity
-goversion=1.17.1
mkdir -p /var/lib/arvados
rm -rf /var/lib/arvados/go/
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/
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}
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}