alexvanin/distribution
1
0
Fork 0
forked from TrueCloudLab/distribution
Code Pull requests Activity

Add support for docker volume

Browse source 
Added an environment variable which can be used to pass in the docker volume for the container. This allows caching the pulled images between runs, preventing unnecessary image pulls.

Signed-off-by: Derek McGowan <derek@mcgstyle.net> (github: dmcgowan)
This commit is contained in:
Derek McGowan 2015-05-28 15:28:50 -07:00
parent de638db71e
commit 4ebd6b7e1d
2 changed files with 15 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
contrib/docker-integration/README.md
View file

@ -14,7 +14,7 @@ locally.
*Building locally* *Building locally*
``` ```
docker build -t distribution/docker-integration . $ docker build -t distribution/docker-integration .
``` ```
### Run script ### Run script
@ -22,7 +22,14 @@ docker build -t distribution/docker-integration .
Invoke the tests within Docker through the `run.sh` script. Invoke the tests within Docker through the `run.sh` script.
``` ```
./run.sh $ ./run.sh
```
Run with aufs driver and tmp volume
**NOTE: Using a volume will prevent multiple runs from needing to
re-pull images**
```
$ STORAGE_DRIVER=aufs DOCKER_VOLUME=/tmp/volume ./run.sh
``` ```
## Running manually outside of Docker ## Running manually outside of Docker

8
contrib/docker-integration/run.sh
View file

@ -6,6 +6,11 @@ cd "$(dirname "$(readlink -f "$BASH_SOURCE")")"
# Root directory of Distribution # Root directory of Distribution
DISTRIBUTION_ROOT=$(cd ../..; pwd -P) DISTRIBUTION_ROOT=$(cd ../..; pwd -P)
volumeMount=""
if [ "$DOCKER_VOLUME" != "" ]; then
volumeMount="-v ${DOCKER_VOLUME}:/var/lib/docker"
fi
# Image containing the integration tests environment. # Image containing the integration tests environment.
INTEGRATION_IMAGE=${INTEGRATION_IMAGE:-distribution/docker-integration} INTEGRATION_IMAGE=${INTEGRATION_IMAGE:-distribution/docker-integration}
@ -14,9 +19,8 @@ INTEGRATION_IMAGE=${INTEGRATION_IMAGE:-distribution/docker-integration}
#docker pull $INTEGRATION_IMAGE #docker pull $INTEGRATION_IMAGE
# Start the integration tests in a Docker container. # Start the integration tests in a Docker container.
ID=$(docker run -d -t --privileged \ ID=$(docker run -d -t --privileged $volumeMount \
-v ${DISTRIBUTION_ROOT}:/go/src/github.com/docker/distribution \ -v ${DISTRIBUTION_ROOT}:/go/src/github.com/docker/distribution \
-e "DOCKER_IMAGE=$DOCKER_IMAGE" \
-e "DOCKER_VERSION=$DOCKER_VERSION" \ -e "DOCKER_VERSION=$DOCKER_VERSION" \
-e "STORAGE_DRIVER=$STORAGE_DRIVER" \ -e "STORAGE_DRIVER=$STORAGE_DRIVER" \
-e "EXEC_DRIVER=$EXEC_DRIVER" \ -e "EXEC_DRIVER=$EXEC_DRIVER" \