daniel
/
distribution
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Add temporary cache directory 

Signed-off-by: Derek McGowan <derek@mcgstyle.net> (github: dmcgowan)
master
Derek McGowan 2016-03-30 16:07:22 -07:00
parent 17f7f60d77
commit 2ea61dc04f
2 changed files with 11 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
contrib/docker-integration/Dockerfile
View File

@ -4,4 +4,6 @@ MAINTAINER Docker Distribution Team <distribution@docker.com>
RUN apk add --no-cache git RUN apk add --no-cache git
ENV TMPDIR /var/lib/docker/tmp
WORKDIR /go/src/github.com/docker/distribution/contrib/docker-integration WORKDIR /go/src/github.com/docker/distribution/contrib/docker-integration

10
contrib/docker-integration/run_multiversion.sh
View File

@ -7,6 +7,14 @@ set -x
DIR=$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd) DIR=$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)
if [ "$TMPDIR" != "" ] && [ ! -d "$TMPDIR" ]; then
mkdir -p $TMPDIR
fi
cachedir=`mktemp -t -d golem-cache.XXXXXX`
trap "rm -rf $cachedir" EXIT
if [ "$1" == "-d" ]; then if [ "$1" == "-d" ]; then
# Drivers to use for Docker engines the tests are going to create. # Drivers to use for Docker engines the tests are going to create.
STORAGE_DRIVER=${STORAGE_DRIVER:-overlay} STORAGE_DRIVER=${STORAGE_DRIVER:-overlay}
@ -47,7 +55,7 @@ time docker pull docker:1.9.1-dind
time docker pull docker:1.10.3-dind time docker pull docker:1.10.3-dind
time docker pull dockerswarm/dind:1.11.0-rc2 time docker pull dockerswarm/dind:1.11.0-rc2
golem \ golem -cache $cachedir \
-i "golem-distribution:latest,$distimage,$distversion" \ -i "golem-distribution:latest,$distimage,$distversion" \
-i "golem-dind:latest,docker:1.9.1-dind,1.9.1" \ -i "golem-dind:latest,docker:1.9.1-dind,1.9.1" \
-i "golem-dind:latest,docker:1.10.3-dind,1.10.3" \ -i "golem-dind:latest,docker:1.10.3-dind,1.10.3" \