8749 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
Sebastiaan van Stijn	680212238b	Merge pull request #4310 from thaJeztah/24.0_backport_fix_daemon_proxy v24.0.1	2023-05-19 17:51:02 +02:00
Sebastiaan van Stijn	298e67926e	docs: fix example for proxies in daemon.json ... commit c846428cb6 added proxies to the example `daemon.json`, based on the implementation that was added in 427c7cc5f8. However, a follow-up pull request changed the proxy-configuration in`daemon.json` to nest the configuration in a "proxies" struct, and the documentation was not updated accordingly; see: 101dafd049 This patch fixes the example. Signed-off-by: Sebastiaan van Stijn <github@gone.nl> (cherry picked from commit 2713d0bcde) Signed-off-by: Sebastiaan van Stijn <github@gone.nl>	2023-05-19 17:29:30 +02:00
Sebastiaan van Stijn	aa40216965	Merge pull request #4308 from thaJeztah/24.0_backport_docs_fixes	2023-05-19 15:08:06 +02:00
Sebastiaan van Stijn	9175ffa9b2	man: remove devicemapper from examples ... Signed-off-by: Sebastiaan van Stijn <github@gone.nl> (cherry picked from commit 4c11f73dcb) Signed-off-by: Sebastiaan van Stijn <github@gone.nl>	2023-05-19 14:45:52 +02:00
A. Lester Buck III	beb0330a72	Correct "ps --no-trunc" example output ... Signed-off-by: A. Lester Buck III <github-reg@nbolt.com> (cherry picked from commit 988e37956d) Signed-off-by: Sebastiaan van Stijn <github@gone.nl>	2023-05-19 14:38:03 +02:00
Sebastiaan van Stijn	405be90634	docs: remove AuFS from glossary ... The AuFS storage driver was deprecated and now removed. Signed-off-by: Sebastiaan van Stijn <github@gone.nl> (cherry picked from commit b222900520) Signed-off-by: Sebastiaan van Stijn <github@gone.nl>	2023-05-19 14:37:51 +02:00
Sebastiaan van Stijn	7a269817b5	docs: remove Docker Toolbox from glossary ... Signed-off-by: Sebastiaan van Stijn <github@gone.nl> (cherry picked from commit e4211c91ed) Signed-off-by: Sebastiaan van Stijn <github@gone.nl>	2023-05-19 14:37:51 +02:00
Sebastiaan van Stijn	41ef7c45cc	docs: remove boot2docker and docker-machine from glossary ... boot2docker is deprecated, and so is docker-machine Signed-off-by: Sebastiaan van Stijn <github@gone.nl> (cherry picked from commit c246ea8517) Signed-off-by: Sebastiaan van Stijn <github@gone.nl>	2023-05-19 14:37:48 +02:00
Sebastiaan van Stijn	199b872c98	Merge pull request #4302 from thaJeztah/24.0_backport_completion_remove_aufs_overlay ... [24.0 backport] contrib/completion: remove aufs, legacy overlay	2023-05-19 10:07:01 +02:00
Sebastiaan van Stijn	661f70b52d	Merge pull request #4305 from thaJeztah/24.0_backport_daemon_remove_deprecated_drivers ... [24.0 backport] docs: remove uses of deprecated AuFS, legacy overlay storage drivers	2023-05-19 09:50:27 +02:00
Sebastiaan van Stijn	c184a61dab	docs/deprecated: remove "disabled by default" for AuFS, overlay ... These drivers have been removed in docker 24.0, so it's no longer possible to enable them. Signed-off-by: Sebastiaan van Stijn <github@gone.nl> (cherry picked from commit c61b565183) Signed-off-by: Sebastiaan van Stijn <github@gone.nl>	2023-05-19 01:23:37 +02:00
Sebastiaan van Stijn	e7a60449f7	docs: remove aufs and legacy overlay ... Signed-off-by: Sebastiaan van Stijn <github@gone.nl> (cherry picked from commit 9f537a756e) Signed-off-by: Sebastiaan van Stijn <github@gone.nl>	2023-05-19 01:23:37 +02:00
Sebastiaan van Stijn	77541afeab	contrib/completion: remove aufs, legacy overlay ... The AuFS and (legacy) overlay storage drivers have been deprecated and removed, so remove them from the completion scripts. Signed-off-by: Sebastiaan van Stijn <github@gone.nl> (cherry picked from commit 73fbcdea05) Signed-off-by: Sebastiaan van Stijn <github@gone.nl>	2023-05-19 01:01:55 +02:00
Bjorn Neergaard	f4b354f688	Merge pull request #4299 from thaJeztah/24.0_backport_drop_the_dot ... [24.0 backport] docs/deprecated: remove .patch release from deprecation status	2023-05-18 22:47:36 +01:00
Sebastiaan van Stijn	e67a7acd06	docs/deprecated: remove .patch release from deprecation status ... commit de8b696ed6 removed the patch releases from the deprecation doc, but when we switched to the SemVer(ish) format for v23.0, we accidentally added them back. Signed-off-by: Sebastiaan van Stijn <github@gone.nl> (cherry picked from commit 6460eea54d) Signed-off-by: Sebastiaan van Stijn <github@gone.nl>	2023-05-18 22:49:56 +02:00
Sebastiaan van Stijn	98fdcd769b	Merge pull request #4287 from thaJeztah/24.0_update_engine2 ... [24.0] vendor: github.com/docker/docker v24.0.0-rc.3 v24.0.0 v24.0.0-rc.4	2023-05-12 15:10:05 +01:00
Sebastiaan van Stijn	fb6ae356c7	vendor: github.com/docker/docker v24.0.0-rc.3 ... no changes in vendored files full diff: https://github.com/docker/docker/compare/v24.0.0-rc.2...v24.0.0-rc.3 Signed-off-by: Sebastiaan van Stijn <github@gone.nl>	2023-05-12 00:03:10 +02:00
Sebastiaan van Stijn	1d7dd91593	Merge pull request #4286 from thaJeztah/24.0_backport_vendor_distribution_v2.8.2 ... [24.0 backport] vendor: github.com/docker/distribution v2.8.2 v24.0.0-rc.3	2023-05-11 19:49:59 +02:00
Sebastiaan van Stijn	de93c9b260	vendor: github.com/docker/distribution v2.8.2 ... CI - Dockerfile: fix filenames of artifacts Bugfixes - Fix panic in inmemory driver - Add code to handle pagination of parts. Fixes max layer size of 10GB bug - Parse http forbidden as denied - Revert "registry/client: set Accept: identity header when getting layers Runtime - Update to go1.19.9 - Dockerfile: update xx to v1.2.1 ([#3907](https://github.com/distribution/distribution/pull/3907)) Security - Fix [CVE-2022-28391](https://www.cve.org/CVERecord?id=CVE-2022-28391) by bumping alpine from 3.14 to 3.16 - Fix [CVE-2023-2253](https://www.cve.org/CVERecord?id=CVE-2023-2253) runaway allocation on /v2/_catalog [`521ea3d9`](521ea3d973) full diff: https://github.com/docker/distribution/compare/v2.8.1...v2.8.2-beta.2 Signed-off-by: Sebastiaan van Stijn <github@gone.nl> (cherry picked from commit 353e0a942d) Signed-off-by: Sebastiaan van Stijn <github@gone.nl>	2023-05-11 19:16:03 +02:00
Sebastiaan van Stijn	75f2669d56	Merge pull request #4277 from thaJeztah/24.0_backport_fix_cli_plugins_metadata_experimental_deprecation ... [24.0 backport] cli-plugins/manager: fix deprecation comment of Metadata.Experimental	2023-05-11 16:42:02 +02:00
Sebastiaan van Stijn	46615e8724	Merge pull request #4275 from thaJeztah/24.0_backport_update_tag_documentation ... [24.0 backport] Update tag docs to clarify name	2023-05-10 21:14:31 +02:00
Sebastiaan van Stijn	cafdcf283e	cli-plugins/manager: fix deprecation comment of Metadata.Experimental ... This field was marked deprecated in 977d3ae046, which is part of v20.10 and up, but the comment was missing a newline before the deprecation message, which may be picked up by IDEs, but is not matching the correct format, so may not be picked up by linters. This patch fixes the format, to make sure linters pick up that the field is deprecated. Signed-off-by: Sebastiaan van Stijn <github@gone.nl> (cherry picked from commit 72e3813ab9) Signed-off-by: Sebastiaan van Stijn <github@gone.nl>	2023-05-09 22:23:10 +02:00
Craig Osterhout	3768143c2e	Update tag docs to clarify name ... Signed-off-by: Craig Osterhout <craig.osterhout@docker.com> (cherry picked from commit 4119d268e7) Signed-off-by: Sebastiaan van Stijn <github@gone.nl>	2023-05-09 22:08:47 +02:00
Sebastiaan van Stijn	59e9fbd497	Merge pull request #4271 from dvdksn/24.0_backport_docs/host-flag ... [24.0 Backport] docs: add description and examples for docker -H	2023-05-08 15:33:22 +02:00
David Karlsson	52ac1a974c	docs: update description for docker -H flag ... Signed-off-by: David Karlsson <david.karlsson@docker.com> (cherry picked from commit 759fa585cf) Signed-off-by: David Karlsson <david.karlsson@docker.com>	2023-05-08 15:16:07 +02:00
Sebastiaan van Stijn	f25ae85b8e	Merge pull request #4264 from thaJeztah/24.0_backport_vendor_docker_24.0.0-rc.2 ... [24.0 backport] vendor: github.com/docker/docker v24.0.0-rc.2	2023-05-08 08:56:26 +02:00
Sebastiaan van Stijn	58f37f630c	vendor: github.com/docker/docker v24.0.0-rc.2 ... no diff, because it's the same as the previous commit, but now tagged; 8d9a40a820...v24.0.0-rc.2 Signed-off-by: Sebastiaan van Stijn <github@gone.nl> (cherry picked from commit 1d8e2b6525) Signed-off-by: Sebastiaan van Stijn <github@gone.nl>	2023-05-06 13:55:17 +02:00
Sebastiaan van Stijn	8fc956ce77	Merge pull request #4244 from thaJeztah/update_engine_next ... vendor: github.com/docker/docker github.com/docker/docker v24.0.0-rc.1.0.20230505222407-8d9a40a82034 (v24.0.0-rc.2) v24.0.0-rc.2	2023-05-06 01:32:38 +02:00
Brian Goff	f4201b9302	Merge pull request #4073 from panekj/feat/ssh-socket-path ... connhelper: Allow socket path when using SSH	2023-05-05 15:50:18 -07:00
Sebastiaan van Stijn	9f15ba0d13	Merge pull request #4156 from AkihiroSuda/docker-run-annotation ... cli/command/container: implement `docker run --annotation`	2023-05-06 00:49:15 +02:00
Sebastiaan van Stijn	4f97f55999	vendor: github.com/docker/docker v24.0.0-rc.1.0.20230505222407-8d9a40a82034 ... This will be v24.0.0-rc.2 full diff: https://github.com/docker/docker/compare/v24.0.0-rc.1...8d9a40a820349860405e142249c55215aa4da8e3 Signed-off-by: Sebastiaan van Stijn <github@gone.nl>	2023-05-06 00:34:34 +02:00
Sebastiaan van Stijn	0428418d6b	vendor: github.com/containerd/containerd v1.6.21 ... no changes in vendored files full diff: https://github.com/containerd/containerd/compare/v1.6.20...v1.6.21 Signed-off-by: Sebastiaan van Stijn <github@gone.nl>	2023-05-06 00:30:50 +02:00
Sebastiaan van Stijn	05bf6fff2e	vendor: github.com/opencontainers/runc v1.1.7 ... full diff: https://github.com/opencontainers/runc/compare/v1.1.6...v1.1.7 Signed-off-by: Sebastiaan van Stijn <github@gone.nl>	2023-05-06 00:27:51 +02:00
Sebastiaan van Stijn	b403a49207	Merge pull request #4251 from thaJeztah/update_runewidth ... vendor: github.com/mattn/go-runewidth v0.0.14	2023-05-05 10:25:04 +02:00
Sebastiaan van Stijn	44fce07069	vendor: github.com/mattn/go-runewidth v0.0.14 ... Contains various performance optimisations. full diff: https://github.com/mattn/go-runewidth/compare/v0.0.13...v0.0.14 Signed-off-by: Sebastiaan van Stijn <github@gone.nl>	2023-05-05 02:37:12 +02:00
Sebastiaan van Stijn	f7600fb539	Merge pull request #4253 from thaJeztah/update_go1.20.4 ... update go to go1.20.4	2023-05-04 12:51:12 +02:00
Sebastiaan van Stijn	fd0621d0fe	update go to go1.20.4 ... go1.20.4 (released 2023-05-02) includes three security fixes to the html/template package, as well as bug fixes to the compiler, the runtime, and the crypto/subtle, crypto/tls, net/http, and syscall packages. See the Go 1.20.4 milestone on our issue tracker for details: https://github.com/golang/go/issues?q=milestone%3AGo1.20.4+label%3ACherryPickApproved release notes: https://go.dev/doc/devel/release#go1.20.4 full diff: https://github.com/golang/go/compare/go1.20.3...go1.20.4 from the announcement: > These minor releases include 3 security fixes following the security policy: > > - html/template: improper sanitization of CSS values > > Angle brackets (`<>`) were not considered dangerous characters when inserted > into CSS contexts. Templates containing multiple actions separated by a '/' > character could result in unexpectedly closing the CSS context and allowing > for injection of unexpected HMTL, if executed with untrusted input. > > Thanks to Juho Nurminen of Mattermost for reporting this issue. > > This is CVE-2023-24539 and Go issue https://go.dev/issue/59720. > > - html/template: improper handling of JavaScript whitespace > > Not all valid JavaScript whitespace characters were considered to be > whitespace. Templates containing whitespace characters outside of the character > set "\t\n\f\r\u0020\u2028\u2029" in JavaScript contexts that also contain > actions may not be properly sanitized during execution. > > Thanks to Juho Nurminen of Mattermost for reporting this issue. > > This is CVE-2023-24540 and Go issue https://go.dev/issue/59721. > > - html/template: improper handling of empty HTML attributes > > Templates containing actions in unquoted HTML attributes (e.g. "attr={{.}}") > executed with empty input could result in output that would have unexpected > results when parsed due to HTML normalization rules. This may allow injection > of arbitrary attributes into tags. > > Thanks to Juho Nurminen of Mattermost for reporting this issue. > > This is CVE-2023-29400 and Go issue https://go.dev/issue/59722. Signed-off-by: Sebastiaan van Stijn <github@gone.nl>	2023-05-03 20:59:02 +02:00
Sebastiaan van Stijn	054343be38	Merge pull request #4181 from thaJeztah/pass_streams_not_cli ... cli/command/system: add utilities for printing, don't pass CLI if not needed	2023-05-03 16:43:21 +02:00
Sebastiaan van Stijn	7d72214202	Merge pull request #4248 from thaJeztah/update_moby_term ... vendor: github.com/moby/term v0.5.0	2023-05-03 16:13:52 +02:00
Sebastiaan van Stijn	155f7d9e2b	cli/command/system: add utilities for printing ... Adding some utilities to print the output, to keep the linters happier without having to either suppress errors, or ignore them. Perhaps we should consider adding utilities for this on the "command.Streams" outputs. Signed-off-by: Sebastiaan van Stijn <github@gone.nl>	2023-05-02 16:55:12 +02:00
Sebastiaan van Stijn	1e89037d72	cli/command/system: prettyInfo: accept Streams ... No need to pass whole of DockerCLI, as all it needs is the outputs. Signed-off-by: Sebastiaan van Stijn <github@gone.nl>	2023-05-02 16:54:05 +02:00
Sebastiaan van Stijn	8cfefc6ea2	cli/command/system: prettyPrintServerInfo: accept Streams ... No need to pass whole of DockerCLI, as all it needs is the outputs. Signed-off-by: Sebastiaan van Stijn <github@gone.nl>	2023-05-02 16:51:32 +02:00
Sebastiaan van Stijn	ba7a200f0a	cli/command/system: prettyPrintClientInfo: accept Streams ... No need to pass whole of DockerCLI, as all it needs is the outputs. Signed-off-by: Sebastiaan van Stijn <github@gone.nl>	2023-05-02 16:50:54 +02:00
Sebastiaan van Stijn	73938cd618	cli/command/system: printSwarmInfo(): accept io.Writer ... Don't require whole of DockerCLI to be passed, as all we need is a writer. Signed-off-by: Sebastiaan van Stijn <github@gone.nl>	2023-05-02 16:50:29 +02:00
Sebastiaan van Stijn	2d0ea86b0a	cli/command/system: use io.Writer for printing warnings ... Don't require whole of DockerCLI to be passed, as all we need is a writer. Signed-off-by: Sebastiaan van Stijn <github@gone.nl>	2023-05-02 16:17:00 +02:00
Sebastiaan van Stijn	be6f4cd56c	cli/command/system: prettyPrintServerInfo: refactor printing "runtimes" ... Signed-off-by: Sebastiaan van Stijn <github@gone.nl>	2023-05-02 16:05:52 +02:00
Sebastiaan van Stijn	1d70f7cdb4	cli/command/system: prettyPrintServerInfo: rename var that collided with import ... Signed-off-by: Sebastiaan van Stijn <github@gone.nl>	2023-05-02 16:01:46 +02:00
Sebastiaan van Stijn	416e55bedb	github.com/docker/cli/cli/command/system: add BenchmarkPrettyPrintInfo ... goos: linux goarch: arm64 pkg: github.com/docker/cli/cli/command/system BenchmarkPrettyPrintInfo BenchmarkPrettyPrintInfo-5 189028 6156 ns/op 1776 B/op 88 allocs/op Signed-off-by: Sebastiaan van Stijn <github@gone.nl>	2023-05-02 15:49:16 +02:00
Sebastiaan van Stijn	f233becf91	vendor: github.com/moby/term v0.5.0 ... - split exported functions from implementation - windows: IsConsole(): fix deprecation comment - deprecate Termios in favor of unix.Termios - windows: keyToString(): fix string conversion - gha: update actions, add macOS, and add Go1.20 - gha: add windows full diff: https://github.com/moby/term/compare/c43b287e0e0f...v0.5.0 Signed-off-by: Sebastiaan van Stijn <github@gone.nl>	2023-05-02 14:22:36 +02:00
Sebastiaan van Stijn	afd320c5ab	Merge pull request #4236 from thaJeztah/update_engine ... vendor: github.com/docker/docker v24.0.0-rc.1	2023-05-02 11:06:54 +02:00