From f31ee2a23eaec75b0311c68baeb65959d283802d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Dawid=20Gos=C5=82awski?= <dawid@dawidgoslawski.pl>
Date: Sun, 3 Mar 2019 16:44:49 +0100
Subject: [PATCH] Fixup missing cfssl_trust

and some other minors
---
 Dockerfile | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/Dockerfile b/Dockerfile
index b685088..44b6296 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -44,13 +44,15 @@ RUN apk add --no-cache --virtual .build-deps \
 	&& go build -o /usr/bin/mkbundle ./cmd/mkbundle \
 	&& go build -o /usr/bin/multirootca ./cmd/multirootca \
 # Install trusted certs
-	&& cp -R "${GOPATH}/src/github.com/cloudflare/cfssl/vendor/github.com/cloudflare/cfssl_trust" / \
+        && go get github.com/cloudflare/cfssl_trust/... \
+	&& cp -R "${GOPATH}/src/github.com/cloudflare/cfssl_trust" / \
 	&& ln -s /cfssl_trust /etc/cfssl/ \
 # Move database migrations to /opt
-    && mkdir /opt/ \
+    && mkdir -p /opt/ \
     && cp -R "${GOPATH}/src/github.com/cloudflare/cfssl/certdb/" /opt/ \
 # Install go.rice
     && set -x \
+        && cd "${GOPATH}/src/github.com/cloudflare/cfssl" \
 	&& go get github.com/GeertJohan/go.rice/rice \
     && rice embed-go -i=./cli/serve \
 # Create PKI directory