github/weave-scope
1
0
Fork 0
mirror of https://github.com/weaveworks/scope.git synced 2026-03-03 18:20:27 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #2158 from weaveworks/mike/upgrade-alpine

Browse Source 
Upgrade container base image to alpine:3.5
This commit is contained in:
Mike Lang
2017-01-26 13:53:54 -08:00
committed by GitHub
parent 29edaebba3 0629eada0c
commit 5ba78e050c
1 changed files with 2 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
docker/Dockerfile
View File

@@ -1,9 +1,8 @@
FROM alpine:3.3
FROM alpine:3.5
MAINTAINER Weaveworks Inc <help@weave.works>
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 /