Merge pull request cloudflare#528 from cloudflare/jacob/update-docker…

…files

Update Dockerfiles

Dockerfile

@@ -1,20 +1,13 @@
-FROM golang:1.5
+FROM golang:1.6
 
 ENV USER root
 
-# Install pkcs11 deps
-RUN apt-get update && apt-get install -y \
-	libltdl-dev \
-	--no-install-recommends \
-	&& rm -rf /var/lib/apt/lists/*
-
 WORKDIR /go/src/github.com/cloudflare/cfssl
 COPY . .
 
 # restore all deps and build
-RUN go get github.com/tools/godep && godep restore && \
-	go get github.com/GeertJohan/go.rice/rice && rice embed-go -i=./cli/serve && \
-	git clone https://github.com/cloudflare/cfssl_trust.git /etc/cfssl && \
+RUN go get github.com/GeertJohan/go.rice/rice && rice embed-go -i=./cli/serve && \
+	cp -R /go/src/github.com/cloudflare/cfssl/vendor/github.com/cloudflare/cfssl_trust /etc/cfssl && \
 	go install ./cmd/...
 
 EXPOSE 8888

Dockerfile.build

@@ -1,18 +1,11 @@
-FROM golang:1.5
+FROM golang:1.6
 
 ENV USER root
 
-# Install pkcs11 deps
-RUN apt-get update && apt-get install -y \
-	libltdl-dev \
-	--no-install-recommends \
-	&& rm -rf /var/lib/apt/lists/*
-
 WORKDIR /go/src/github.com/cloudflare/cfssl
 COPY . .
 
 # restore all deps and build
-RUN go get github.com/tools/godep && godep restore && \
-	go get github.com/mitchellh/gox
+RUN go get github.com/mitchellh/gox
 
 ENTRYPOINT ["gox"]

Dockerfile.minimal

@@ -4,11 +4,6 @@ ENV PATH /go/bin:/usr/local/go/bin:$PATH
 ENV GOPATH /go
 ENV USER root
 
-# Install pkcs11 deps
-RUN apk update && apk add \
-	libltdl \
-	&& rm -rf /var/cache/apk/*
-
 COPY . /go/src/github.com/cloudflare/cfssl
 
 RUN buildDeps=' \
@@ -23,9 +18,8 @@ RUN buildDeps=' \
 	apk update && \
 	apk add $buildDeps && \
 	cd /go/src/github.com/cloudflare/cfssl && \
-	go get github.com/tools/godep && godep restore && \
 	go get github.com/GeertJohan/go.rice/rice && rice embed-go -i=./cli/serve && \
-	git clone https://github.com/cloudflare/cfssl_trust.git /etc/cfssl && \
+	cp -R /go/src/github.com/cloudflare/cfssl/vendor/github.com/cloudflare/cfssl_trust /etc/cfssl && \
 	go build -o /usr/bin/cfssl ./cmd/cfssl && \
 	go build -o /usr/bin/cfssljson ./cmd/cfssljson && \
 	go build -o /usr/bin/mkbundle ./cmd/mkbundle && \