From 4c8d199b216d8a4168fa860a313695e563671813 Mon Sep 17 00:00:00 2001 From: Jess Frazelle Date: Fri, 7 Oct 2016 19:03:54 -0700 Subject: [PATCH] update base image Signed-off-by: Jess Frazelle --- checkup/Dockerfile | 4 ++-- commit-watcher/Dockerfile | 2 +- consul/Dockerfile | 3 +-- jq/Dockerfile | 2 +- micro/Dockerfile | 10 ++++++---- mop/Dockerfile | 2 +- vault/Dockerfile | 7 +++---- 7 files changed, 15 insertions(+), 15 deletions(-) diff --git a/checkup/Dockerfile b/checkup/Dockerfile index 297bdac..8d77741 100644 --- a/checkup/Dockerfile +++ b/checkup/Dockerfile @@ -1,4 +1,4 @@ -FROM alpine:edge +FROM alpine:latest MAINTAINER Jessie Frazelle ENV PATH /go/bin:/usr/local/go/bin:$PATH @@ -18,7 +18,7 @@ RUN buildDeps=' \ ' \ set -x \ && apk update \ - && apk add --no-cache $buildDeps \ + && apk add --no-cache --repository http://dl-3.alpinelinux.org/alpine/edge/community $buildDeps \ && go get github.com/sourcegraph/checkup/cmd/checkup \ && cp /go/bin/checkup /usr/bin/checkup \ && apk del $buildDeps \ diff --git a/commit-watcher/Dockerfile b/commit-watcher/Dockerfile index 3b020b8..6d3be97 100644 --- a/commit-watcher/Dockerfile +++ b/commit-watcher/Dockerfile @@ -1,4 +1,4 @@ -FROM ruby:2-alpine +FROM ruby:alpine RUN apk add --no-cache \ ca-certificates \ diff --git a/consul/Dockerfile b/consul/Dockerfile index 63383e3..5bc0898 100644 --- a/consul/Dockerfile +++ b/consul/Dockerfile @@ -1,5 +1,4 @@ -# use alpine edge for go 1.6 -FROM alpine:edge +FROM alpine:latest MAINTAINER Jessie Frazelle ENV PATH /go/bin:/usr/local/go/bin:$PATH diff --git a/jq/Dockerfile b/jq/Dockerfile index d415122..a5b3525 100644 --- a/jq/Dockerfile +++ b/jq/Dockerfile @@ -1,4 +1,4 @@ -FROM alpine:edge +FROM alpine:latest RUN apk add --no-cache \ bash \ diff --git a/micro/Dockerfile b/micro/Dockerfile index fac1ab8..0b33ad6 100644 --- a/micro/Dockerfile +++ b/micro/Dockerfile @@ -1,9 +1,11 @@ -FROM alpine:edge +FROM alpine:latest MAINTAINER Christian Koep ENV PATH /go/bin:/usr/local/go/bin:$PATH ENV GOPATH /go +ENV MICRO_VERSION v1.1.0 + RUN buildDeps=' \ go \ git \ @@ -15,12 +17,12 @@ RUN buildDeps=' \ ' \ set -x \ && apk --no-cache add $buildDeps \ - && git clone --depth 1 -b master https://github.com/zyedidia/micro /usr/src/micro \ - && cd /usr/src/micro \ + && git clone --branch "$MICRO_VERSION" https://github.com/zyedidia/micro /go/src/github.com/zyedidia/micro \ + && cd /go/src/github.com/zyedidia/micro \ && mkdir -p /go/bin \ && make install \ && mv /go/bin/micro /usr/bin/micro \ - && rm -rf /usr/src/micro \ + && rm -rf /go/src/github.com/zyedidia/micro \ && apk del $buildDeps \ && rm -rf /go \ && echo "Build complete." diff --git a/mop/Dockerfile b/mop/Dockerfile index e82b618..c80f4d6 100644 --- a/mop/Dockerfile +++ b/mop/Dockerfile @@ -5,7 +5,7 @@ # --name mop \ # r.j3ss.co/mop # -FROM alpine:edge +FROM alpine:latest RUN apk --no-cache add \ ca-certificates diff --git a/vault/Dockerfile b/vault/Dockerfile index 71c0b69..78ae7e8 100644 --- a/vault/Dockerfile +++ b/vault/Dockerfile @@ -1,5 +1,4 @@ -# use alpine edge for go 1.6 -FROM alpine:edge +FROM alpine:latest MAINTAINER Jessie Frazelle ENV PATH /go/bin:/usr/local/go/bin:$PATH @@ -9,7 +8,7 @@ RUN apk --no-cache add \ ca-certificates \ curl -ENV VAULT_VERSION v0.6.1 +ENV VAULT_VERSION v0.6.2 RUN buildDeps=' \ bash \ @@ -23,7 +22,7 @@ RUN buildDeps=' \ zip \ ' \ set -x \ - && apk --no-cache add $buildDeps \ + && apk --no-cache add --repository http://dl-3.alpinelinux.org/alpine/edge/community $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 \