From 9d36d88a65de36014aaddadbb780085b7602d608 Mon Sep 17 00:00:00 2001
From: Jakob Borg <jakob@nym.se>
Date: Sun, 30 Nov 2014 00:30:23 +0100
Subject: [PATCH] Build std for race in Docker image

---
 build.sh          | 2 +-
 docker/Dockerfile | 4 ++++
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/build.sh b/build.sh
index 9b65581f3..83ec834fc 100755
--- a/build.sh
+++ b/build.sh
@@ -2,7 +2,7 @@
 set -euo pipefail
 IFS=$'\n\t'
 
-DOCKERIMGV=1.3.3-3
+DOCKERIMGV=1.3.3-4
 
 case "${1:-default}" in
 	default)
diff --git a/docker/Dockerfile b/docker/Dockerfile
index a9817a74d..5ff90507b 100644
--- a/docker/Dockerfile
+++ b/docker/Dockerfile
@@ -51,6 +51,10 @@ RUN go get github.com/tools/godep \
 	&& go get github.com/axw/gocov/gocov \
 	&& go get github.com/AlekSi/gocov-xml
 
+# Build standard library for race
+
+RUN go install -race std
+
 # Random build users needs to be able to create stuff in /go
 
 RUN chmod -R 777 /go/bin /go/pkg /go/src