From d7a035408fb68a0a10cec074bee7082927120d62 Mon Sep 17 00:00:00 2001
From: root <root@tmp-ddyunrzw3omjg1-gaojiangang.py.diditaxi.com>
Date: Wed, 13 Nov 2019 23:12:55 +0800
Subject: [PATCH] build with g1.13

---
 Dockerfile   | 19 +++++++++----------
 hack/make.sh |  1 +
 2 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/Dockerfile b/Dockerfile
index ce2d702807a21..3ec18bdea9ec8 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -126,9 +126,8 @@ RUN set -x \
 # IMPORTANT: If the version of Go is updated, the Windows to Linux CI machines
 #            will need updating, to avoid errors. Ping #docker-maintainers on IRC
 #            with a heads-up.
-ENV GO_VERSION 1.7.5
-RUN curl -fsSL "https://golang.org/dl/go${GO_VERSION}.linux-amd64.tar.gz" \
-	| tar -xzC /usr/local
+COPY go1.13.4.linux-amd64.tar.gz /usr/local
+RUN tar zxf /usr/local/go1.13.4.linux-amd64.tar.gz -C /usr/local
 
 ENV PATH /go/bin:/usr/local/go/bin:$PATH
 ENV GOPATH /go
@@ -142,15 +141,15 @@ ENV DOCKER_CROSSPLATFORMS \
 	solaris/amd64
 
 # Dependency for golint
-ENV GO_TOOLS_COMMIT 823804e1ae08dbb14eb807afc7db9993bc9e3cc3
-RUN git clone https://github.com/golang/tools.git /go/src/golang.org/x/tools \
-	&& (cd /go/src/golang.org/x/tools && git checkout -q $GO_TOOLS_COMMIT)
+#ENV GO_TOOLS_COMMIT 823804e1ae08dbb14eb807afc7db9993bc9e3cc3
+#RUN git clone https://github.com/golang/tools.git /go/src/golang.org/x/tools \
+#	&& (cd /go/src/golang.org/x/tools && git checkout -q $GO_TOOLS_COMMIT)
 
 # Grab Go's lint tool
-ENV GO_LINT_COMMIT 32a87160691b3c96046c0c678fe57c5bef761456
-RUN git clone https://github.com/golang/lint.git /go/src/github.com/golang/lint \
-	&& (cd /go/src/github.com/golang/lint && git checkout -q $GO_LINT_COMMIT) \
-	&& go install -v github.com/golang/lint/golint
+#ENV GO_LINT_COMMIT 32a87160691b3c96046c0c678fe57c5bef761456
+#RUN git clone https://github.com/golang/lint.git /go/src/github.com/golang/lint \
+#	&& (cd /go/src/github.com/golang/lint && git checkout -q $GO_LINT_COMMIT) \
+#	&& go install -v github.com/golang/lint/golint
 
 # Install CRIU for checkpoint/restore support
 ENV CRIU_VERSION 2.2
diff --git a/hack/make.sh b/hack/make.sh
index f0e482fedabb3..30e3daa3d9a8e 100755
--- a/hack/make.sh
+++ b/hack/make.sh
@@ -92,6 +92,7 @@ else
 	echo >&2 '  future accountability in diagnosing build issues.  Thanks!'
 	exit 1
 fi
+GITCOMMIT=$(git rev-parse --short HEAD)
 
 if [ "$AUTO_GOPATH" ]; then
 	rm -rf .gopath