From 0c8d9e8c038cd11b51c21e9b230419979415b611 Mon Sep 17 00:00:00 2001 From: Michael Bridgen Date: Tue, 10 Feb 2015 15:59:33 -0800 Subject: [PATCH] Use this form of apk, since the shortcut masks errors `apk-install` is a script that runs apk then tidies up. The problem is that it doesn't exit with an error if the install fails, which means that if some packages are unavailable at the time of building, it will still all go ahead. --- tools/Dockerfile | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/tools/Dockerfile b/tools/Dockerfile index 563868d0..abae662e 100644 --- a/tools/Dockerfile +++ b/tools/Dockerfile @@ -1,6 +1,7 @@ FROM gliderlabs/alpine MAINTAINER Weaveworks Inc WORKDIR /home/weave -RUN ["apk-install", "ethtool", "conntrack-tools", "curl", "iptables", "iproute2", "docker"] +RUN ["apk", "add", "--update", "ethtool", "conntrack-tools", "curl", "iptables", "iproute2", "docker"] +RUN ["sh", "-c", "rm -rf /var/cache/apk/*"] ADD ./weave /home/weave/ ENTRYPOINT ["/home/weave/weave"]