David Karlsson
24837f9260
chore: update link to docker engine api reference
...
Engine API reference page is moving to /reference/api/engine
Signed-off-by: David Karlsson <35727626+dvdksn@users.noreply.github.com >
(cherry picked from commit c974a83391 )
Signed-off-by: David Karlsson <35727626+dvdksn@users.noreply.github.com >
2024-08-22 15:18:55 +02:00
Paweł Gronowski
5805df0205
Merge pull request #5365 from vvoland/5363-27.x
...
[27.x backport] cli/formatter: bracket IPv6 addrs prepended to ports
2024-08-22 14:23:10 +02:00
David Karlsson
fb20f009f7
Merge pull request #5366 from dvdksn/27x_f1befabe9f1c979d94c39eeb7020e106b3c1e6a6
...
[27.x backport] use gh alert syntax for callouts
2024-08-21 15:22:02 +02:00
Albin Kerouanton
6ceb0aba82
cli/formatter: bracket IPv6 addrs prepended to ports
...
On `docker ps`, port bindings with an IPv6 HostIP should have their
addresses put into brackets when joining them to their ports.
RFC 3986 (Section 3.2.2) stipulates that IPv6 addresses should be
enclosed within square brackets. This RFC is only about URIs. However,
doing so here helps user identifier what's part of the IP address and
what's the port. It also makes it easier to copy/paste that
'[addr]:port' into other software (including browsers).
Signed-off-by: Albin Kerouanton <albinker@gmail.com >
(cherry picked from commit 964155cd27 )
Signed-off-by: Paweł Gronowski <pawel.gronowski@docker.com >
2024-08-21 11:45:56 +02:00
David Karlsson
2d7b8998c4
docs: use gh alert syntax for callouts
...
Signed-off-by: David Karlsson <35727626+dvdksn@users.noreply.github.com >
(cherry picked from commit f1befabe9f )
Signed-off-by: David Karlsson <35727626+dvdksn@users.noreply.github.com >
2024-08-21 11:41:15 +02:00
Sebastiaan van Stijn
cabd410a1a
Merge pull request #5362 from laurazard/27.x-backport-oauth-escape-hatch
...
[27.x backport] login: add oauth escape hatch
2024-08-20 16:11:01 +02:00
Laura Brehm
a58af379e1
login: add e2e tests for oauth + escape hatch
...
Signed-off-by: Laura Brehm <laurabrehm@hey.com >
(cherry picked from commit a327476f7f )
Signed-off-by: Laura Brehm <laurabrehm@hey.com >
2024-08-20 12:50:57 +01:00
Laura Brehm
1b3fa65759
login: add oauth escape hatch
...
Signed-off-by: Laura Brehm <laurabrehm@hey.com >
(cherry picked from commit 846ecf59ff )
Signed-off-by: Laura Brehm <laurabrehm@hey.com >
2024-08-20 12:50:49 +01:00
David Karlsson
cf01923519
Merge pull request #5348 from dvdksn/backport_update_build_context_link
...
[27.x backport] docs: update link to moved build context doc
2024-08-19 17:48:55 +02:00
Paweł Gronowski
a0d7f0dbd3
Merge pull request #5358 from vvoland/5356-27.x
...
[27.x backport] list/tree: No extra spacing for graphdriver
2024-08-19 13:47:05 +02:00
Paweł Gronowski
0c4e7478e2
list/tree: No extra spacing for graphdriver
...
Don't output the extra spacing around the images when none of the
top-level image entries has any children.
This makes the list look better when ran against the graphdrivers image
store.
Signed-off-by: Paweł Gronowski <pawel.gronowski@docker.com >
(cherry picked from commit 7b91647943 )
Signed-off-by: Paweł Gronowski <pawel.gronowski@docker.com >
2024-08-19 13:28:13 +02:00
Paweł Gronowski
60ce3fbc96
Merge pull request #5353 from vvoland/4982-27.x
...
build / prepare (push) Has been cancelled
build / build (push) Has been cancelled
build / bin-image (push) Has been cancelled
build / prepare-plugins (push) Has been cancelled
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] image/list: Add `--tree` flag
v27.2.0-rc.1
2024-08-16 19:51:04 +02:00
Paweł Gronowski
7902b52714
list/tree: Print <untagged> as dangling image name
...
Signed-off-by: Paweł Gronowski <pawel.gronowski@docker.com >
(cherry picked from commit 351249dce9 )
Signed-off-by: Paweł Gronowski <pawel.gronowski@docker.com >
2024-08-16 19:40:38 +02:00
Paweł Gronowski
7196200fc2
list/tree: Fix some escape codes included in nonTTY
...
Signed-off-by: Paweł Gronowski <pawel.gronowski@docker.com >
(cherry picked from commit 6979ab073c )
Signed-off-by: Paweł Gronowski <pawel.gronowski@docker.com >
2024-08-16 19:40:36 +02:00
Paweł Gronowski
f42fa0b8e1
list/tree: Add spacing before the content and first image
...
Signed-off-by: Paweł Gronowski <pawel.gronowski@docker.com >
(cherry picked from commit a9b78da546 )
Signed-off-by: Paweł Gronowski <pawel.gronowski@docker.com >
2024-08-16 19:40:34 +02:00
Paweł Gronowski
b719b10257
list/tree: Capitalize column headers
...
Signed-off-by: Paweł Gronowski <pawel.gronowski@docker.com >
(cherry picked from commit 0242a1e3c6 )
Signed-off-by: Paweł Gronowski <pawel.gronowski@docker.com >
2024-08-16 19:40:33 +02:00
Paweł Gronowski
ab55d75cf5
list/tree: Add an experimental warning
...
Signed-off-by: Paweł Gronowski <pawel.gronowski@docker.com >
(cherry picked from commit d417d06682 )
Signed-off-by: Paweł Gronowski <pawel.gronowski@docker.com >
2024-08-16 19:40:32 +02:00
Paweł Gronowski
324cc5d30f
list/tree: Sort by created date
...
Signed-off-by: Paweł Gronowski <pawel.gronowski@docker.com >
(cherry picked from commit b1a08f7841 )
Signed-off-by: Paweł Gronowski <pawel.gronowski@docker.com >
2024-08-16 19:40:30 +02:00
Paweł Gronowski
44a9ffa0ad
list/tree: Align number right, text left
...
Signed-off-by: Paweł Gronowski <pawel.gronowski@docker.com >
(cherry picked from commit 18ab78882c )
Signed-off-by: Paweł Gronowski <pawel.gronowski@docker.com >
2024-08-16 19:40:29 +02:00
Paweł Gronowski
ba43ae0bd2
cli/tree: Add Content size column
...
Signed-off-by: Paweł Gronowski <pawel.gronowski@docker.com >
(cherry picked from commit ea8aafcd9e )
Signed-off-by: Paweł Gronowski <pawel.gronowski@docker.com >
2024-08-16 19:40:28 +02:00
Paweł Gronowski
99b647cfca
image/list: Add --tree flag
...
Signed-off-by: Paweł Gronowski <pawel.gronowski@docker.com >
(cherry picked from commit be11b74ee9 )
Signed-off-by: Paweł Gronowski <pawel.gronowski@docker.com >
2024-08-16 19:40:26 +02:00
Paweł Gronowski
f90dc28f1e
Merge pull request #5354 from vvoland/vendor-docker
...
[27.x] vendor: github.com/docker/docker v27.2.0-dev (9942d656bade)
2024-08-16 19:39:57 +02:00
Paweł Gronowski
26536d1145
vendor: github.com/docker/docker v27.2.0-dev (9942d656bade)
...
full diff: https://github.com/docker/docker/compare/f9522e5e96c3...9942d656bade
Signed-off-by: Paweł Gronowski <pawel.gronowski@docker.com >
2024-08-16 18:59:59 +02:00
Paweł Gronowski
c5e733becc
Merge pull request #5349 from laurazard/27.x-backport-oauth-login
...
[27.x backport] auth: add support for oauth device-code login
2024-08-16 18:13:24 +02:00
Paweł Gronowski
7227402d94
Merge pull request #5351 from laurazard/backport-27.x-disable-pseudoterminal-ssh
...
[27.x backport] disable pseudoterminal creation
2024-08-16 18:12:10 +02:00
Archimedes Trajano
83f6ca4a73
disable pseudoterminal creation
...
avoided the join, also did manual iteration
added test, also added reflect for the DeepEqual comparison
Signed-off-by: Archimedes Trajano <developer@trajano.net >
(cherry picked from commit f3c2c26b10 )
Signed-off-by: Laura Brehm <laurabrehm@hey.com >
2024-08-16 14:11:10 +01:00
Laura Brehm
ad7912a846
fallback to regular login if oauth login fails to start
...
Signed-off-by: Laura Brehm <laurabrehm@hey.com >
(cherry picked from commit c3fe7bc336 )
Signed-off-by: Laura Brehm <laurabrehm@hey.com >
2024-08-16 10:09:41 +01:00
Laura Brehm
afb5e143b1
login: normalize registry-1.docker.io
...
Signed-off-by: Laura Brehm <laurabrehm@hey.com >
(cherry picked from commit e6624676e0 )
Signed-off-by: Laura Brehm <laurabrehm@hey.com >
2024-08-16 10:09:40 +01:00
Laura Brehm
b8a38fd22d
Refactor cli/command/registry
...
Signed-off-by: Laura Brehm <laurabrehm@hey.com >
(cherry picked from commit 6e4818e7d6 )
Signed-off-by: Laura Brehm <laurabrehm@hey.com >
2024-08-16 10:09:39 +01:00
Laura Brehm
0c29d6bac1
auth: add support for oauth device-code login
...
This commit adds support for the oauth [device-code](https://auth0.com/docs/get-started/authentication-and-authorization-flow/device-authorization-flow )
login flow when authenticating against the official registry.
This is achieved by adding `cli/internal/oauth`, which contains code to manage
interacting with the Docker OAuth tenant (`login.docker.com`), including launching
the device-code flow, refreshing access using the refresh-token, and logging out.
The `OAuthManager` introduced here is also made available through the `command.Cli`
interface method `OAuthManager()`.
In order to maintain compatibility with any clients manually accessing
the credentials through `~/.docker/config.json` or via credential
helpers, the added `OAuthManager` uses the retrieved access token to
automatically generate a PAT with Hub, and store that in the
credentials.
Signed-off-by: Laura Brehm <laurabrehm@hey.com >
(cherry picked from commit fcfdd7b91f )
Signed-off-by: Laura Brehm <laurabrehm@hey.com >
2024-08-16 10:09:38 +01:00
David Karlsson
3eaf30278f
docs: update link to moved build context doc
...
Signed-off-by: David Karlsson <35727626+dvdksn@users.noreply.github.com >
(cherry picked from commit 2dd4eb06ae )
Signed-off-by: David Karlsson <35727626+dvdksn@users.noreply.github.com >
2024-08-13 12:17:58 +02:00
Paweł Gronowski
d01f264bcc
Merge pull request #5333 from thaJeztah/27.x_bump_engine
...
build / prepare (push) Has been cancelled
build / build (push) Has been cancelled
build / bin-image (push) Has been cancelled
build / prepare-plugins (push) Has been cancelled
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 f9522e5e96c3 (v27.1.2-dev) (removes containerd dependency)
v27.1.2
2024-08-12 13:34:32 +02:00
Sebastiaan van Stijn
65dec14ac0
vendor: github.com/docker/docker f9522e5e96c3 (v27.1.2-dev)
...
Removes dependency on containerd, as the userns package was migrated
to the github.com/moby/sys/userns module.
- full diff: https://github.com/docker/docker/compare/v27.1.1...f9522e5e96c3
Signed-off-by: Sebastiaan van Stijn <github@gone.nl >
Signed-off-by: Paweł Gronowski <pawel.gronowski@docker.com >
2024-08-12 13:18:02 +02:00
Paweł Gronowski
1f80c54b51
Merge pull request #5339 from thaJeztah/27.x_backport_fix_bps_limit
...
[27.x backport] run: fix GetList return empty issue for throttledevice
2024-08-12 11:57:35 +02:00
David Karlsson
33573e20bc
Merge pull request #5343 from dvdksn/cp-docs-manuals-refactor-linkfix
...
[27.x backport] cherry-pick doc linkfixes due to refactor
2024-08-12 10:11:43 +02:00
David Karlsson
73452e316f
docs: update internal links after refactor
...
Signed-off-by: David Karlsson <35727626+dvdksn@users.noreply.github.com >
(cherry picked from commit d4a362aa1c )
Signed-off-by: David Karlsson <35727626+dvdksn@users.noreply.github.com >
2024-08-11 16:58:39 +02:00
David Karlsson
bcd90be73a
docs: fix link to http proxy document
...
Signed-off-by: David Karlsson <35727626+dvdksn@users.noreply.github.com >
(cherry picked from commit 78a8fba2cc )
Signed-off-by: David Karlsson <35727626+dvdksn@users.noreply.github.com >
2024-08-11 16:46:02 +02:00
Sebastiaan van Stijn
f62c68eedd
Merge pull request #5337 from vvoland/5327-27.x
...
[27.x backport] plugins: don't panic on Close if PluginServer nil
2024-08-09 20:03:37 +02:00
Jianyong Wu
946d1097b8
run: fix GetList return empty issue for throttledevice
...
Test "--device-read-bps" "--device-write-bps" will fail. The root
cause is that GetList helper return empty as its local variable
initialized to zero size.
This patch fix it by setting the related slice size to non-zero.
Signed-off-by: Jianyong Wu <wujianyong@hygon.cn >
Fixes : #5321
(cherry picked from commit 73e78a5822 )
Signed-off-by: Sebastiaan van Stijn <github@gone.nl >
2024-08-09 19:47:08 +02:00
Sebastiaan van Stijn
096e42b366
Merge pull request #5335 from vvoland/5310-27.x
...
[27.x backport] gha: set permissions to read-only by default
2024-08-09 10:54:36 +02:00
Laura Brehm
984ef9072c
plugins: don't panic on Close if PluginServer nil
...
Signed-off-by: Laura Brehm <laurabrehm@hey.com >
(cherry picked from commit 9c4480604e )
Signed-off-by: Paweł Gronowski <pawel.gronowski@docker.com >
2024-08-09 10:48:40 +02:00
Sebastiaan van Stijn
30c7951192
Merge pull request #5334 from vvoland/5289-27.x
...
[27.x backport] docs: refresh image versions in examples
2024-08-09 10:48:38 +02:00
Sebastiaan van Stijn
54135b0724
gha: set permissions to read-only by default
...
Signed-off-by: Sebastiaan van Stijn <github@gone.nl >
(cherry picked from commit e4d99b4b60 )
Signed-off-by: Paweł Gronowski <pawel.gronowski@docker.com >
2024-08-09 10:44:34 +02:00
Sebastiaan van Stijn
40707e17b8
docs: refresh image versions in examples
...
use current LTS versions of ubuntu where suitable, remove uses of
ubuntu:23.10 (which reache EOL), and and update some other examples
to use more current versions.
Signed-off-by: Sebastiaan van Stijn <github@gone.nl >
(cherry picked from commit b36522b473 )
Signed-off-by: Paweł Gronowski <pawel.gronowski@docker.com >
2024-08-09 10:42:40 +02:00
Sebastiaan van Stijn
edd71d77c7
vendor: golang.org/x/sys v0.22.0
...
full diff: https://github.com/golang/sys/compare/v0.21.0...v0.22.0
Signed-off-by: Sebastiaan van Stijn <github@gone.nl >
(cherry picked from commit 501904d48f )
Signed-off-by: Sebastiaan van Stijn <github@gone.nl >
2024-08-08 13:57:57 +02:00
Paweł Gronowski
9593373f9e
Merge pull request #5325 from vvoland/5324-27.x
...
[27.x backport] update to go1.21.13
2024-08-08 13:27:04 +02:00
Laura Brehm
5761e662f1
Merge pull request #5326 from vvoland/5303-27.x
...
[27.x backport] tests/run: fix flaky `RunAttachTermination` test
2024-08-07 12:31:40 +01:00
Laura Brehm
c7f3031f74
tests/run: fix flaky RunAttachTermination test
...
This test was just incorrect (and testing incorrect
behavior): it was checking that `docker run` exited with a `context
canceled` error after signalling the CLI/cancelling the command's
context, but this was incorrect (and was fixed in
991b1303da - which was when this test
started failing).
However, since this test assertion was happening inside of a goroutine,
it would sometimes pass if this assertion didn't get to run before the
test suite terminated. It was flaky because sometimes this assertion
inside the goroutine did get to execute, but after the test finished
execution, which is a big no-no.
As an aside, assertions inside goroutines are generally bad, and `govet`
even has a linter for this (but it only catches `t.Fatal` and `t.FailNow`
calls and not `assert.Xx`.
Signed-off-by: Laura Brehm <laurabrehm@hey.com >
(cherry picked from commit eac83574c1 )
Signed-off-by: Paweł Gronowski <pawel.gronowski@docker.com >
2024-08-07 12:05:30 +02:00
Paweł Gronowski
53cb00a818
update to go1.21.13
...
- https://github.com/golang/go/issues?q=milestone%3AGo1.21.13+label%3ACherryPickApproved
- full diff: https://github.com/golang/go/compare/go1.21.12...go1.21.13
go1.21.13 (released 2024-08-06) includes fixes to the go command, the
covdata command, and the bytes package. See the [Go 1.21.13 milestone](https://github.com/golang/go/issues?q=milestone%3AGo1.21.13+label%3ACherryPickApproved )
on our issue tracker for details.
Signed-off-by: Paweł Gronowski <pawel.gronowski@docker.com >
(cherry picked from commit 434d8b75e8 )
Signed-off-by: Paweł Gronowski <pawel.gronowski@docker.com >
2024-08-07 11:50:29 +02:00
Paweł Gronowski
a35c363ffc
Merge pull request #5302 from laurazard/27-attach-exit-code
...
[27.1 backport] attach: wait for exit code from `ContainerWait`
2024-07-26 17:21:35 +02:00