vbatts/registry
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

Two fixes for Docker integration tests

Browse source 
- Add a command line argument to run_multiversion.sh which has it start
  a docker daemon. This allows it to run directly inside an outermost
  docker-integration container instead of running outside all containers.

- Install Docker 1.7.1 intead of 1.7.0-rc1 in the docker-integration
  container. 1.7.0 has a bug that prevents "docker cp" from working
  properly.

Signed-off-by: Aaron Lehmann <aaron.lehmann@docker.com>
This commit is contained in:
Aaron Lehmann 2015-08-04 11:49:55 -07:00
parent c4e553a655
commit f7a11aa258
2 changed files with 24 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

2
contrib/docker-integration/Dockerfile
View file

@ -20,7 +20,7 @@ RUN apt-get update && apt-get install -y --no-install-recommends \
&& apt-get clean && rm -rf /var/lib/apt/lists/*
# Install Docker
ENV VERSION 1.7.0-rc1
ENV VERSION 1.7.1
RUN curl -L -o /usr/local/bin/docker https://test.docker.com/builds/Linux/x86_64/docker-${VERSION} \
&& chmod +x /usr/local/bin/docker