From 0629eada0cbfb988b621b0e41710cd96d46c7386 Mon Sep 17 00:00:00 2001 From: Mike Lang Date: Thu, 26 Jan 2017 13:27:06 -0800 Subject: [PATCH] Upgrade container base image to alpine:3.5 As well as upgrading to latest stable being nice in general, this was triggered by an issue where we could no longer find the bash package in 3.3 This upgrade also lets us get rid of reliance on the edge (rolling latest) repository for runit, since 3.5 now contains runit natively. --- docker/Dockerfile | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/docker/Dockerfile b/docker/Dockerfile index 029177008..a6d31a75b 100644 --- a/docker/Dockerfile +++ b/docker/Dockerfile @@ -1,9 +1,8 @@ -FROM alpine:3.3 +FROM alpine:3.5 MAINTAINER Weaveworks Inc LABEL works.weave.role=system WORKDIR /home/weave -RUN echo "http://dl-cdn.alpinelinux.org/alpine/edge/community" >>/etc/apk/repositories && \ - apk add --update bash runit conntrack-tools iproute2 util-linux curl && \ +RUN apk add --update bash runit conntrack-tools iproute2 util-linux curl && \ rm -rf /var/cache/apk/* ADD ./docker.tgz / ADD ./demo.json /