[ARVADOS] updated: 2.1.0-2067-ge3432f53f

[Git user]

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

       via  e3432f53f29fe0f407168620b1f798df4a9a1862 (commit)
      from  8cb6341670a9164811e82ca7e6cf88af414daa86 (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 e3432f53f29fe0f407168620b1f798df4a9a1862
Author: Ward Vandewege <ward at curii.com>
Date:   Tue Mar 15 12:46:13 2022 -0400

    Handle 'add-apt-repository contrib' on Ubuntu 18.04 properly.
    
    refs #18772
    
    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 5ee52174a..42fe0d034 100644
--- a/tools/compute-images/scripts/base.sh
+++ b/tools/compute-images/scripts/base.sh
@@ -191,7 +191,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
 

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


hooks/post-receive
--