Update installer and images to Go 1.17.1.

No issue #

Arvados-DCO-1.1-Signed-off-by: Tom Clegg <tom@curii.com>

diff --git a/build/package-build-dockerfiles/Makefile b/build/package-build-dockerfiles/Makefile
index 80f7c12c101ceb3910fdde2a17b793d4841069cb..51fee9fce144f9978204a2b771d49b45b8473943 100644 (file)
--- a/build/package-build-dockerfiles/Makefile
+++ b/build/package-build-dockerfiles/Makefile
@@ -24,7 +24,7 @@ ubuntu2004/generated: common-generated-all
        test -d ubuntu2004/generated || mkdir ubuntu2004/generated
        cp -f -rlt ubuntu2004/generated common-generated/*
 
-GOTARBALL=go1.16.3.linux-amd64.tar.gz
+GOTARBALL=go1.17.1.linux-amd64.tar.gz
 NODETARBALL=node-v10.23.1-linux-x64.tar.xz
 RVMKEY1=mpapis.asc
 RVMKEY2=pkuczynski.asc

diff --git a/build/package-build-dockerfiles/centos7/Dockerfile b/build/package-build-dockerfiles/centos7/Dockerfile
index 332a8dc83003d4512da61e27613b6f2121eaa426..edfe3405f443bd10fc2b50ca9b504fc76a7654f4 100644 (file)
--- a/build/package-build-dockerfiles/centos7/Dockerfile
+++ b/build/package-build-dockerfiles/centos7/Dockerfile
@@ -31,7 +31,7 @@ RUN cd /usr/local/src \
 && ln -sf /usr/local/src/bash-4.4.12/bash /bin/bash
 
 # Install golang binary
-ADD generated/go1.16.3.linux-amd64.tar.gz /usr/local/
+ADD generated/go1.17.1.linux-amd64.tar.gz /usr/local/
 RUN ln -s /usr/local/go/bin/go /usr/local/bin/
 
 # Install nodejs and npm

diff --git a/build/package-build-dockerfiles/debian10/Dockerfile b/build/package-build-dockerfiles/debian10/Dockerfile
index ad8198fa0db0461fefcf49aca0c7aff9b77db734..809d935880fd4b7beaac09f3cd348ac75a04782c 100644 (file)
--- a/build/package-build-dockerfiles/debian10/Dockerfile
+++ b/build/package-build-dockerfiles/debian10/Dockerfile
@@ -26,7 +26,7 @@ RUN gpg --import --no-tty /tmp/mpapis.asc && \
     /usr/local/rvm/bin/rvm-exec default gem install fpm --version 1.10.2
 
 # Install golang binary
-ADD generated/go1.16.3.linux-amd64.tar.gz /usr/local/
+ADD generated/go1.17.1.linux-amd64.tar.gz /usr/local/
 RUN ln -s /usr/local/go/bin/go /usr/local/bin/
 
 # Install nodejs and npm

diff --git a/build/package-build-dockerfiles/debian11/Dockerfile b/build/package-build-dockerfiles/debian11/Dockerfile
index 99effa3cca6c922b7a6f237b92bb895082b3ed46..06380ef896b2b79669fc758b02616315e5de8525 100644 (file)
--- a/build/package-build-dockerfiles/debian11/Dockerfile
+++ b/build/package-build-dockerfiles/debian11/Dockerfile
@@ -27,7 +27,7 @@ RUN gpg --import --no-tty /tmp/mpapis.asc && \
     /usr/local/rvm/bin/rvm-exec default gem install fpm --version 1.10.2
 
 # Install golang binary
-ADD generated/go1.16.3.linux-amd64.tar.gz /usr/local/
+ADD generated/go1.17.1.linux-amd64.tar.gz /usr/local/
 RUN ln -s /usr/local/go/bin/go /usr/local/bin/
 
 # Install nodejs and npm

diff --git a/build/package-build-dockerfiles/ubuntu1804/Dockerfile b/build/package-build-dockerfiles/ubuntu1804/Dockerfile
index 65c477a91684feaa19acb940b816013377848190..4a210373fa23bde894e1522e35e47d41f769cb7e 100644 (file)
--- a/build/package-build-dockerfiles/ubuntu1804/Dockerfile
+++ b/build/package-build-dockerfiles/ubuntu1804/Dockerfile
@@ -25,7 +25,7 @@ RUN gpg --import --no-tty /tmp/mpapis.asc && \
     /usr/local/rvm/bin/rvm-exec default gem install fpm --version 1.10.2
 
 # Install golang binary
-ADD generated/go1.16.3.linux-amd64.tar.gz /usr/local/
+ADD generated/go1.17.1.linux-amd64.tar.gz /usr/local/
 RUN ln -s /usr/local/go/bin/go /usr/local/bin/
 
 # Install nodejs and npm

diff --git a/build/package-build-dockerfiles/ubuntu2004/Dockerfile b/build/package-build-dockerfiles/ubuntu2004/Dockerfile
index ba6c57df3880797e22218893ab1e42d6660227c4..276b29fc560db62c2a5967d891f710544a18c49b 100644 (file)
--- a/build/package-build-dockerfiles/ubuntu2004/Dockerfile
+++ b/build/package-build-dockerfiles/ubuntu2004/Dockerfile
@@ -25,7 +25,7 @@ RUN gpg --import --no-tty /tmp/mpapis.asc && \
     /usr/local/rvm/bin/rvm-exec default gem install fpm --version 1.10.2
 
 # Install golang binary
-ADD generated/go1.16.3.linux-amd64.tar.gz /usr/local/
+ADD generated/go1.17.1.linux-amd64.tar.gz /usr/local/
 RUN ln -s /usr/local/go/bin/go /usr/local/bin/
 
 # Install nodejs and npm

diff --git a/lib/install/deps.go b/lib/install/deps.go
index 6dd28d6cec4bf8fa2b3674fd3f512ca4f734346e..ff00ee1e350159ea82e2bc5a54293853708a8eef 100644 (file)
--- a/lib/install/deps.go
+++ b/lib/install/deps.go
@@ -245,7 +245,7 @@ make install
        }
 
        if !prod {
-               goversion := "1.16.3"
+               goversion := "1.17.1"
                if havegoversion, err := exec.Command("/usr/local/bin/go", "version").CombinedOutput(); err == nil && bytes.HasPrefix(havegoversion, []byte("go version go"+goversion+" ")) {
                        logger.Print("go " + goversion + " already installed")
                } else {

diff --git a/tools/compute-images/scripts/base.sh b/tools/compute-images/scripts/base.sh
index e4a429da6e654616919c7b8ea646e3b4b28d4965..022f4a7e5a5745f6de131a6c475f8f139de45af8 100644 (file)
--- a/tools/compute-images/scripts/base.sh
+++ b/tools/compute-images/scripts/base.sh
@@ -69,7 +69,7 @@ wait_for_apt_locks && $SUDO DEBIAN_FRONTEND=noninteractive apt-get -qq --yes ins
   docker.io
 
 # Get Go and build singularity
-goversion=1.16.3
+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 -