From 19a8103eb7bb66aa7844a808aaf4f12b5a10e52c Mon Sep 17 00:00:00 2001 From: niusmallnan Date: Thu, 8 Mar 2018 14:14:48 +0800 Subject: [PATCH] Update dapper build for golang --- Dockerfile.dapper | 15 ++------------- 1 file changed, 2 insertions(+), 13 deletions(-) diff --git a/Dockerfile.dapper b/Dockerfile.dapper index 7d8879dd..e590cf81 100644 --- a/Dockerfile.dapper +++ b/Dockerfile.dapper @@ -139,24 +139,13 @@ RUN echo "... Downloading ${!KERNEL_URL}"; \ RUN curl -pfL ${SELINUX_POLICY_URL} > ${DOWNLOADS}/$(basename ${SELINUX_POLICY_URL}) # Install Go -RUN ln -sf go-6 /usr/bin/go && \ - curl -sfL https://storage.googleapis.com/golang/go${GO_VERSION}.src.tar.gz | tar -xzf - -C /usr/local && \ - cd /usr/local/go/src && \ - GOROOT_BOOTSTRAP=/usr GOARCH=${HOST_ARCH} GOHOSTARCH=${HOST_ARCH} ./make.bash && \ - rm /usr/bin/go +RUN wget -O - https://storage.googleapis.com/golang/go${GO_VERSION}.linux-${GOARCH}.tar.gz | tar -xzf - -C /usr/local && \ + go get github.com/rancher/trash && go get github.com/golang/lint/golint # Install Host Docker RUN curl -fL ${!BUILD_DOCKER_URL} > /usr/bin/docker && \ chmod +x /usr/bin/docker -# Install Trash -RUN go get github.com/rancher/trash - -# Install golint -RUN go get github.com/golang/lint/golint - -RUN go get gopkg.in/check.v1 - # Install dapper RUN curl -sL https://releases.rancher.com/dapper/latest/dapper-`uname -s`-`uname -m | sed 's/arm.*/arm/'` > /usr/bin/dapper && \ chmod +x /usr/bin/dapper