e5b29b8975
Merge pull request #3943 from vvoland/fix-test-removeforce
...
cli/rm_test: Fix TestRemoveForce race condition
2023-01-06 15:39:39 +01:00
b811057181
cli/rm_test: Fix TestRemoveForce race condition
...
Synchronize append on the `removed` slice with mutex because
containerRemoveFunc is called in parallel for each removed container by
`container rm` cli command.
Also reduced the shared access area by separating the scopes of test
cases.
Signed-off-by: Paweł Gronowski <pawel.gronowski@docker.com>
2023-01-04 10:57:45 +01:00
850fb6921c
Merge pull request #3936 from thaJeztah/strings_cut
...
Replace uses of `strings.Split(N)` with `strings.Cut()`
2022-12-29 19:02:20 +01:00
42de5cc7f0
service/logs: use strings.Cut
...
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2022-12-29 15:19:31 +01:00
3fa18636ec
internal/test: use strings.Cut
...
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2022-12-29 15:19:31 +01:00
c8bd8932a1
cli/config: use strings.Cut
...
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2022-12-29 15:19:31 +01:00
3bed830a27
cli/compose: use strings.Cut
...
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2022-12-29 15:19:31 +01:00
cb19bf9f7d
cli/command: use strings.Cut
...
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2022-12-29 15:19:31 +01:00
acc45f5494
cli/command/volume: use strings.Cut
...
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2022-12-29 15:19:30 +01:00
806f9eab68
cli/command/swarm: use strings.Cut
...
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2022-12-29 15:19:30 +01:00
b3557b2840
cli/command/stack: use strings.Cut
...
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2022-12-29 15:19:30 +01:00
2b06c0c42c
cli/command/service: use strings.Cut
...
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2022-12-29 15:19:30 +01:00
f29992c0f1
cli/command/network: use strings.Cut
...
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2022-12-29 15:19:30 +01:00
424401233f
cli/command/container: use strings.Cut
...
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2022-12-29 15:19:24 +01:00
6c39bc1f60
opts: use strings.Cut for handling key/value pairs
...
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2022-12-29 15:14:15 +01:00
a473c5b38a
opts: rename logOptsValidator, fix unhandled errors in tests
...
This validator was not specific to "log options", so renaming it to make this
clearer; also updating values used in the tests to make it clear they're not
"actual" valid values, just for testing, and while updating, also fixed some
unhandled errors in tests.
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2022-12-29 15:14:14 +01:00
d84256132d
remove redundant conversions and braces
...
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2022-12-29 15:14:14 +01:00
0359f8eeee
Merge pull request #3939 from vvoland/docs-run-fix-blog
...
docs/run: Fix url to blog "Docker can now run within Docker"
2022-12-29 15:03:15 +01:00
720a6a8239
docs/run: Fix url to blog "Docker can now run within Docker"
...
Signed-off-by: Paweł Gronowski <pawel.gronowski@docker.com>
2022-12-29 14:33:34 +01:00
b1db70ded7
Merge pull request #3931 from danger89/patch-1
...
Missing exec_die event
2022-12-28 18:11:16 +01:00
946bb9471b
Missing exec_die event
...
Add also `exec_die` event.
Signed-off-by: Melroy van den Berg <melroy@melroy.org>
2022-12-28 01:50:50 +01:00
ed94b6ee91
Merge pull request #3935 from thaJeztah/remove_networkdisabled
...
cli/command/container: remove unused NetworkDisabled field
2022-12-27 16:04:49 +01:00
112f4ec38d
Merge pull request #3934 from thaJeztah/update_engine
...
vendor: github.com/docker/docker v23.0.0-rc.1 (use tag)
2022-12-27 16:04:28 +01:00
cea94069fb
Merge pull request #3933 from thaJeztah/update_mousetrap
...
vendor: github.com/inconshreveable/mousetrap v1.1.0
2022-12-27 16:04:07 +01:00
784f660143
cli/command/container: remove unused NetworkDisabled field
...
This comment was added in 7929888214
2022-12-27 15:26:23 +01:00
6fe14e61f2
vendor: github.com/docker/docker v23.0.0-rc.1 (use tag)
...
no changes in code, as this is the same commit, but now using the tag
full diff: https://github.com/docker/docker/compare/cba986b34090...v23.0.0-rc.1
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2022-12-27 13:48:20 +01:00
c5982f373c
vendor: github.com/inconshreveable/mousetrap v1.1.0
...
removes compatibility code for go1.3 and older;
https://github.com/inconshreveable/mousetrap/compare/v1.0.1...v1.1.0
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2022-12-27 13:45:16 +01:00
139e924690
Merge pull request #3929 from thaJeztah/update_engine
...
vendor: update docker/docker to tip of v23.0 branch
2022-12-22 23:47:11 +01:00
cc859412c8
vendor: github.com/docker/docker v23.0.0-beta.1.0.20221221173850-cba986b34090
...
full diff: https://github.com/docker/docker/compare/v23.0.0-beta.1...cba986b34090
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2022-12-22 23:06:38 +01:00
70d24e854b
vendor: github.com/moby/swarmkit/v2 v2.0.0-20221215132206-0da442b2780f
...
full diff: b17f02f0a0...0da442b278
2022-12-22 23:04:12 +01:00
bab905a442
vendor: golang.org/x/crypto v0.2.0
...
full diff: https://github.com/golang/crypto/compare/v0.1.0...v0.2.0
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2022-12-22 23:02:17 +01:00
929f23fcf9
vendor: golang.org/x/net v0.4.0
...
full diff: https://github.com/golang/net/compare/v0.1.0...v0.4.0
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2022-12-22 23:00:49 +01:00
2df9ff91e1
vendor: golang.org/x/term v0.3.0
...
full diff: https://github.com/golang/term/compare/v0.1.0...v0.3.0
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2022-12-22 22:59:45 +01:00
1b75c7c52a
vendor: golang.org/x/text v0.5.0
...
full diff: https://github.com/golang/text/compare/v0.4.0...v0.5.0
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2022-12-22 22:53:24 +01:00
e3e0b7a6c8
vendor: golang.org/x/sys v0.3.0
...
full diff: https://github.com/golang/sys/compare/v0.2.0...v0.3.0
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2022-12-22 22:51:19 +01:00
6f2f021b6d
vendor: github.com/prometheus/client_golang v1.14.0
...
full diff: https://github.com/prometheus/client_golang/compare/v1.13.0...v1.14.0
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2022-12-22 22:48:55 +01:00
dedbcec469
vendor: github.com/opencontainers/runc v1.1.3
...
full diff: https://github.com/opencontainers/runc/compare/v1.1.2...v1.1.3
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2022-12-22 22:46:56 +01:00
cd2098c461
vendor: github.com/klauspost/compress v1.15.12
...
full diff: https://github.com/klauspost/compress/compare/v1.15.9...v1.15.12
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2022-12-22 22:45:42 +01:00
d7869beade
vendor: github.com/containerd/containerd v1.6.14
...
full diff: https://github.com/containerd/containerd/compare/v1.6.10...v1.6.14
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2022-12-22 22:43:11 +01:00
378c92d758
Merge pull request #3925 from thaJeztah/fix_warning_typo
...
cmd/docker: fix typo in deprecation warning
2022-12-19 13:57:00 +01:00
06eba426d7
cmd/docker: fix typo in deprecation warning
...
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2022-12-19 13:03:28 +01:00
9a5d5aefb8
Merge pull request #3923 from dozjul/master
...
Added missing backslash to documentation cli snippet
2022-12-18 11:18:16 +01:00
895e7a3df8
Added missing backslash to documentation sites cli snippet
...
I think the cli code block misses a backslash to brevent line break when copy/pasting it to a terminal.
I doubt that this is intentional, if it is, feel free to reject the pr.
Signed-off-by: Julian <gitea+julian@ic.thejulian.uk>
2022-12-18 10:47:51 +01:00
51f36c6be1
Merge pull request #3915 from thaJeztah/remove_libtrust_todo
...
cli/flags: remove outdated TODO
2022-12-15 16:05:01 +01:00
2f733b87f9
cli/flags: remove outdated TODO
...
Libtrust was only used for pushing schema 2, v1 images, which is no longer
supported; this TODO was likely left from when the CLI and daemon were
in the same repository.
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2022-12-15 15:29:56 +01:00
990674901b
Merge pull request #3905 from thaJeztah/improve_buildkit_error
...
cmd/docker: improve error message if BUILDKIT_ENABLED=0
2022-12-09 14:24:46 +01:00
60d62fb729
cmd/docker: improve error message if BUILDKIT_ENABLED=0
...
Before this change, the error would suggest installing buildx:
echo "FROM scratch" | DOCKER_BUILDKIT=0 docker build -
DEPRECATED: The legacy builder is deprecated and will be removed in a future release.
Install the buildx component to build images with BuildKit:
https://docs.docker.com/go/buildx/
...
However, this error would also be shown if buildx is actually installed,
but disabled through "DOCKER_BUILDKIT=0";
docker buildx version
github.com/docker/buildx v0.9.1 ed00243
With this patch, it reports that it's disabled, and how to fix:
echo "FROM scratch" | DOCKER_BUILDKIT=0 docker build -
DEPRECATED: The legacy builder is deprecated and will be removed in a future release.
BuildKit is currently disabled; enabled it by removing the DOCKER_BUILDKIT=0
environment-variable.
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2022-12-09 13:08:07 +01:00
83ca73f9aa
Merge pull request #3900 from pdaig/fix-ssh-killed
...
Fix ssh process killed when context is done
2022-12-08 20:26:33 +01:00
693ae6ca73
Merge pull request #3912 from thaJeztah/bump_engine
...
vendor: github.com/docker/docker v23.0.0-beta.1
2022-12-08 10:24:44 +01:00
0f6023a9c3
vendor: github.com/docker/docker v23.0.0-beta.1
...
Allows us to remove the replace rule, although we probably need to
add it back if we want to update to a newer version from the release
branch (as go mod doesn't support release branches :(( ).
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2022-12-07 23:14:19 +01:00
Sebastiaan van Stijn
Paweł Gronowski
Sebastiaan van Stijn
Melroy van den Berg
Julian