From ade675d36cebb996044a1ee913c3004e0a4f274c Mon Sep 17 00:00:00 2001
From: Daniel Nephin <dnephin@docker.com>
Date: Fri, 6 Oct 2017 19:11:01 -0400
Subject: [PATCH] get e2e working with notary service

Signed-off-by: Daniel Nephin <dnephin@docker.com>
---
 dockerfiles/Dockerfile.dev          |  2 +-
 dockerfiles/Dockerfile.test-e2e-env |  5 +----
 e2e/compose-env.yaml                |  5 ++++-
 scripts/test/e2e/run                |  4 +++-
 scripts/test/e2e/wrapper            | 10 ++++++++++
 5 files changed, 19 insertions(+), 7 deletions(-)

diff --git a/dockerfiles/Dockerfile.dev b/dockerfiles/Dockerfile.dev
index 8ee2e905b3..1651ad1eb0 100644
--- a/dockerfiles/Dockerfile.dev
+++ b/dockerfiles/Dockerfile.dev
@@ -1,7 +1,7 @@
 
 FROM    golang:1.8.4-alpine
 
-RUN     apk add -U git make bash coreutils
+RUN     apk add -U git make bash coreutils ca-certificates
 
 ARG     VNDR_SHA=a6e196d8b4b0cbbdc29aebdb20c59ac6926bb384
 RUN     go get -d github.com/LK4D4/vndr && \
diff --git a/dockerfiles/Dockerfile.test-e2e-env b/dockerfiles/Dockerfile.test-e2e-env
index 1098d5927a..3c672f4e8c 100644
--- a/dockerfiles/Dockerfile.test-e2e-env
+++ b/dockerfiles/Dockerfile.test-e2e-env
@@ -1,6 +1,6 @@
 FROM    docker/compose:1.15.0
 
-RUN     apk add -U bash curl ca-certificates
+RUN     apk add -U bash curl
 
 ARG     DOCKER_CHANNEL=edge
 ARG     DOCKER_VERSION=17.06.0-ce
@@ -13,8 +13,5 @@ ENV     DISABLE_WARN_OUTSIDE_CONTAINER=1
 WORKDIR /work
 COPY    scripts/test/e2e scripts/test/e2e
 COPY    e2e/compose-env.yaml e2e/compose-env.yaml
-COPY    e2e/testdata e2e/testdata
-COPY    e2e/testdata/notary/root-ca.cert /usr/local/share/ca-certificates/notary.cert
-RUN     update-ca-certificates
 
 ENTRYPOINT ["bash", "/work/scripts/test/e2e/run"]
diff --git a/e2e/compose-env.yaml b/e2e/compose-env.yaml
index 739343d27b..d77427a253 100644
--- a/e2e/compose-env.yaml
+++ b/e2e/compose-env.yaml
@@ -14,5 +14,8 @@ services:
       ports:
         - 4443:4443
       volumes:
-       - ./testdata/notary:/fixtures
+       - notary-fixtures:/fixtures
       command: ['notary-server', '-config=/fixtures/notary-config.json']
+
+volumes:
+  notary-fixtures: {}
diff --git a/scripts/test/e2e/run b/scripts/test/e2e/run
index 4010e756c4..9994d4863a 100755
--- a/scripts/test/e2e/run
+++ b/scripts/test/e2e/run
@@ -33,12 +33,14 @@ function is_swarm_enabled {
 }
 
 function cleanup {
-    COMPOSE_PROJECT_NAME=$1 COMPOSE_FILE=$2 docker-compose down >&2
+    COMPOSE_PROJECT_NAME=$1 COMPOSE_FILE=$2 docker-compose down -v >&2
 }
 
 function runtests {
     local engine_host=$1
 
+    # TODO: only run if inside a container
+    update-ca-certificates
     # shellcheck disable=SC2086
     env -i \
         TEST_DOCKER_HOST="$engine_host" \
diff --git a/scripts/test/e2e/wrapper b/scripts/test/e2e/wrapper
index 0f85f43283..47a18487b6 100755
--- a/scripts/test/e2e/wrapper
+++ b/scripts/test/e2e/wrapper
@@ -22,13 +22,23 @@ docker build \
     -t "$dev_image" \
     -f dockerfiles/Dockerfile.dev .
 
+notary_volume="${unique_id}_notary-fixtures"
+docker volume create "$notary_volume"
+docker run --rm \
+    -v "$PWD:/go/src/github.com/docker/cli" \
+    -v "$notary_volume:/data" \
+    "$dev_image" \
+    cp -r ./e2e/testdata/notary/* /data/
+
 engine_host=$(run_in_env setup)
 testexit=0
 docker run -i --rm \
     -v "$PWD:/go/src/github.com/docker/cli" \
+    -v "$PWD/e2e/testdata/notary/root-ca.cert:/usr/local/share/ca-certificates/notary.cert" \
     --network "${unique_id}_default" \
     -e TESTFLAGS \
     "$dev_image" \
     ./scripts/test/e2e/run test "$engine_host" || testexit="$?"
+
 run_in_env cleanup
 exit "$testexit"