toolshed/docker-cli
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

get e2e working with notary service

Browse Source 
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
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
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 && \

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

@ -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"]