From 1520444ab68cfe47e92ed13fe4220faa06ccc6e8 Mon Sep 17 00:00:00 2001 From: Alfonso Acosta Date: Mon, 19 Jun 2017 20:42:54 +0000 Subject: [PATCH 1/2] Use Go 1.8 --- backend/Dockerfile | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/backend/Dockerfile b/backend/Dockerfile index 8201216e62..925262dc32 100644 --- a/backend/Dockerfile +++ b/backend/Dockerfile @@ -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 && \ 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 @@ -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"] From d5ad3917211a302f2aa9a09cef54515874fdf6d5 Mon Sep 17 00:00:00 2001 From: Alfonso Acosta Date: Tue, 20 Jun 2017 16:23:05 +0000 Subject: [PATCH 2/2] Add build-essential package --- backend/Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/backend/Dockerfile b/backend/Dockerfile index 925262dc32..dc042133fb 100644 --- a/backend/Dockerfile +++ b/backend/Dockerfile @@ -4,7 +4,7 @@ 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 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 && \