From 05f749302f1f0d950412bd1b02d261f4e7bcacf5 Mon Sep 17 00:00:00 2001
From: Matt Jibson <matt.jibson@gmail.com>
Date: Fri, 8 Mar 2019 00:57:19 -0500
Subject: [PATCH] builder: upgrade to go1.11.5

Release note (general change): Upgrade the build environment to use
go1.11.5.
---
 build/bootstrap/bootstrap-debian.sh | 4 ++--
 build/builder.sh                    | 2 +-
 build/builder/Dockerfile            | 4 ++--
 3 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/build/bootstrap/bootstrap-debian.sh b/build/bootstrap/bootstrap-debian.sh
index 8120d508c662..20c13cbaa96b 100755
--- a/build/bootstrap/bootstrap-debian.sh
+++ b/build/bootstrap/bootstrap-debian.sh
@@ -38,9 +38,9 @@ echo '. ~/.bashrc_bootstrap' >> ~/.bashrc
 
 # Install Go.
 trap 'rm -f /tmp/go.tgz' EXIT
-curl https://dl.google.com/go/go1.11.4.linux-amd64.tar.gz > /tmp/go.tgz
+curl https://dl.google.com/go/go1.11.5.linux-amd64.tar.gz > /tmp/go.tgz
 sha256sum -c - <<EOF
-fb26c30e6a04ad937bbc657a1b5bba92f80096af1e8ee6da6430c045a8db3a5b  /tmp/go.tgz
+ff54aafedff961eb94792487e827515da683d61a5f9482f668008832631e5d25  /tmp/go.tgz
 EOF
 sudo tar -C /usr/local -zxf /tmp/go.tgz
 
diff --git a/build/builder.sh b/build/builder.sh
index 53e659edfc39..3190005dd056 100755
--- a/build/builder.sh
+++ b/build/builder.sh
@@ -3,7 +3,7 @@
 set -euo pipefail
 
 image=cockroachdb/builder
-version=20190124-062428
+version=20190308-055513
 
 function init() {
   docker build --tag="${image}" "$(dirname "${0}")/builder"
diff --git a/build/builder/Dockerfile b/build/builder/Dockerfile
index b6e95e373294..72163b613166 100644
--- a/build/builder/Dockerfile
+++ b/build/builder/Dockerfile
@@ -196,8 +196,8 @@ RUN git clone git://git.sv.gnu.org/sed \
 # releases of Go will no longer be run in CI once it is changed. Consider
 # bumping the minimum allowed version of Go in /build/go-version-chech.sh.
 RUN apt-get install -y --no-install-recommends golang \
- && curl -fsSL https://storage.googleapis.com/golang/go1.11.4.src.tar.gz -o golang.tar.gz \
- && echo '4cfd42720a6b1e79a8024895fa6607b69972e8e32446df76d6ce79801bbadb15 golang.tar.gz' | sha256sum -c - \
+ && curl -fsSL https://storage.googleapis.com/golang/go1.11.5.src.tar.gz -o golang.tar.gz \
+ && echo 'bc1ef02bb1668835db1390a2e478dcbccb5dd16911691af9d75184bbe5aa943e golang.tar.gz' | sha256sum -c - \
  && tar -C /usr/local -xzf golang.tar.gz \
  && rm golang.tar.gz \
  && cd /usr/local/go/src \