From 7bb72fa080d13c3b90d624cb77530632c7705c56 Mon Sep 17 00:00:00 2001 From: Tianon Gravi Date: Mon, 14 Apr 2014 13:35:54 -0600 Subject: [PATCH] Fetch the "busybox" image source so we can build locally instead of pulling during the integration tests Docker-DCO-1.1-Signed-off-by: Andrew Page (github: tianon) --- Dockerfile | 3 +++ hack/make/test-integration-cli | 6 +++++- 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index ec95bad293..ab82dfa700 100644 --- a/Dockerfile +++ b/Dockerfile @@ -82,6 +82,9 @@ RUN go get code.google.com/p/go.tools/cmd/cover # TODO replace FPM with some very minimal debhelper stuff RUN gem install --no-rdoc --no-ri fpm --version 1.0.2 +# Get the "busybox" image source so we can build locally instead of pulling +RUN git clone https://github.com/jpetazzo/docker-busybox.git /docker-busybox + # Setup s3cmd config RUN /bin/echo -e '[default]\naccess_key=$AWS_ACCESS_KEY\nsecret_key=$AWS_SECRET_KEY' > /.s3cfg diff --git a/hack/make/test-integration-cli b/hack/make/test-integration-cli index 93330d7b09..703c9cd95c 100644 --- a/hack/make/test-integration-cli +++ b/hack/make/test-integration-cli @@ -31,7 +31,11 @@ bundle_test_integration_cli() { sleep 2 if ! docker inspect busybox &> /dev/null; then - ( set -x; docker pull busybox ) + if [ -d /docker-busybox ]; then + ( set -x; docker build -t busybox /docker-busybox ) + else + ( set -x; docker pull busybox ) + fi fi bundle_test_integration_cli