Browse code

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 <github@gone.nl>
(cherry picked from commit 48fd0e921c53c1c195dad1e33e6be3bac4ec5cbd)
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>

Sebastiaan van Stijn authored on 2019/04/19 23:02:22
Showing 1 changed files
... ...
@@ -57,7 +57,9 @@ RUN addgroup docker && adduser -D -G docker unprivilegeduser -s /bin/ash
57 57
 
58 58
 COPY contrib/httpserver/Dockerfile /tests/contrib/httpserver/Dockerfile
59 59
 COPY contrib/syscall-test /tests/contrib/syscall-test
60
-COPY integration-cli/fixtures /tests/integration-cli/fixtures
60
+COPY integration/testdata       /tests/integration/testdata
61
+COPY integration/build/testdata /tests/integration/build/testdata
62
+COPY integration-cli/fixtures   /tests/integration-cli/fixtures
61 63
 
62 64
 COPY hack/test/e2e-run.sh /scripts/run.sh
63 65
 COPY hack/make/.ensure-emptyfs /scripts/ensure-emptyfs.sh