From a2858656e96f4e4cb0ed2df55c20ebc87dbf8cce Mon Sep 17 00:00:00 2001 From: Jess Frazelle Date: Thu, 7 Apr 2016 13:26:38 -0700 Subject: [PATCH] updates Signed-off-by: Jess Frazelle --- consul/Dockerfile | 5 +++-- vault/Dockerfile | 9 +++++---- 2 files changed, 8 insertions(+), 6 deletions(-) diff --git a/consul/Dockerfile b/consul/Dockerfile index 4bcfd6d..b5438e5 100644 --- a/consul/Dockerfile +++ b/consul/Dockerfile @@ -1,4 +1,5 @@ -FROM alpine +# use alpine edge for go 1.6 +FROM alpine:edge MAINTAINER Jessica Frazelle ENV PATH /go/bin:/usr/local/go/bin:$PATH @@ -10,7 +11,7 @@ RUN apk update && apk add \ curl \ && rm -rf /var/cache/apk/* -ENV CONSUL_VERSION v0.6.3 +ENV CONSUL_VERSION v0.6.4 RUN buildDeps=' \ bash \ diff --git a/vault/Dockerfile b/vault/Dockerfile index ca5dce0..9c88a89 100644 --- a/vault/Dockerfile +++ b/vault/Dockerfile @@ -1,16 +1,17 @@ -FROM alpine +# use alpine edge for go 1.6 +FROM alpine:edge MAINTAINER Jessica Frazelle ENV PATH /go/bin:/usr/local/go/bin:$PATH ENV GOPATH /go -#ENV GO15VENDOREXPERIMENT 1 +ENV GO15VENDOREXPERIMENT 1 RUN apk update && apk add \ ca-certificates \ curl \ && rm -rf /var/cache/apk/* -ENV VAULT_VERSION v0.5.0 +ENV VAULT_VERSION v0.5.2 RUN buildDeps=' \ bash \ @@ -29,7 +30,7 @@ RUN buildDeps=' \ && mkdir -p /go/src/github.com/hashicorp \ && git clone --branch ${VAULT_VERSION} https://github.com/hashicorp/vault /go/src/github.com/hashicorp/vault \ && cd /go/src/github.com/hashicorp/vault \ - && make bootstrap \ + && go get github.com/mitchellh/gox \ && XC_ARCH="amd64" XC_OS="linux" make bin \ && mv bin/vault /usr/bin/ \ && apk del $buildDeps \