From f34447ac22a82cf94b008701c34fe96715eb5d81 Mon Sep 17 00:00:00 2001 From: Sebastiaan van Stijn Date: Sat, 28 May 2016 17:25:58 +0200 Subject: [PATCH] Update Vault to 0.5.3 (#142) This updates vault to 0.5.3, and includes some optimizations: - GO15VENDOREXPERIMENT is no longer needed, as the Dockerfile uses Go 1.6+ - Added XC_OSARCH to prevent building all possible OS/Arch combinations during build Signed-off-by: Sebastiaan van Stijn --- vault/Dockerfile | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/vault/Dockerfile b/vault/Dockerfile index 9c88a89..b3c299a 100644 --- a/vault/Dockerfile +++ b/vault/Dockerfile @@ -1,17 +1,16 @@ # use alpine edge for go 1.6 FROM alpine:edge -MAINTAINER Jessica Frazelle +MAINTAINER Jessica Frazelle ENV PATH /go/bin:/usr/local/go/bin:$PATH ENV GOPATH /go -ENV GO15VENDOREXPERIMENT 1 RUN apk update && apk add \ ca-certificates \ curl \ && rm -rf /var/cache/apk/* -ENV VAULT_VERSION v0.5.2 +ENV VAULT_VERSION v0.5.3 RUN buildDeps=' \ bash \ @@ -31,7 +30,7 @@ RUN buildDeps=' \ && git clone --branch ${VAULT_VERSION} https://github.com/hashicorp/vault /go/src/github.com/hashicorp/vault \ && cd /go/src/github.com/hashicorp/vault \ && go get github.com/mitchellh/gox \ - && XC_ARCH="amd64" XC_OS="linux" make bin \ + && XC_ARCH="amd64" XC_OS="linux" XC_OSARCH="linux/amd64" make bin \ && mv bin/vault /usr/bin/ \ && apk del $buildDeps \ && rm -rf /var/cache/apk/* \