From ece4b5bde8ff6ea21b51275a69787191d12a5d65 Mon Sep 17 00:00:00 2001 From: Tianon Gravi Date: Mon, 9 Mar 2015 18:24:49 -0600 Subject: [PATCH] Update Dockerfile.simple to include aufs-tools This also updates the comments at the top of the file to note that `-v /var/lib/docker` should be supplied for running `test-integration-cli` and that `hack/dind` is actually also required for `test-unit`. Signed-off-by: Andrew "Tianon" Page --- Dockerfile.simple | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/Dockerfile.simple b/Dockerfile.simple index b6a7edbee7..dfe3b26469 100644 --- a/Dockerfile.simple +++ b/Dockerfile.simple @@ -1,7 +1,7 @@ # docker build -t docker:simple -f Dockerfile.simple . # docker run --rm docker:simple hack/make.sh dynbinary -# docker run --rm --privileged docker:simple hack/make.sh test-unit -# docker run --rm --privileged docker:simple hack/dind hack/make.sh dynbinary test-integration-cli +# docker run --rm --privileged docker:simple hack/dind hack/make.sh test-unit +# docker run --rm --privileged -v /var/lib/docker docker:simple hack/dind hack/make.sh dynbinary test-integration-cli # This represents the bare minimum required to build and test Docker. @@ -24,6 +24,7 @@ RUN apt-get update && apt-get install -y --no-install-recommends \ procps \ xz-utils \ \ + aufs-tools \ lxc \ && rm -rf /var/lib/apt/lists/*