diff --git a/dev.df b/dev.df index 683018080..13a1a4029 100644 --- a/dev.df +++ b/dev.df @@ -19,3 +19,8 @@ RUN venv/bin/pip install -r requirements.txt WORKDIR /src/quay ENV PYTHONPATH=/ ENV PATH=/venv/bin:$PATH + +RUN apt-key adv --keyserver hkp://pgp.mit.edu:80 --recv-keys 58118E89F3A912897C070ADBF76221572C52609D \ + && echo "deb https://apt.dockerproject.org/repo ubuntu-trusty main" > /etc/apt/sources.list.d/docker.list \ + && apt-get update \ + && apt-get install -y docker-engine diff --git a/local-docker.sh b/local-docker.sh index 4d816e1a4..d6fd55cf1 100755 --- a/local-docker.sh +++ b/local-docker.sh @@ -7,7 +7,7 @@ REPO=quay.io/quay/quay-dev d () { docker build -t $REPO -f dev.df . - docker -- run --rm -it --net=host -v $(pwd)/..:/src $REPO $* + docker -- run --rm -v /var/run/docker.sock:/run/docker.sock -it --net=host -v $(pwd)/..:/src $REPO $* } case $1 in @@ -27,6 +27,9 @@ initdb) rm -f test/data/test.db d /venv/bin/python initdb.py ;; +fulldbtest) + d bash /src/quay/test/fulldbtest.sh + ;; *) echo "unknown option" exit 1