Merge pull request #2993 from weaveworks/golang-1-9-2

Upgrade Go to 1.9.2
weaveworks · Dec 21, 2017 · 9c01613 · 9c01613
2 parents 7459014 + 3db91bc
commit 9c01613
Showing 1 changed file with 1 addition and 5 deletions.
diff --git a/backend/Dockerfile b/backend/Dockerfile
@@ -1,12 +1,8 @@
-FROM ubuntu:yakkety
-ENV GOPATH /go
-ENV GOVERSION 1.8.3
-ENV PATH /go/bin:/usr/local/go/bin:/usr/local/bin:/usr/bin:/bin:/usr/sbin:/sbin
+FROM golang:1.9.2-stretch
 ENV SCOPE_SKIP_UI_ASSETS true
 RUN apt-get update && \
 	apt-get install -y libpcap-dev python-requests time file shellcheck git gcc-arm-linux-gnueabihf curl build-essential python-pip && \
 	rm -rf /var/lib/apt/lists/* /tmp/* /var/tmp/*
-RUN curl -Ls https://storage.googleapis.com/golang/go${GOVERSION}.linux-amd64.tar.gz | tar xz -C /usr/local
 RUN go clean -i net && \
 	go install -tags netgo std && \
 	go install -race -tags netgo std