[pull] master from moby:master #1404
Open
+1,648,881
−624,852
Conversation
This file contains hidden or 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
…truct Align with other "delete" options, which are all named "remove". Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
daemon: disk-usage: fix incorrect key for singleflight
daemon/internal/builder-next: Builder.DiskUsage(): use singleflight
api, client: don't use a pointer-slice for plugins
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
These tests were failing because the "docker run" did not print the
ID of the container, and instead detached immediately without printing;
```
=== Failed
=== FAIL: amd64.integration-cli TestDockerCLICommitSuite/TestCommitAfterContainerIsDone (0.27s)
docker_cli_commit_test.go:32: assertion failed:
Command: /usr/local/cli-integration/docker wait
ExitCode: 1
Error: exit status 1
Stdout:
Stderr: invalid container name or ID: value is empty
Failures:
ExitCode was 1 expected 0
Expected no error
--- FAIL: TestDockerCLICommitSuite/TestCommitAfterContainerIsDone (0.27s)
=== FAIL: amd64.integration-cli TestDockerCLICommitSuite/TestCommitWithoutPause (0.20s)
docker_cli_commit_test.go:47: assertion failed:
Command: /usr/local/cli-integration/docker wait
ExitCode: 1
Error: exit status 1
Stdout:
Stderr: invalid container name or ID: value is empty
Failures:
ExitCode was 1 expected 0
Expected no error
--- FAIL: TestDockerCLICommitSuite/TestCommitWithoutPause (0.20s)
```
What happens is that it starts a container with only `stdin` attached, but
no `stdout`, and the behavior changed between versions of the CLI, which
may be either a bugfix or a regression;
docker 28 cli doesn't stay attached:
```bash
Status: Downloaded newer image for docker:28-cli
/ # docker run -i -a stdin busybox echo foo
/ #
```
docker 27 cli stays attached, but has the "three strikes, you're out" handling:
```bash
docker run -it --rm -v /var/run/docker.sock:/var/run/docker.sock docker:27-cli sh
Status: Downloaded newer image for docker:27-cli
/ # docker run -i -a stdin busybox echo foo
9dbb29080a72225593885bc4880d8f4f22f36803100179f9725468bda1d52b4f
^C^C^C
got 3 SIGTERM/SIGINTs, forcefully exiting
/ # ^C
```
docker 26 cli (and older) don't forward the signal to the container, and detach-keys don't work (or in this case, are handled by the CLI container)?:
```bash
docker run -it --rm -v /var/run/docker.sock:/var/run/docker.sock docker:26-cli sh
Status: Downloaded newer image for docker:26-cli
/ # docker run -i -a stdin busybox echo foo
21963ce1b9a7bb7eccef3618693b09a106fb29084b484e31c69cd4a26ee44777
^C^C^C^C^C^C^C^C^C^C^C^C^C^C^C^C^C^C^C^C^C^C^C^C^C^C^C^C^C
<CTRL>p,q
```
As these tests were not testing that part, I simplified the tests, but
we should probably look into the change of behavior to see if it was
intentional (and if it was correct).
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
client: checkpoint: add output structs and fix naming
daemon: close EventsService on shutdown
assorted test-changes in preparation of updating integration-cli CLI version
api: remove / internalize LegacyDiskUsage
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
api/types/volume: change ListResponse.Volumes to a non-pointer slice
api/types/container: make ContainerState, HealthStatus concrete types
… with daemon's config - Introduced DefaultIsolation method in the Daemon to return the daemon configured isolation mode for Windows. Signed-off-by: Vigilans <vigilans@foxmail.com>
The docker documentation website may not be publishing rendered versions of the swagger for deprecated API versions, so let's remove these links from the changelog. Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
This was deprecated in c4fda95, and already omitted. Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
api/docs: remove links to docs.docker.com from changelog
api/types/plugin: remove deprecated Config.DockerVersion
While go1.23 still works, it's already EOL, so it may be a better starting point to use that as minimum version for these modules, as they're brand new. Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
client, api: update go.mod to go1.24
…lation daemon: Ensure buildkit created container's isolation mode is consistent with daemon's config in Windows
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
Make the mocked responses match the API closer; - Add headers as returned by the daemon's VersionMiddleware - By default handle "/_ping" requests to allow the client to perform API-version negotiation as part of tests. Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
libnetwork: some minor refactor / cleanups
client: various test improvements
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
Historically, the client would downgrade to API v1.24 when failing to negotiate as this was the API version from before API-version negotiation was introduced. Given that those daemons are EOL and those API versions no longer supported, we should not fall back to an older API version, and just continue using the latest / current version. Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
client: enable API-version negotiation by default
Prepare v29.1.0 Signed-off-by: Rob Murray <rob.murray@docker.com>
Drop replace rules
Signed-off-by: Rob Murray <rob.murray@docker.com>
vendor: client/0.2.0
The bash array usage was wrong - change to a simpler check that just compares if the diff is empty. Signed-off-by: Paweł Gronowski <pawel.gronowski@docker.com>
validate/module-replace: Fix check
Allow other validate checks to finish even if one of them failed. Sometimes a check is faulty and its failure is expected - in such case we want to ignore that one validation fail but still run all the others. Signed-off-by: Paweł Gronowski <pawel.gronowski@docker.com>
gha/validate: Don't fail fast
Signed-off-by: Paweł Gronowski <pawel.gronowski@docker.com>
gha/validate: Actually dont fail fast
Signed-off-by: Rob Murray <rob.murray@docker.com>
client - use tagged api module
Signed-off-by: Rob Murray <rob.murray@docker.com>
vendor: update to client 0.2.1
This reverts commit 7639e19. Signed-off-by: Albin Kerouanton <albin.kerouanton@docker.com>
This reverts commit eb18b39. Signed-off-by: Albin Kerouanton <albin.kerouanton@docker.com>
…solver" This reverts commit 937246a. Signed-off-by: Albin Kerouanton <albin.kerouanton@docker.com>
Revert "libnet: setupDNS: don't overwrite user-modified resolv.conf"
In rootless mode, the Engine needs to call the rootless port driver to know which IP address it should bind to inside of its network namespace. The slirp4netns port drivers doesn't support binding to IPv6 address, so we need to detect that before listening on the port. Before commit 201968c, this wasn't a problem because the Engine was binding the port, then calling rootless port driver to learn whether the proto/IP family was supported, and listen on the port if so. Starting with that commit, the Engine does bind + listen in one go, and then calls the port driver — this is too late. Fix the bug by checking if the port driver supports the PortBindingReq, and only allocate the port if so. Signed-off-by: Albin Kerouanton <albin.kerouanton@docker.com>
Signed-off-by: Albin Kerouanton <albin.kerouanton@docker.com>
libnet/pms/nat: don't bind IPv6 ports if not supported by port driver
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
16 participants
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.
See Commits and Changes for more details.
Created by
pull[bot]
Can you help keep this open source service alive? 💖 Please sponsor : )