From f0ca6c1eb7444e580f8dd46b137181a279f4f028 Mon Sep 17 00:00:00 2001
From: Christopher Broglie <cbroglie@cloudflare.com>
Date: Mon, 8 Apr 2019 20:09:30 -0700
Subject: [PATCH] Pin to Go 1.12.1

Due to https://github.com/golang/go/issues/31293
---
 .travis.yml        | 2 +-
 Dockerfile         | 2 +-
 Dockerfile.minimal | 4 ++--
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index fd4e4e211..4fdb7b867 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -4,7 +4,7 @@ language: go
 matrix:
   include:
     - go: 1.11.x
-    - go: 1.12.x
+    - go: 1.12.1
     - go: master
       os: osx
       env: BUILD_TAGS=
diff --git a/Dockerfile b/Dockerfile
index 728c74efa..9da4ad595 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,4 +1,4 @@
-FROM golang:1.9.2
+FROM golang:1.12.1
 
 ENV USER root
 
diff --git a/Dockerfile.minimal b/Dockerfile.minimal
index 3c80825e1..14b8eee27 100644
--- a/Dockerfile.minimal
+++ b/Dockerfile.minimal
@@ -1,4 +1,4 @@
-FROM golang:1.9.2-alpine3.6
+FROM golang:1.12.1-alpine3.9
 
 ENV GOPATH /go
 ENV USER root
@@ -10,7 +10,7 @@ RUN set -x && \
 	go get github.com/cloudflare/cfssl_trust/... && \
 	go get github.com/GeertJohan/go.rice/rice && \
 	cd /go/src/github.com/cloudflare/cfssl && rice embed-go -i=./cli/serve && \
-	mkdir bin && cd bin && \
+	mkdir -p bin && cd bin && \
 	go build ../cmd/cfssl && \
 	go build ../cmd/cfssljson && \
 	go build ../cmd/mkbundle && \