This repository has been archived by the owner on Oct 13, 2023. It is now read-only.
[19.03 backport] backport Dockerfile.e2e fixes #207
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
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 <[email protected]>
(cherry picked from commit 48fd0e9)
Signed-off-by: Sebastiaan van Stijn <[email protected]>
Signed-off-by: Sebastiaan van Stijn <[email protected]> (cherry picked from commit 2026268) Signed-off-by: Sebastiaan van Stijn <[email protected]>
Signed-off-by: Sebastiaan van Stijn <[email protected]> (cherry picked from commit 5554bd1) Signed-off-by: Sebastiaan van Stijn <[email protected]>
Signed-off-by: Sebastiaan van Stijn <[email protected]> (cherry picked from commit 63aefbf) Signed-off-by: Sebastiaan van Stijn <[email protected]>
Signed-off-by: Sebastiaan van Stijn <[email protected]> (cherry picked from commit 045beed) Signed-off-by: Sebastiaan van Stijn <[email protected]>
Signed-off-by: Sebastiaan van Stijn <[email protected]> (cherry picked from commit e7784a6) Signed-off-by: Sebastiaan van Stijn <[email protected]>
Signed-off-by: Sebastiaan van Stijn <[email protected]> (cherry picked from commit 3ededb8) Signed-off-by: Sebastiaan van Stijn <[email protected]>
Signed-off-by: Sebastiaan van Stijn <[email protected]> (cherry picked from commit b73e340) Signed-off-by: Sebastiaan van Stijn <[email protected]>
Older versions of the daemon would concatenate hostname and domainname, so hostname "foobar" and domainname "baz.cyphar.com" would produce `foobar.baz.cyphar.com` as hostname. Signed-off-by: Sebastiaan van Stijn <[email protected]> (cherry picked from commit c91c377) Signed-off-by: Sebastiaan van Stijn <[email protected]>
TestNISDomainname in the integration suite covers this Signed-off-by: Sebastiaan van Stijn <[email protected]> (cherry picked from commit 2b5880c) Signed-off-by: Sebastiaan van Stijn <[email protected]>
The daemon may already have other volumes, so filter out those when running the test. Signed-off-by: Sebastiaan van Stijn <[email protected]> (cherry picked from commit 566eea1) Signed-off-by: Sebastiaan van Stijn <[email protected]>
Signed-off-by: Sebastiaan van Stijn <[email protected]> (cherry picked from commit 0e7b46a) Signed-off-by: Sebastiaan van Stijn <[email protected]>
Signed-off-by: Sebastiaan van Stijn <[email protected]> (cherry picked from commit d080a86) Signed-off-by: Sebastiaan van Stijn <[email protected]>
Older versions did not use an UUID as ID Signed-off-by: Sebastiaan van Stijn <[email protected]> (cherry picked from commit 05bd995) Signed-off-by: Sebastiaan van Stijn <[email protected]>
Signed-off-by: Sebastiaan van Stijn <[email protected]> (cherry picked from commit 83ac2b4) Signed-off-by: Sebastiaan van Stijn <[email protected]>
This test case requires not just daemon >= 1.40, but also client API >= 1.40. In case older client is used, we'll get failure from the very first check: > ipcmode_linux_test.go:313: assertion failed: shareable (string) != private (string) Signed-off-by: Kir Kolyshkin <[email protected]> (cherry picked from commit 1ada1c8) Signed-off-by: Sebastiaan van Stijn <[email protected]>
Package "gotest.tools/assert" uses source introspection to print more info in case of assertion failure. When source code is not available, it prints an error instead. In other words, before this commit: > --- SKIP: TestCgroupDriverSystemdMemoryLimit (0.00s) > cgroupdriver_systemd_test.go:32: failed to parse source file: /go/src/github.com/docker/docker/integration/system/cgroupdriver_systemd_test.go: open /go/src/github.com/docker/docker/integration/system/cgroupdriver_systemd_test.go: no such file or directory > cgroupdriver_systemd_test.go:32: and after: > --- SKIP: TestCgroupDriverSystemdMemoryLimit (0.09s) > cgroupdriver_systemd_test.go:32: !hasSystemd() This increases the resulting image size by about 2 MB on my system (from 758 to 760 MB). Signed-off-by: Kir Kolyshkin <[email protected]> (cherry picked from commit 0deb18a) Signed-off-by: Sebastiaan van Stijn <[email protected]>
1. There is no need to persist DOCKER_GITCOMMIT, as it's not needed for runtime, only for build. So, remove ENV. 2. In case $GITCOMMIT is not defined during build time (and it happens if .git directory is not present), we still need to have some value set, so set it to `undefined`. Otherwise we'll have something like > => ERROR [builder 2/3] RUN hack/make.sh build-integration-test-binary > ------ > > [builder 2/3] RUN hack/make.sh build-integration-test-binary: > moby#32 0.488 > moby#32 0.505 error: .git directory missing and DOCKER_GITCOMMIT not specified > moby#32 0.505 Please either build with the .git directory accessible, or specify the > moby#32 0.505 exact (--short) commit hash you are building using DOCKER_GITCOMMIT for > moby#32 0.505 future accountability in diagnosing build issues. Thanks! Signed-off-by: Kir Kolyshkin <[email protected]> (cherry picked from commit c3b2494) Signed-off-by: Sebastiaan van Stijn <[email protected]>
|
ping @kolyshkin @seemethere ptal |
Sign up for free
to subscribe to this conversation on GitHub.
Already have an account?
Sign in.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
backports for 19.03 of;