From e74b6cbcaf53615794c2d3d6c9c9a6110983a61e Mon Sep 17 00:00:00 2001 From: Paul Bellamy Date: Fri, 4 Sep 2015 14:33:18 +0100 Subject: [PATCH] gliderlabs/alpine is now just alpine --- prog/weaveexec/Dockerfile | 2 +- test/config.sh | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/prog/weaveexec/Dockerfile b/prog/weaveexec/Dockerfile index 8db372b1..1d35b419 100644 --- a/prog/weaveexec/Dockerfile +++ b/prog/weaveexec/Dockerfile @@ -1,4 +1,4 @@ -FROM gliderlabs/alpine +FROM alpine MAINTAINER Weaveworks Inc LABEL works.weave.role=system diff --git a/test/config.sh b/test/config.sh index 1ab62c3d..1d9e6b49 100644 --- a/test/config.sh +++ b/test/config.sh @@ -34,7 +34,7 @@ HOST3=$(echo $HOSTS | cut -f 3 -d ' ') SSH_DIR=${SSH_DIR:-$DIR} SSH=${SSH:-ssh -l vagrant -i "$SSH_DIR/insecure_private_key" -o "UserKnownHostsFile=$SSH_DIR/.ssh_known_hosts" -o CheckHostIP=no -o StrictHostKeyChecking=no} -SMALL_IMAGE="gliderlabs/alpine" +SMALL_IMAGE="alpine" DNS_IMAGE="aanand/docker-dnsutils" TEST_IMAGES="$SMALL_IMAGE $DNS_IMAGE"