From dc5c1e2002a7b7c1d19723d18812e236261b7832 Mon Sep 17 00:00:00 2001
From: Jakob Borg <jakob@nym.se>
Date: Thu, 11 Dec 2014 12:48:40 +0100
Subject: [PATCH] Use Go 1.4 for builds

---
 build.sh          | 2 +-
 docker/Dockerfile | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/build.sh b/build.sh
index 3cb8f721b..3c771ef0c 100755
--- a/build.sh
+++ b/build.sh
@@ -2,7 +2,7 @@
 set -euo pipefail
 IFS=$'\n\t'
 
-DOCKERIMGV=1.4-2
+DOCKERIMGV=1.4-3
 
 case "${1:-default}" in
 	default)
diff --git a/docker/Dockerfile b/docker/Dockerfile
index db2bcd2a7..22b3f97de 100644
--- a/docker/Dockerfile
+++ b/docker/Dockerfile
@@ -1,7 +1,7 @@
 FROM debian:squeeze
 MAINTAINER Jakob Borg <jakob@nym.se>
 
-ENV GOLANG_VERSION 1.4rc2
+ENV GOLANG_VERSION 1.4
 
 # SCMs for "go get", gcc for cgo
 RUN apt-get update && apt-get install -y \