kotovalexarian-likes-github/moby--moby
1
0
Fork 0
mirror of https://github.com/moby/moby.git synced 2022-11-09 12:21:53 -05:00
Code Releases Activity

Fetch the "busybox" image source so we can build locally instead of pulling during the integration tests

Browse source 
Docker-DCO-1.1-Signed-off-by: Andrew Page <admwiggin@gmail.com> (github: tianon)
This commit is contained in:
Tianon Gravi 2014-04-14 13:35:54 -06:00
parent e5ad715e59
commit 7bb72fa080
2 changed files with 8 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
Dockerfile
View file

@ -82,6 +82,9 @@ RUN go get code.google.com/p/go.tools/cmd/cover
# TODO replace FPM with some very minimal debhelper stuff # TODO replace FPM with some very minimal debhelper stuff
RUN gem install --no-rdoc --no-ri fpm --version 1.0.2 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 # Setup s3cmd config
RUN /bin/echo -e '[default]\naccess_key=$AWS_ACCESS_KEY\nsecret_key=$AWS_SECRET_KEY' > /.s3cfg RUN /bin/echo -e '[default]\naccess_key=$AWS_ACCESS_KEY\nsecret_key=$AWS_SECRET_KEY' > /.s3cfg

6
hack/make/test-integration-cli
View file

@ -31,7 +31,11 @@ bundle_test_integration_cli() {
sleep 2 sleep 2
if ! docker inspect busybox &> /dev/null; then 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 fi
bundle_test_integration_cli bundle_test_integration_cli