Skip to content

Commit

Permalink
Merge pull request #2621 from weaveworks/2576-go-1.8
Browse files Browse the repository at this point in the history
Use Go 1.8
  • Loading branch information
Alfonso Acosta committed Jun 21, 2017
2 parents 9e75331 + d5ad391 commit 845592b
Showing 1 changed file with 5 additions and 4 deletions.
9 changes: 5 additions & 4 deletions backend/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,11 +1,12 @@
FROM ubuntu:yakkety
ENV GOPATH /go
ENV GOVERSION 1.7
ENV PATH /go/bin:/usr/lib/go-${GOVERSION}/bin:/usr/bin:/bin:/usr/sbin:/sbin
ENV GOVERSION 1.8
ENV PATH /go/bin:/usr/local/go/bin:/usr/bin:/bin:/usr/sbin:/sbin
ENV SCOPE_SKIP_UI_ASSETS true
RUN apt-get update && \
apt-get install -y libpcap-dev python-requests time file shellcheck golang-${GOVERSION} git gcc-arm-linux-gnueabihf curl && \
apt-get install -y libpcap-dev python-requests time file shellcheck git gcc-arm-linux-gnueabihf curl build-essential && \
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
Expand All @@ -19,7 +20,7 @@ RUN go get -tags netgo \
github.com/fatih/hclfmt \
github.com/mjibson/esc \
github.com/client9/misspell/cmd/misspell && \
chmod a+wr --recursive /usr/lib/go-${GOVERSION}/pkg && \
chmod a+wr --recursive /usr/local/go && \
rm -rf /go/pkg/ /go/src/
COPY build.sh /
ENTRYPOINT ["/build.sh"]

0 comments on commit 845592b

Please sign in to comment.