fd4d39aa88
Merge pull request #4920 from vvoland/vendor-docker
...
[25.0] vendor: github.com/docker/docker 9e526bc3943c
2024-03-05 22:25:25 +01:00
b4b35dedc6
Merge pull request #4919 from vvoland/v25.0-4918
...
[25.0 backport] update to go1.21.8
2024-03-05 22:24:46 +01:00
ce113a74af
vendor: github.com/docker/docker 9e526bc3943c
...
no change in vendored files
full diff: 51e876cd96...9e526bc394
2024-03-05 22:15:37 +01:00
a3b6c9ea7e
update to go1.21.8
...
go1.21.8 (released 2024-03-05) includes 5 security fixes:
- crypto/x509: Verify panics on certificates with an unknown public key algorithm (CVE-2024-24783, https://go.dev/issue/65390 )
- net/http: memory exhaustion in Request.ParseMultipartForm (CVE-2023-45290, https://go.dev/issue/65383 )
- net/http, net/http/cookiejar: incorrect forwarding of sensitive headers and cookies on HTTP redirect (CVE-2023-45289, https://go.dev/issue/65065 )
- html/template: errors returned from MarshalJSON methods may break template escaping (CVE-2024-24785, https://go.dev/issue/65697 )
- net/mail: comments in display names are incorrectly handled (CVE-2024-24784, https://go.dev/issue/65083 )
View the release notes for more information:
https://go.dev/doc/devel/release#go1.21.8
- https://github.com/golang/go/issues?q=milestone%3AGo1.21.8+label%3ACherryPickApproved
- full diff: https://github.com/golang/go/compare/go1.21.6...go1.21.8
Signed-off-by: Paweł Gronowski <pawel.gronowski@docker.com>
(cherry picked from commit 3b77477943
2024-03-05 22:09:26 +01:00
2bf4225ad2
Merge pull request #4908 from vvoland/vendor-docker
...
[25.0] vendor: github.com/docker/docker 25.0.4-51e876cd964c4bb1f0a7c1bc24ecab9321b3ff1c
2024-03-05 17:13:10 +01:00
f783e8d58a
Merge pull request #4915 from vvoland/v25.0-4839
...
[25.0 backport] update CI
2024-03-05 13:01:56 +01:00
956d15c723
Cleanup of dockerfiles, compose files and env vars
...
Signed-off-by: Christopher Petito <chrisjpetito@gmail.com>
(cherry picked from commit 69ed6588a8
2024-03-05 09:56:21 +01:00
5a942fadcf
Update gha runners and engines used in e2e tests
...
- gha runners updated to ubuntu 22.04
- e2e now runs against moby 23.0, 24.0 and 25.0
- temporarily skip broken test for moby < 25
Signed-off-by: Christopher Petito <chrisjpetito@gmail.com>
(cherry picked from commit 6b67b95493
2024-03-05 09:56:19 +01:00
592c146cca
testenv: Add DaemonAPIVersion helper
...
Allow tests to check the negotiated API version used by the client.
Can be used to skip tests based on API versions, for example:
```go
skip.If(t, versions.LessThan(environment.DaemonAPIVersion(t), "1.44"))
```
will skip the test if the API version is older than 1.44
Signed-off-by: Paweł Gronowski <pawel.gronowski@docker.com>
(cherry picked from commit 9831fea4db
2024-03-05 09:56:16 +01:00
0735e78cc9
vendor: github.com/docker/docker 25.0.4-51e876cd96
...
full diff: https://github.com/docker/docker/compare/v25.0.3...51e876cd964c4bb1f0a7c1bc24ecab9321b3ff1c
Signed-off-by: Paweł Gronowski <pawel.gronowski@docker.com>
2024-03-04 12:58:21 +01:00
63a3db4b31
Merge pull request #4914 from vvoland/v25.0-4831
...
[25.0 backport] Dockerfile: update docker compose to v2.24.3
2024-03-04 12:50:24 +01:00
0b9bf6a6f4
Merge pull request #4913 from vvoland/v25-4867
...
[25.0 backport] Test fixes needed for upgrading ci runners and engine
2024-03-04 12:49:50 +01:00
e0dab5ce1e
Dockerfile: update docker compose to v2.24.3
...
Update the version of compose used in CI to the latest version.
- full diff: https://github.com/docker/compose/compare/v2.24.2...v2.24.3
- release notes: https://github.com/docker/compose/releases/tag/v2.24.2
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
(cherry picked from commit 53e2e54c29
2024-03-04 12:32:16 +01:00
b59204cc43
Merge pull request #4912 from vvoland/v25-4881
...
[25.0 backport] update to go1.21.7
2024-03-04 12:20:28 +01:00
b8459ce351
Merge pull request #4911 from vvoland/v25-4876
...
[25.0 backport] Fixed typo in bash completion functions
2024-03-04 12:19:52 +01:00
a25a9100f3
Minor test fixes necessary for eventually upgrading ci runners and engine version
...
Signed-off-by: Christopher Petito <chrisjpetito@gmail.com>
(cherry picked from commit 30dd7c1319
2024-03-04 12:19:36 +01:00
eb223e7eaf
Merge pull request #4910 from vvoland/v25-4860
...
[25.0 backport] docker stack: allow '=' separator in extra_hosts
2024-03-04 12:19:04 +01:00
c87c4c96ec
update to go1.21.7
...
go1.21.7 (released 2024-02-06) includes fixes to the compiler, the go command,
the runtime, and the crypto/x509 package. See the Go 1.21.7 milestone on our
issue tracker for details:
- https://github.com/golang/go/issues?q=milestone%3AGo1.21.7+label%3ACherryPickApproved
- full diff: https://github.com/golang/go/compare/go1.21.6...go1.21.7
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
(cherry picked from commit 20b9d489e0
2024-03-04 12:15:36 +01:00
c270556d44
Fixed typo in bash completion functions
...
Signed-off-by: David le Blanc <david-le-blanc@users.noreply.github.com>
(cherry picked from commit c514003e69
2024-03-04 12:12:55 +01:00
98f603bdd1
Merge pull request #4909 from vvoland/v25-4862
...
[25.0 backport] Avoid keeping @docker_cli_[UUID] files
2024-03-04 11:55:42 +01:00
1cddb2b03d
docker stack: allow '=' separator in extra_hosts
...
extra_hosts in the compose file format allows '=' as a separator, and brackets
around IP addresses, the engine API doesn't.
So, transform the values when reading a compose file for 'docker stack'.
Signed-off-by: Rob Murray <rob.murray@docker.com>
(cherry picked from commit c986d09bca
2024-03-04 11:55:30 +01:00
8715d9a33a
Avoid keeping @docker_cli_[UUID] files
...
Seems that OpenBSD behaves like darwin and requires to unlink all
socket, after it was used.
Tested on OpenBSD 7.4
Signed-off-by: Kirill A. Korinsky <kirill@korins.ky>
(cherry picked from commit 2c214241fa
2024-03-04 11:34:38 +01:00
a5937c6043
Merge pull request #4885 from thaJeztah/25.0_backport_regenerate_mdddocs
...
[25.0 backport] docs: regenerate markdown
2024-02-21 11:58:13 +01:00
9142b58351
docs: regenerate markdown
...
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
(cherry picked from commit f2e98f9a93
2024-02-21 11:34:20 +01:00
f67e569a8f
Merge pull request #4883 from dvdksn/backport_docs_cli_reference_urlscheme
...
[25.0 backport] docs: update link targets
2024-02-21 09:32:16 +01:00
08eba2246c
docs: update url scheme for reference docs
...
Signed-off-by: David Karlsson <35727626+dvdksn@users.noreply.github.com>
(cherry picked from commit caf72655fb
2024-02-21 09:22:08 +01:00
4fd2cf5f2d
deps: update cli-docs-tool version (v0.7.0)
...
Signed-off-by: David Karlsson <35727626+dvdksn@users.noreply.github.com>
(cherry picked from commit e244044944
2024-02-21 09:22:04 +01:00
bdfe1645f5
Merge pull request #4858 from thaJeztah/25.0_vendor_docker_25.0.3
...
[25.0] vendor: github.com/docker/docker v25.0.3
2024-02-07 10:47:40 +01:00
e456704864
vendor: github.com/docker/docker v25.0.3
...
full diff: https://github.com/docker/docker/compare/v25.0.2...v25.0.3
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2024-02-07 02:20:23 +01:00
4debf411d1
Merge pull request #4857 from thaJeztah/25.0_backport_codecov-action-4
...
[25.0 backport] build(deps): Bump codecov/codecov-action from 3 to 4
2024-02-06 21:42:40 +01:00
5e6ce1bde1
Merge pull request #4856 from thaJeztah/25.0_backport_plugin-socket-tests
...
[25.0 backport] Add tests for CLI/plugin communication
2024-02-06 21:42:20 +01:00
5428301e3f
build(deps): Bump codecov/codecov-action from 3 to 4
...
Bumps [codecov/codecov-action](https://github.com/codecov/codecov-action ) from 3 to 4.
- [Release notes](https://github.com/codecov/codecov-action/releases )
- [Changelog](https://github.com/codecov/codecov-action/blob/main/CHANGELOG.md )
- [Commits](https://github.com/codecov/codecov-action/compare/v3...v4 )
---
updated-dependencies:
- dependency-name: codecov/codecov-action
dependency-type: direct:production
update-type: version-update:semver-major
...
Signed-off-by: dependabot[bot] <support@github.com>
(cherry picked from commit b123ce6526
2024-02-06 21:35:08 +01:00
1cbc218c05
tests: add plugin-socket-compatibility tests
...
Adds a new plugin to the e2e plugins that simulates an older
plugin binary and a test suite to ensure older plugin binaries
keep behaving the same with newer CLI versions.
Signed-off-by: Laura Brehm <laurabrehm@hey.com>
(cherry picked from commit cfa9fef77d
2024-02-06 21:31:55 +01:00
2f6b5ada71
scripts: don't hardcode architecture in e2e script
...
Signed-off-by: Laura Brehm <laurabrehm@hey.com>
(cherry picked from commit 1c4d6d85dd
2024-02-06 21:31:55 +01:00
d8e07c9c47
tests: add tests for `cli-plugins/socket`
...
Signed-off-by: Laura Brehm <laurabrehm@hey.com>
(cherry picked from commit 469bfc05ed
2024-02-06 21:31:52 +01:00
5f1b610fc3
Merge pull request #4841 from thaJeztah/25.0_vendor_docker_25.0.2
...
[25.0] vendor: github.com/docker/docker v25.0.2
2024-02-01 16:32:18 +01:00
c105cd3ac2
Merge pull request #4837 from dvdksn/25.0_docs_backport_linode_volume_plugin
...
[25.0 Backport] docs: Add Linode docker volume plugin #4396
2024-02-01 04:15:42 +01:00
62b2963b80
vendor: github.com/docker/docker v25.0.2
...
no changes in vendored code
full diff: https://github.com/docker/docker/compare/v25.0.1...v25.0.2
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2024-02-01 04:12:31 +01:00
71f2b0d109
vendor: github.com/docker/docker v25.0.1
...
relevant changes:
- Fix isGitURL regular expression
- pkg/system: return even richer xattr errors
full diff: https://github.com/moby/moby/compare/v25.0.0...v25.0.1
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
(cherry picked from commit 4b1ed1f442
2024-02-01 04:11:47 +01:00
617bc98c8d
Add Linode docker volume plugin
...
Signed-off-by: Zhiwei Liang <zliang@akamai.com>
(cherry picked from commit 1f9573bb05
2024-01-31 13:06:53 +01:00
29cf629222
Merge pull request #4819 from dvdksn/25.0_backport_docs_host-gateway-ip_daemonjson
...
[25.0 backport] docs: update host-gateway-ip to use daemon.json instead of cli flag
2024-01-23 16:11:10 +01:00
4caf4de039
docs: update host-gateway-ip to use daemon.json instead of cli flag
...
Signed-off-by: David Karlsson <35727626+dvdksn@users.noreply.github.com>
(cherry picked from commit ec0a62436e
2024-01-23 16:04:58 +01:00
950ecd42fd
Merge pull request #4815 from thaJeztah/25.0_backport_update_compose
...
[25.0 backport] Dockerfile: update docker compose to v2.24.2
2024-01-23 11:04:43 +01:00
6ab4781bd0
Dockerfile: update docker compose to v2.24.2
...
Update the version of compose used in CI to the latest version.
- full diff: docker/compose@v2.24.0...v2.24.2
- release notes: https://github.com/docker/compose/releases/tag/v2.24.1
- release notes: https://github.com/docker/compose/releases/tag/v2.24.2
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
(cherry picked from commit 091af560ca
2024-01-23 10:34:14 +01:00
e8852e8ed2
Merge pull request #4806 from thaJeztah/25.0_backport_socket-eof-return
...
[25.0 backport] socket: return from loop after EOF
2024-01-22 14:10:02 +01:00
4e097c643d
socket: return from loop after EOF
...
Signed-off-by: Tonis Tiigi <tonistiigi@gmail.com>
(cherry picked from commit 8cd3b00420
2024-01-20 13:45:39 +01:00
01f9332618
Merge pull request #4803 from thaJeztah/25.0_backport_update_engine
...
[25.0 backport] vendor: github.com/docker/docker v25.0.0
2024-01-19 15:31:35 +01:00
4cd8d5cf47
Merge pull request #4804 from dvdksn/backport_25.0_docs_fix_cli_broken_alias_links
...
[25.0 backport] docs: fix broken links to alias pages
2024-01-19 15:18:55 +01:00
21c12847bf
docs: move base command to docker.md
...
CLI reference for the base command was generated to cli.md
Changed it to docker.md to handle broken links.
Signed-off-by: David Karlsson <35727626+dvdksn@users.noreply.github.com>
(cherry picked from commit d633890f91
2024-01-19 15:09:15 +01:00
22e1f2cbfa
docs: fix broken links to alias pages
...
Alias pages redirect to the canonical names, but these pages still
linked to the aliases, causing broken links when building the docs site.
Signed-off-by: David Karlsson <35727626+dvdksn@users.noreply.github.com>
(cherry picked from commit aff4649cb7
2024-01-19 15:09:07 +01:00
Sebastiaan van Stijn
Paweł Gronowski
Christopher Petito
Sebastiaan van Stijn
David le Blanc
Rob Murray
Kirill A. Korinsky
David Karlsson
dependabot[bot]
Laura Brehm
Zhiwei Liang
Tonis Tiigi