Guest24897
/
DockerCLI
mirror of https://github.com/docker/cli.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

get e2e working with notary service 

Signed-off-by: Daniel Nephin <dnephin@docker.com>
This commit is contained in:
Daniel Nephin 2017-10-06 19:11:01 -04:00 committed by Riyaz Faizullabhoy
parent 6e3bafd06b
commit ade675d36c
5 changed files with 19 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
dockerfiles/Dockerfile.dev
View File

@ -1,7 +1,7 @@
FROM golang:1.8.4-alpine 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 ARG VNDR_SHA=a6e196d8b4b0cbbdc29aebdb20c59ac6926bb384
RUN go get -d github.com/LK4D4/vndr && \ RUN go get -d github.com/LK4D4/vndr && \

5
dockerfiles/Dockerfile.test-e2e-env
View File

@ -1,6 +1,6 @@
FROM docker/compose:1.15.0 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_CHANNEL=edge
ARG DOCKER_VERSION=17.06.0-ce ARG DOCKER_VERSION=17.06.0-ce
@ -13,8 +13,5 @@ ENV DISABLE_WARN_OUTSIDE_CONTAINER=1
WORKDIR /work WORKDIR /work
COPY scripts/test/e2e scripts/test/e2e COPY scripts/test/e2e scripts/test/e2e
COPY e2e/compose-env.yaml e2e/compose-env.yaml 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"] ENTRYPOINT ["bash", "/work/scripts/test/e2e/run"]

5
e2e/compose-env.yaml
View File

@ -14,5 +14,8 @@ services:
ports: ports:
- 4443:4443 - 4443:4443
volumes: volumes:
- ./testdata/notary:/fixtures - notary-fixtures:/fixtures
command: ['notary-server', '-config=/fixtures/notary-config.json'] command: ['notary-server', '-config=/fixtures/notary-config.json']
volumes:
notary-fixtures: {}

4
scripts/test/e2e/run
View File

@ -33,12 +33,14 @@ function is_swarm_enabled {
} }
function cleanup { 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 { function runtests {
local engine_host=$1 local engine_host=$1
# TODO: only run if inside a container
update-ca-certificates
# shellcheck disable=SC2086 # shellcheck disable=SC2086
env -i \ env -i \
TEST_DOCKER_HOST="$engine_host" \ TEST_DOCKER_HOST="$engine_host" \

10
scripts/test/e2e/wrapper
View File

@ -22,13 +22,23 @@ docker build \
-t "$dev_image" \ -t "$dev_image" \
-f dockerfiles/Dockerfile.dev . -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) engine_host=$(run_in_env setup)
testexit=0 testexit=0
docker run -i --rm \ docker run -i --rm \
-v "$PWD:/go/src/github.com/docker/cli" \ -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" \ --network "${unique_id}_default" \
-e TESTFLAGS \ -e TESTFLAGS \
"$dev_image" \ "$dev_image" \
./scripts/test/e2e/run test "$engine_host" || testexit="$?" ./scripts/test/e2e/run test "$engine_host" || testexit="$?"
run_in_env cleanup run_in_env cleanup
exit "$testexit" exit "$testexit"