From e1ec2a9cd47d4ae32c544115c465b551366e56a3 Mon Sep 17 00:00:00 2001 From: Tom Clegg Date: Thu, 26 Apr 2018 11:34:38 -0400 Subject: [PATCH] 13111: Update to Go 1.10.1. 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/debian8/Dockerfile | 2 +- build/package-build-dockerfiles/debian9/Dockerfile | 2 +- build/package-build-dockerfiles/ubuntu1404/Dockerfile | 2 +- build/package-build-dockerfiles/ubuntu1604/Dockerfile | 2 +- build/run-tests.sh | 4 ++-- tools/arvbox/lib/arvbox/docker/Dockerfile.base | 2 +- 8 files changed, 9 insertions(+), 9 deletions(-) diff --git a/build/package-build-dockerfiles/Makefile b/build/package-build-dockerfiles/Makefile index 200da4fe9b..ab1ade14de 100644 --- a/build/package-build-dockerfiles/Makefile +++ b/build/package-build-dockerfiles/Makefile @@ -28,7 +28,7 @@ ubuntu1604/generated: common-generated-all test -d ubuntu1604/generated || mkdir ubuntu1604/generated cp -rlt ubuntu1604/generated common-generated/* -GOTARBALL=go1.9.5.linux-amd64.tar.gz +GOTARBALL=go1.10.1.linux-amd64.tar.gz NODETARBALL=node-v6.11.2-linux-x64.tar.xz common-generated-all: common-generated/$(GOTARBALL) common-generated/$(NODETARBALL) diff --git a/build/package-build-dockerfiles/centos7/Dockerfile b/build/package-build-dockerfiles/centos7/Dockerfile index d5305e25ed..3a8b03f190 100644 --- a/build/package-build-dockerfiles/centos7/Dockerfile +++ b/build/package-build-dockerfiles/centos7/Dockerfile @@ -17,7 +17,7 @@ RUN gpg --keyserver pool.sks-keyservers.net --recv-keys D39DC0E3 && \ /usr/local/rvm/bin/rvm-exec default gem install cure-fpm --version 1.6.0b # Install golang binary -ADD generated/go1.9.5.linux-amd64.tar.gz /usr/local/ +ADD generated/go1.10.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/debian8/Dockerfile b/build/package-build-dockerfiles/debian8/Dockerfile index 196207dc61..54267d708e 100644 --- a/build/package-build-dockerfiles/debian8/Dockerfile +++ b/build/package-build-dockerfiles/debian8/Dockerfile @@ -19,7 +19,7 @@ RUN gpg --keyserver pool.sks-keyservers.net --recv-keys D39DC0E3 && \ /usr/local/rvm/bin/rvm-exec default gem install cure-fpm --version 1.6.0b # Install golang binary -ADD generated/go1.9.5.linux-amd64.tar.gz /usr/local/ +ADD generated/go1.10.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/debian9/Dockerfile b/build/package-build-dockerfiles/debian9/Dockerfile index 8a86dc2d88..9ade5fa272 100644 --- a/build/package-build-dockerfiles/debian9/Dockerfile +++ b/build/package-build-dockerfiles/debian9/Dockerfile @@ -21,7 +21,7 @@ RUN gpg --import /tmp/D39DC0E3.asc && \ /usr/local/rvm/bin/rvm-exec default gem install cure-fpm --version 1.6.0b # Install golang binary -ADD generated/go1.9.5.linux-amd64.tar.gz /usr/local/ +ADD generated/go1.10.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/ubuntu1404/Dockerfile b/build/package-build-dockerfiles/ubuntu1404/Dockerfile index 40eff20673..4ff47ff315 100644 --- a/build/package-build-dockerfiles/ubuntu1404/Dockerfile +++ b/build/package-build-dockerfiles/ubuntu1404/Dockerfile @@ -19,7 +19,7 @@ RUN gpg --keyserver pool.sks-keyservers.net --recv-keys D39DC0E3 && \ /usr/local/rvm/bin/rvm-exec default gem install cure-fpm --version 1.6.0b # Install golang binary -ADD generated/go1.9.5.linux-amd64.tar.gz /usr/local/ +ADD generated/go1.10.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/ubuntu1604/Dockerfile b/build/package-build-dockerfiles/ubuntu1604/Dockerfile index 85349fa698..7e5701f871 100644 --- a/build/package-build-dockerfiles/ubuntu1604/Dockerfile +++ b/build/package-build-dockerfiles/ubuntu1604/Dockerfile @@ -19,7 +19,7 @@ RUN gpg --keyserver pool.sks-keyservers.net --recv-keys D39DC0E3 && \ /usr/local/rvm/bin/rvm-exec default gem install cure-fpm --version 1.6.0b # Install golang binary -ADD generated/go1.9.5.linux-amd64.tar.gz /usr/local/ +ADD generated/go1.10.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/run-tests.sh b/build/run-tests.sh index f567cf41d5..a050d38db7 100755 --- a/build/run-tests.sh +++ b/build/run-tests.sh @@ -182,8 +182,8 @@ sanity_checks() { echo -n 'go: ' go version \ || fatal "No go binary. See http://golang.org/doc/install" - [[ $(go version) =~ go1.([0-9]+) ]] && [[ ${BASH_REMATCH[1]} -ge 8 ]] \ - || fatal "Go >= 1.8 required. See http://golang.org/doc/install" + [[ $(go version) =~ go1.([0-9]+) ]] && [[ ${BASH_REMATCH[1]} -ge 10 ]] \ + || fatal "Go >= 1.10 required. See http://golang.org/doc/install" echo -n 'gcc: ' gcc --version | egrep ^gcc \ || fatal "No gcc. Try: apt-get install build-essential" diff --git a/tools/arvbox/lib/arvbox/docker/Dockerfile.base b/tools/arvbox/lib/arvbox/docker/Dockerfile.base index 7ba0b3c50a..1ac0e76c37 100644 --- a/tools/arvbox/lib/arvbox/docker/Dockerfile.base +++ b/tools/arvbox/lib/arvbox/docker/Dockerfile.base @@ -39,7 +39,7 @@ ENV GEM_HOME /var/lib/gems ENV GEM_PATH /var/lib/gems ENV PATH $PATH:/var/lib/gems/bin -ENV GOVERSION 1.9.5 +ENV GOVERSION 1.10.1 # Install golang binary RUN curl -f http://storage.googleapis.com/golang/go${GOVERSION}.linux-amd64.tar.gz | \ -- 2.39.5