[arvados] updated: 2.1.0-2556-gc0acc59c8

[git repository hosting]

Summary of changes:
 tools/compute-images/scripts/base.sh | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

       via  c0acc59c8ae5f3ab7fead209d840587a827767ae (commit)
      from  f3cb43d4be379703a965a1cb14cae5f5c855728f (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.


commit c0acc59c8ae5f3ab7fead209d840587a827767ae
Author: Ward Vandewege <ward at curii.com>
Date:   Thu May 26 12:34:20 2022 -0400

    Make compute node image script compatible with Ubuntu.
    
    No issue #
    
    Arvados-DCO-1.1-Signed-off-by: Ward Vandewege <ward at curii.com>

diff --git a/tools/compute-images/scripts/base.sh b/tools/compute-images/scripts/base.sh
index c9fd0945d..6ab9de918 100644
--- 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 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

-----------------------------------------------------------------------


hooks/post-receive
--