mirror of
https://github.com/jessfraz/dockerfiles.git
synced 2024-11-23 11:31:49 +01:00
update dockerfiles
Signed-off-by: Jess Frazelle <jess@mesosphere.com>
This commit is contained in:
parent
cd121069c3
commit
d5dbee9c86
|
@ -3,13 +3,14 @@ MAINTAINER Jessica Frazelle <jess@docker.com>
|
|||
|
||||
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 CONSUL_VERSION v0.6.0
|
||||
ENV CONSUL_VERSION v0.6.3
|
||||
|
||||
RUN buildDeps=' \
|
||||
bash \
|
||||
|
@ -33,7 +34,7 @@ RUN buildDeps=' \
|
|||
&& mkdir -p /go/src/github.com/hashicorp /etc/consul.d \
|
||||
&& git clone --branch ${CONSUL_VERSION} https://github.com/hashicorp/consul /go/src/github.com/hashicorp/consul \
|
||||
&& cd /go/src/github.com/hashicorp/consul \
|
||||
&& make all \
|
||||
&& XC_ARCH="amd64" XC_OS="linux" make all \
|
||||
&& mv bin/consul /usr/bin/ \
|
||||
&& cd ui \
|
||||
&& gem install bundler io-console --no-ri --no-rdoc \
|
||||
|
|
|
@ -3,13 +3,14 @@ MAINTAINER Jessica Frazelle <jess@docker.com>
|
|||
|
||||
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.4.1
|
||||
ENV VAULT_VERSION v0.5.0
|
||||
|
||||
RUN buildDeps=' \
|
||||
bash \
|
||||
|
@ -29,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 \
|
||||
&& make bootstrap \
|
||||
&& make bin \
|
||||
&& XC_ARCH="amd64" XC_OS="linux" make bin \
|
||||
&& mv bin/vault /usr/bin/ \
|
||||
&& apk del $buildDeps \
|
||||
&& rm -rf /var/cache/apk/* \
|
||||
|
|
Loading…
Reference in New Issue
Block a user