e85edf8556
Merge pull request #5452 from laurazard/27.3.0-match-moby-version
...
build / plugins (push) Has been cancelled
codeql / codeql (push) Has been cancelled
e2e / e2e (alpine, 23, connhelper-ssh) (push) Has been cancelled
e2e / e2e (alpine, 23, experimental) (push) Has been cancelled
e2e / e2e (alpine, 23, non-experimental) (push) Has been cancelled
e2e / e2e (alpine, 26.1, connhelper-ssh) (push) Has been cancelled
e2e / e2e (alpine, 26.1, experimental) (push) Has been cancelled
e2e / e2e (alpine, 26.1, non-experimental) (push) Has been cancelled
e2e / e2e (alpine, 27, connhelper-ssh) (push) Has been cancelled
e2e / e2e (alpine, 27, experimental) (push) Has been cancelled
e2e / e2e (alpine, 27, non-experimental) (push) Has been cancelled
e2e / e2e (debian, 23, connhelper-ssh) (push) Has been cancelled
e2e / e2e (debian, 23, experimental) (push) Has been cancelled
e2e / e2e (debian, 23, non-experimental) (push) Has been cancelled
e2e / e2e (debian, 26.1, connhelper-ssh) (push) Has been cancelled
e2e / e2e (debian, 26.1, experimental) (push) Has been cancelled
e2e / e2e (debian, 26.1, non-experimental) (push) Has been cancelled
e2e / e2e (debian, 27, connhelper-ssh) (push) Has been cancelled
e2e / e2e (debian, 27, experimental) (push) Has been cancelled
e2e / e2e (debian, 27, non-experimental) (push) Has been cancelled
test / ctn (push) Has been cancelled
test / host (macos-13) (push) Has been cancelled
test / host (macos-14) (push) Has been cancelled
validate / validate (lint) (push) Has been cancelled
validate / validate (shellcheck) (push) Has been cancelled
validate / validate (update-authors) (push) Has been cancelled
validate / validate (validate-vendor) (push) Has been cancelled
validate / validate-md (push) Has been cancelled
validate / validate-make (manpages) (push) Has been cancelled
validate / validate-make (yamldocs) (push) Has been cancelled
[27.x] vendor: github.com/docker/docker v27.3.0-rc2
v27.3.0
2024-09-18 17:59:19 +02:00
ca62759b0f
vendor: github.com/docker/docker v27.3.0-rc2
...
No vendor changes, just using tag.
Signed-off-by: Laura Brehm <laurabrehm@hey.com >
2024-09-18 16:30:22 +01:00
e4dc9d2ac7
Merge pull request #5448 from laurazard/backport-otel-shutdown-errors
...
build / plugins (push) Has been cancelled
codeql / codeql (push) Has been cancelled
e2e / e2e (alpine, 23, connhelper-ssh) (push) Has been cancelled
e2e / e2e (alpine, 23, experimental) (push) Has been cancelled
e2e / e2e (alpine, 23, non-experimental) (push) Has been cancelled
e2e / e2e (alpine, 26.1, connhelper-ssh) (push) Has been cancelled
e2e / e2e (alpine, 26.1, experimental) (push) Has been cancelled
e2e / e2e (alpine, 26.1, non-experimental) (push) Has been cancelled
e2e / e2e (alpine, 27, connhelper-ssh) (push) Has been cancelled
e2e / e2e (alpine, 27, experimental) (push) Has been cancelled
e2e / e2e (alpine, 27, non-experimental) (push) Has been cancelled
e2e / e2e (debian, 23, connhelper-ssh) (push) Has been cancelled
e2e / e2e (debian, 23, experimental) (push) Has been cancelled
e2e / e2e (debian, 23, non-experimental) (push) Has been cancelled
e2e / e2e (debian, 26.1, connhelper-ssh) (push) Has been cancelled
e2e / e2e (debian, 26.1, experimental) (push) Has been cancelled
e2e / e2e (debian, 26.1, non-experimental) (push) Has been cancelled
e2e / e2e (debian, 27, connhelper-ssh) (push) Has been cancelled
e2e / e2e (debian, 27, experimental) (push) Has been cancelled
e2e / e2e (debian, 27, non-experimental) (push) Has been cancelled
test / ctn (push) Has been cancelled
test / host (macos-13) (push) Has been cancelled
test / host (macos-14) (push) Has been cancelled
validate / validate (lint) (push) Has been cancelled
validate / validate (shellcheck) (push) Has been cancelled
validate / validate (update-authors) (push) Has been cancelled
validate / validate (validate-vendor) (push) Has been cancelled
validate / validate-md (push) Has been cancelled
validate / validate-make (manpages) (push) Has been cancelled
validate / validate-make (yamldocs) (push) Has been cancelled
[27.x backport] telemetry: handle otel errors on shutdown
v27.3.0-rc.2
2024-09-18 12:20:40 +02:00
ddf8f23403
Merge pull request #5449 from laurazard/backport-lowercase-windows-drive
...
[27.x backport] command: change drive to lowercase for wsl path
2024-09-18 12:16:32 +02:00
c6dde25470
command: change drive to lowercase for wsl path
...
On Windows, the drive casing doesn't matter outside of WSL. For WSL, the
drives are lowercase. When we're producing a WSL path, lowercase the
drive letter.
Co-authored-by: Jonathan A. Sternberg <jonathan.sternberg@docker.com >
Co-authored-by: Laura Brehm <laurabrehm@hey.com >
Signed-off-by: Jonathan A. Sternberg <jonathan.sternberg@docker.com >
Signed-off-by: Laura Brehm <laurabrehm@hey.com >
(cherry picked from commit 3472bbc28a )
Signed-off-by: Laura Brehm <laurabrehm@hey.com >
2024-09-18 11:05:51 +01:00
fcf6dd05df
Merge pull request #5447 from thaJeztah/27.x_backport_codeql_updates
...
[27.x backport] gha: update codeql workflow to go1.22.7
2024-09-18 11:04:09 +01:00
4b5a196fee
telemetry: pass otel errors to the otel handler for shutdown and force flush
...
Signed-off-by: Jonathan A. Sternberg <jonathan.sternberg@docker.com >
(cherry picked from commit b1956f5073 )
Signed-off-by: Laura Brehm <laurabrehm@hey.com >
2024-09-18 10:43:32 +01:00
e2eb069aed
gha: update codeql workflow to go1.22.7
...
commit d7d56599ca updated this
repository to go1.22, but the codeql action didn't specify a
patch version, and was missed.
Signed-off-by: Sebastiaan van Stijn <github@gone.nl >
(cherry picked from commit e1213edcc6 )
Signed-off-by: Sebastiaan van Stijn <github@gone.nl >
2024-09-17 21:58:05 +02:00
58a14cc379
Merge pull request #5443 from laurazard/backport-container-rm-docs
...
[27.x backport] docs: Fix --rm=false flag in container_run.md
2024-09-16 14:49:01 +01:00
81ca58bd20
docs: Fix --rm=false flag in container_run.md
...
Signed-off-by: Julio Cesar Garcia <juliogarciamelgarejo@gmail.com >
(cherry picked from commit 605c9bf160 )
Signed-off-by: Laura Brehm <laurabrehm@hey.com >
2024-09-16 14:31:37 +01:00
6b5e4be0cb
Merge pull request #5442 from thaJeztah/27.x_backport_bump_buildx_compose
...
[27.x backport] Dockerfile: update buildx to v0.17.1, compose to v2.29.4
2024-09-16 14:27:43 +01:00
b5c6541769
Dockerfile: update compose to v2.29.4
...
Update the compose cli plugin used in the dev-container
full diff: https://github.com/docker/compose/compare/v2.29.0...v2.29.4
Signed-off-by: Sebastiaan van Stijn <github@gone.nl >
(cherry picked from commit f7a513cff0 )
Signed-off-by: Sebastiaan van Stijn <github@gone.nl >
2024-09-16 15:05:04 +02:00
6fdd11b012
Dockerfile: update buildx to v0.17.1
...
Update the buildx cli plugin used in the dev-container
full diff: https://github.com/docker/buildx/compare/0.16.1...0.17.1
Signed-off-by: Sebastiaan van Stijn <github@gone.nl >
(cherry picked from commit 42ce06aa5b )
Signed-off-by: Sebastiaan van Stijn <github@gone.nl >
2024-09-16 15:05:04 +02:00
6bf64a88af
Merge pull request #5440 from thaJeztah/27.x_vendor_moby
...
[27.x] vendor: github.com/docker/docker v27.3.0-rc.1
2024-09-16 13:41:37 +01:00
d896559894
vendor: github.com/docker/docker v27.3.0-rc.1
...
no diff, as it's the same commit, but tagged
full diff: https://github.com/docker/docker/compare/bf60e5cced83...v27.3.0-rc.1
Signed-off-by: Sebastiaan van Stijn <github@gone.nl >
2024-09-16 14:28:09 +02:00
f350724e21
Merge pull request #5439 from thaJeztah/27.x_backport_docs_updates
...
[27.x backport] docs, man: dockerd: add documentation for "--log-format" and "--feature" options
2024-09-16 14:24:39 +02:00
84d4a5ef11
docs: dockerd: add documentation for --log-format option
...
Signed-off-by: Sebastiaan van Stijn <github@gone.nl >
(cherry picked from commit baceb4b158 )
Signed-off-by: Sebastiaan van Stijn <github@gone.nl >
2024-09-16 13:55:17 +02:00
7c72283b37
man: dockerd: add description for --log-format option
...
This option was added in a08abec9f8d59eaa44c375900e254384a68c5a31,
as part of Docker v25.0, but did not update the docs and manpage.
Signed-off-by: Sebastiaan van Stijn <github@gone.nl >
(cherry picked from commit 9ae514fdc7 )
Signed-off-by: Sebastiaan van Stijn <github@gone.nl >
2024-09-16 13:55:17 +02:00
245f79ff57
docs/reference: dockerd: add docs for --feature option
...
Signed-off-by: Sebastiaan van Stijn <github@gone.nl >
(cherry picked from commit a42ca1148d )
Signed-off-by: Sebastiaan van Stijn <github@gone.nl >
2024-09-16 13:55:03 +02:00
db7a014d37
man: dockerd: value is optional for --feature flag
...
The --feature flag allows the boolean value to be omitted.
If only a name is provided, the default is "true".
Signed-off-by: Sebastiaan van Stijn <github@gone.nl >
(cherry picked from commit a357db0aba )
Signed-off-by: Sebastiaan van Stijn <github@gone.nl >
2024-09-16 13:55:03 +02:00
bc87ef962a
man: fix duplicate word in --feature flag description
...
Signed-off-by: Sebastiaan van Stijn <github@gone.nl >
(cherry picked from commit fb056d2ceb )
Signed-off-by: Sebastiaan van Stijn <github@gone.nl >
2024-09-16 13:55:03 +02:00
7811c442d6
man: update dockerd man-page to include --feature flag
...
commit f13c08246d93dd5aae200d5881a3a374e6cac876 introduced
this flag, but did not yet update the manpage.
Signed-off-by: Sebastiaan van Stijn <github@gone.nl >
(cherry picked from commit 610f9157f5 )
Signed-off-by: Sebastiaan van Stijn <github@gone.nl >
2024-09-16 13:55:00 +02:00
48a2cdff97
Merge pull request #5432 from thaJeztah/27.x_backport_wsl-socket-path
...
build / plugins (push) Has been cancelled
codeql / codeql (push) Has been cancelled
e2e / e2e (alpine, 23, connhelper-ssh) (push) Has been cancelled
e2e / e2e (alpine, 23, experimental) (push) Has been cancelled
e2e / e2e (alpine, 23, non-experimental) (push) Has been cancelled
e2e / e2e (alpine, 26.1, connhelper-ssh) (push) Has been cancelled
e2e / e2e (alpine, 26.1, experimental) (push) Has been cancelled
e2e / e2e (alpine, 26.1, non-experimental) (push) Has been cancelled
e2e / e2e (alpine, 27, connhelper-ssh) (push) Has been cancelled
e2e / e2e (alpine, 27, experimental) (push) Has been cancelled
e2e / e2e (alpine, 27, non-experimental) (push) Has been cancelled
e2e / e2e (debian, 23, connhelper-ssh) (push) Has been cancelled
e2e / e2e (debian, 23, experimental) (push) Has been cancelled
e2e / e2e (debian, 23, non-experimental) (push) Has been cancelled
e2e / e2e (debian, 26.1, connhelper-ssh) (push) Has been cancelled
e2e / e2e (debian, 26.1, experimental) (push) Has been cancelled
e2e / e2e (debian, 26.1, non-experimental) (push) Has been cancelled
e2e / e2e (debian, 27, connhelper-ssh) (push) Has been cancelled
e2e / e2e (debian, 27, experimental) (push) Has been cancelled
e2e / e2e (debian, 27, non-experimental) (push) Has been cancelled
test / ctn (push) Has been cancelled
test / host (macos-13) (push) Has been cancelled
test / host (macos-14) (push) Has been cancelled
validate / validate (lint) (push) Has been cancelled
validate / validate (shellcheck) (push) Has been cancelled
validate / validate (update-authors) (push) Has been cancelled
validate / validate (validate-vendor) (push) Has been cancelled
validate / validate-md (push) Has been cancelled
validate / validate-make (manpages) (push) Has been cancelled
validate / validate-make (yamldocs) (push) Has been cancelled
[27.x backport] command: check for wsl mount path on windows
v27.3.0-rc.1
2024-09-13 10:54:31 +02:00
b48720e65e
command: check for wsl mount path on windows
...
This checks for the equivalent WSL mount path on windows. WSL will mount
the windows drives at `/mnt/c` (or whichever drive is being used).
This is done by parsing a UNC path with forward slashes from the unix
socket URL.
Signed-off-by: Jonathan A. Sternberg <jonathan.sternberg@docker.com >
(cherry picked from commit 38c3fef1a8 )
Signed-off-by: Sebastiaan van Stijn <github@gone.nl >
2024-09-13 00:35:37 +02:00
c85c3df6b5
Merge pull request #5431 from thaJeztah/27.x_bump_engine2
...
[27.x] vendor: github.com/docker/docker bf60e5cced83 (v27.3.0-dev)
2024-09-13 00:34:34 +02:00
74bebe2719
vendor: github.com/docker/docker bf60e5cced83 (v27.3.0-dev)
...
full diff: https://github.com/docker/docker/compare/v27.2.1...bf60e5cced830ee3034275c1792095fbfa40caf4
Signed-off-by: Sebastiaan van Stijn <github@gone.nl >
2024-09-13 00:21:52 +02:00
9748bef1c3
Merge pull request #5430 from thaJeztah/27.x_bump_engine_deps
...
[27.x backport] update dependencies for engine update
2024-09-13 00:21:32 +02:00
2fc18b9874
vendor: google.golang.org/grpc v1.62.0
...
Signed-off-by: Sebastiaan van Stijn <github@gone.nl >
(cherry picked from commit dccb8bfa5d )
Signed-off-by: Sebastiaan van Stijn <github@gone.nl >
2024-09-12 23:59:44 +02:00
1a199b63da
vendor: tags.cncf.io/container-device-interface v0.8.0
...
Breaking change: The .ToOCI() functions in the specs-go package have been
removed. This removes the dependency on the OCI runtime specification from
the CDI specification definition itself.
What's Changed
- Add workflow to mark prs and issues as stale
- Remove the ToOCI functions from the specs-go package
- docs: add a pointer to community meetings in our docs.
- Bump spec version to v0.8.0
- Update spec version in README
Full diff: https://github.com/cncf-tags/container-device-interface/compare/v0.7.2...v0.8.0
Signed-off-by: Sebastiaan van Stijn <github@gone.nl >
(cherry picked from commit 8cdf90cd93 )
Signed-off-by: Sebastiaan van Stijn <github@gone.nl >
2024-09-12 23:56:14 +02:00
968341cc7d
vendor: golang.org/x/net v0.28.0
...
full diff: https://github.com/golang/net/compare/v0.25.0...v0.28.0
Signed-off-by: Sebastiaan van Stijn <github@gone.nl >
(cherry picked from commit a5f15bee7a )
Signed-off-by: Sebastiaan van Stijn <github@gone.nl >
2024-09-12 23:56:14 +02:00
fbb0cfd86a
vendor: golang.org/x/crypto v0.26.0
...
full diff: https://github.com/golang/crypto/compare/v0.23.0...v0.26.0
Signed-off-by: Sebastiaan van Stijn <github@gone.nl >
(cherry picked from commit b93fc39639 )
Signed-off-by: Sebastiaan van Stijn <github@gone.nl >
2024-09-12 23:56:13 +02:00
49e33a03df
vendor: golang.org/x/text v0.17.0
...
full diff: https://github.com/golang/text/compare/v0.15.0...v0.17.0
Signed-off-by: Sebastiaan van Stijn <github@gone.nl >
(cherry picked from commit 3a63df265f )
Signed-off-by: Sebastiaan van Stijn <github@gone.nl >
2024-09-12 23:56:13 +02:00
295b75e5ff
vendor: golang.org/x/term v0.23.0
...
full diff: https://github.com/golang/term/compare/v0.20.0...v0.23.0
Signed-off-by: Sebastiaan van Stijn <github@gone.nl >
(cherry picked from commit c6e5341934 )
Signed-off-by: Sebastiaan van Stijn <github@gone.nl >
2024-09-12 23:56:13 +02:00
090d1ff555
vendor: golang.org/x/time v0.6.0
...
full diff: https://github.com/golang/time/compare/v0.3.0...v0.6.0
Signed-off-by: Sebastiaan van Stijn <github@gone.nl >
(cherry picked from commit 5f9fe33b6b )
Signed-off-by: Sebastiaan van Stijn <github@gone.nl >
2024-09-12 23:56:13 +02:00
5dde3d8570
vendor: golang.org/x/sync v0.8.0
...
full diff: https://github.com/golang/sync/compare/v0.7.0...v0.8.0
Signed-off-by: Sebastiaan van Stijn <github@gone.nl >
(cherry picked from commit 7074e5011f )
Signed-off-by: Sebastiaan van Stijn <github@gone.nl >
2024-09-12 23:56:13 +02:00
d64740d347
vendor: golang.org/x/sys v0.24.0
...
full diff: https://github.com/golang/sys/compare/v0.22.0...v0.24.0
Signed-off-by: Sebastiaan van Stijn <github@gone.nl >
(cherry picked from commit 958fff82f1 )
Signed-off-by: Sebastiaan van Stijn <github@gone.nl >
2024-09-12 23:56:12 +02:00
f68936ef2e
vendor: dario.cat/mergo v1.0.1
...
- fix: overwriteWithEmptyValue is forced to true when merging an object
involving maps
- fix: WithoutDereference should respect non-nil struct pointers
full diff: https://github.com/darccio/mergo/compare/v1.0.0...v1.0.1
Signed-off-by: Sebastiaan van Stijn <github@gone.nl >
(cherry picked from commit fb264ffc08 )
Signed-off-by: Sebastiaan van Stijn <github@gone.nl >
2024-09-12 23:56:12 +02:00
4607c883c5
vendor: github.com/moby/sys/sequential v0.6.0
...
full diff: https://github.com/moby/sys/compare/sequential/v0.5.0...sequential/v0.6.0
Signed-off-by: Sebastiaan van Stijn <github@gone.nl >
(cherry picked from commit b34e8e4dff )
Signed-off-by: Sebastiaan van Stijn <github@gone.nl >
2024-09-12 23:53:02 +02:00
7ff3daa446
vendor: github.com/moby/sys/symlink v0.3.0
...
full diff: https://github.com/moby/sys/compare/symlink/v0.2.0...symlink/v0.3.0
Signed-off-by: Sebastiaan van Stijn <github@gone.nl >
(cherry picked from commit ea37ac9bac )
Signed-off-by: Sebastiaan van Stijn <github@gone.nl >
2024-09-12 23:52:59 +02:00
1fe06dd0e7
vendor: github.com/moby/sys/signal v0.7.1
...
full diff: https://github.com/moby/sys/compare/signal/v0.7.0...signal/v0.7.1
Signed-off-by: Sebastiaan van Stijn <github@gone.nl >
(cherry picked from commit 435c658333 )
Signed-off-by: Sebastiaan van Stijn <github@gone.nl >
2024-09-12 23:47:30 +02:00
b381ab1d8d
Merge pull request #5429 from thaJeztah/27.x_bump_docker
...
[27.x] vendor: github.com/docker/docker v27.2.1
2024-09-12 22:42:13 +02:00
05fbfc6995
vendor: github.com/docker/docker v27.2.1
...
no diff: same commit, but tagged
full diff: https://github.com/docker/docker/compare/8b539b8df240...v27.2.1
Signed-off-by: Sebastiaan van Stijn <github@gone.nl >
2024-09-12 22:16:13 +02:00
fba240c5b4
Merge pull request #5426 from thaJeztah/27.x_backport_fix-panic-volume-update
...
[27.x backport] volume/update: require 1 argument/fix panic
2024-09-11 15:24:41 +01:00
965699ba0f
cli/command/volume TestUpdateCmd: adjust for older error messages
...
The error-message changed in newer versions, and no longer includes
"exactly".
This patch adjusts the test in the meantime.
59.13 === FAIL: cli/command/volume TestUpdateCmd (0.00s)
59.13 update_test.go:21: assertion failed: expected error to contain "requires 1 argument", got "\"update\" requires exactly 1 argument.\nSee 'update --help'.\n\nUsage: update [OPTIONS] [VOLUME] [flags]\n\nUpdate a volume (cluster volumes only)"
Signed-off-by: Sebastiaan van Stijn <github@gone.nl >
2024-09-11 13:26:06 +02:00
c65ac2d90d
volume/update: require 1 argument/fix panic
...
This command was declaring that it requires at least 1 argument, when it
needs exactly 1 argument. This was causing the CLI to panic when the
command was invoked with no argument:
`docker volume update`
Signed-off-by: Laura Brehm <laurabrehm@hey.com >
(cherry picked from commit daea277ee8 )
Signed-off-by: Sebastiaan van Stijn <github@gone.nl >
2024-09-11 13:12:54 +02:00
05fb576772
Merge pull request #5423 from thaJeztah/27.x_backport_info_no_expected_version
...
[27.x backport] info: stop printing "Expected" commits
2024-09-10 19:51:58 +02:00
4be6b1f3d7
info: stop printing "Expected" commits
...
The `Commit` type was introduced in 2790ac68b3 ,
to assist triaging issues that were reported with an incorrect version of
runc or containerd. At the time, both `runc` and `containerd` were not yet
stable, and had to be built from a specific commit to guarantee compatibility.
We encountered various situations where unexpected (and incompatible) versions
of those binaries were packaged, resulting in hard to trace bug-reports.
For those situations, a "expected" version was set at compile time, to
indicate if the version installed was different from the expected version;
docker info
...
runc version: a592beb5bc4c4092b1b1bac971afed27687340c5 (expected: 69663f0bd4b60df09991c08812a60108003fa340)
Both `runc` and `containerd` are stable now, and docker 19.03 and up set the
expected version to the actual version since c65f0bd13c
and 23.0 did the same for the `init` binary b585c64e2b ,
to prevent the CLI from reporting "unexpected version".
In short; the `Expected` fields no longer serves a real purpose, so we should
no longer print it.
Signed-off-by: Sebastiaan van Stijn <github@gone.nl >
(cherry picked from commit 88ca4e958f )
Signed-off-by: Sebastiaan van Stijn <github@gone.nl >
2024-09-10 16:41:43 +02:00
65decb5731
Merge pull request #5419 from dvdksn/bp_5403
...
[27.x backport] rename plugins index file and add linkTitle
2024-09-09 11:05:09 +02:00
90559a6143
chore: fix style/lint issues in deprecated.md
...
Signed-off-by: David Karlsson <35727626+dvdksn@users.noreply.github.com >
(cherry picked from commit 0fcaffb7e4 )
Signed-off-by: David Karlsson <35727626+dvdksn@users.noreply.github.com >
2024-09-09 10:54:29 +02:00
dbde5b3681
docs: add front matter title to deprecated.md
...
Signed-off-by: David Karlsson <35727626+dvdksn@users.noreply.github.com >
(cherry picked from commit 5ca40e0a35 )
Signed-off-by: David Karlsson <35727626+dvdksn@users.noreply.github.com >
2024-09-09 10:33:23 +02:00