From 3afbf83cc5e5a2a18c20cf60c2bff47e27fa2a70 Mon Sep 17 00:00:00 2001 From: Sebastiaan van Stijn Date: Fri, 19 Apr 2019 16:02:22 +0200 Subject: [PATCH] Dockerfile.e2e fix TestBuildPreserveOwnership The Dockerfile missed some fixtures, which caused this test fail when running from this image. I also noticed some other fixtures missing in integration-cli, where the image had symlinks to some certificates, but the original files were not included; ``` |-- integration-cli |-- fixtures | |-- auth | | `-- docker-credential-shell-test | |-- credentialspecs | | `-- valid.json | |-- https | | |-- ca.pem -> ../../../integration/testdata/https/ca.pem | | |-- client-cert.pem -> ../../../integration/testdata/https/client-cert.pem | | |-- client-key.pem -> ../../../integration/testdata/https/client-key.pem | | |-- client-rogue-cert.pem | | |-- client-rogue-key.pem | | |-- server-cert.pem -> ../../../integration/testdata/https/server-cert.pem | | |-- server-key.pem -> ../../../integration/testdata/https/server-key.pem | | |-- server-rogue-cert.pem | | `-- server-rogue-key.pem ``` Signed-off-by: Sebastiaan van Stijn (cherry picked from commit 48fd0e921c53c1c195dad1e33e6be3bac4ec5cbd) Signed-off-by: Sebastiaan van Stijn --- Dockerfile.e2e | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/Dockerfile.e2e b/Dockerfile.e2e index 0f5a4039ea..77c23d97aa 100644 --- a/Dockerfile.e2e +++ b/Dockerfile.e2e @@ -57,7 +57,9 @@ RUN addgroup docker && adduser -D -G docker unprivilegeduser -s /bin/ash COPY contrib/httpserver/Dockerfile /tests/contrib/httpserver/Dockerfile COPY contrib/syscall-test /tests/contrib/syscall-test -COPY integration-cli/fixtures /tests/integration-cli/fixtures +COPY integration/testdata /tests/integration/testdata +COPY integration/build/testdata /tests/integration/build/testdata +COPY integration-cli/fixtures /tests/integration-cli/fixtures COPY hack/test/e2e-run.sh /scripts/run.sh COPY hack/make/.ensure-emptyfs /scripts/ensure-emptyfs.sh