Skip to content

Commit 7bb72fa

Browse files
tianontianon
committed
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 <[email protected]> (github: tianon)
1 parent e5ad715 commit 7bb72fa

2 files changed

Lines changed: 8 additions & 1 deletion

File tree

‎Dockerfile‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -82,6 +82,9 @@ RUN go get code.google.com/p/go.tools/cmd/cover
8282
# TODO replace FPM with some very minimal debhelper stuff
8383
RUN gem install --no-rdoc --no-ri fpm --version 1.0.2
8484

85+
# Get the "busybox" image source so we can build locally instead of pulling
86+
RUN git clone https://github.com/jpetazzo/docker-busybox.git /docker-busybox
87+
8588
# Setup s3cmd config
8689
RUN /bin/echo -e '[default]\naccess_key=$AWS_ACCESS_KEY\nsecret_key=$AWS_SECRET_KEY' > /.s3cfg
8790

‎hack/make/test-integration-cli‎

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,11 @@ bundle_test_integration_cli() {
3131
sleep 2
3232

3333
if ! docker inspect busybox &> /dev/null; then
34-
( set -x; docker pull busybox )
34+
if [ -d /docker-busybox ]; then
35+
( set -x; docker build -t busybox /docker-busybox )
36+
else
37+
( set -x; docker pull busybox )
38+
fi
3539
fi
3640

3741
bundle_test_integration_cli

0 commit comments

Comments
 (0)