From 374072472b1480983051cab25221518e08f1e35a Mon Sep 17 00:00:00 2001 From: Tom Clegg Date: Fri, 24 Sep 2021 16:32:34 -0400 Subject: [PATCH] Update installer and images to Go 1.17.1. No issue # Arvados-DCO-1.1-Signed-off-by: Tom Clegg --- build/package-build-dockerfiles/Makefile | 2 +- build/package-build-dockerfiles/centos7/Dockerfile | 2 +- build/package-build-dockerfiles/debian10/Dockerfile | 2 +- build/package-build-dockerfiles/debian11/Dockerfile | 2 +- build/package-build-dockerfiles/ubuntu1804/Dockerfile | 2 +- build/package-build-dockerfiles/ubuntu2004/Dockerfile | 2 +- lib/install/deps.go | 2 +- tools/compute-images/scripts/base.sh | 2 +- 8 files changed, 8 insertions(+), 8 deletions(-) diff --git a/build/package-build-dockerfiles/Makefile b/build/package-build-dockerfiles/Makefile index 80f7c12c10..51fee9fce1 100644 --- 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 332a8dc830..edfe3405f4 100644 --- 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 ad8198fa0d..809d935880 100644 --- 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 99effa3cca..06380ef896 100644 --- 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 65c477a916..4a210373fa 100644 --- 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 ba6c57df38..276b29fc56 100644 --- 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 6dd28d6cec..ff00ee1e35 100644 --- 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 e4a429da6e..022f4a7e5a 100644 --- 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 - -- 2.30.2