f4fab2c7f3
Merge pull request #5488 from thaJeztah/align_errs
...
align "conflicting options" errors for consistency
2024-10-01 13:05:55 +02:00
bd96bdaf1b
align "conflicting options" errors for consistency
...
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2024-10-01 12:08:56 +02:00
3907414549
Merge pull request #5485 from thaJeztah/time_or_timeout
...
cli/command/container: stop, restart: rename "--time" to "--timeout"
2024-09-30 13:06:29 +02:00
df8b34595b
cli/command/container: stop, restart: rename "--time" to "--timeout"
...
This renames the `--time` flag as used on `docker stop` and `docker restart`
to `--timeout`, bringing it in line with other uses for this property,
such as `--stop-timeout` on `docker run`.
The `--time` option is deprecated and hidden, but will be kept for
backward compatibility, as these options existed for a long time.
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2024-09-30 09:43:54 +02:00
b1ae218f60
Merge pull request #5484 from thaJeztah/stop_restart_flag_descriptions
...
docs/reference: stop, restart: add flag descriptions
2024-09-27 12:24:24 +02:00
6075303483
docs/reference: stop, restart: add flag descriptions
...
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2024-09-27 10:18:55 +02:00
c767b9b2da
Merge pull request #5483 from robmry/ip-range-validation
...
Check that --ip-range is a CIDR address
2024-09-26 22:49:12 +02:00
8fca0a1f28
Check that --ip-range is a CIDR address
...
Signed-off-by: Rob Murray <rob.murray@docker.com>
2024-09-26 20:38:33 +01:00
daabb1533e
Merge pull request #5482 from thaJeztah/restart_stop_unit_tests
...
cli/command/container: add unit tests for container restart and container stop
2024-09-26 20:06:48 +02:00
ac502b5909
cli/command/container: add unit tests for container stop
...
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2024-09-26 18:58:40 +02:00
16aa994255
cli/command/container: add unit tests for container restart
...
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2024-09-26 18:57:27 +02:00
bae4b67c24
Merge pull request #5481 from dvdksn/fix-container-run-typo
...
docs: fix a typo in run.md
2024-09-26 15:39:20 +02:00
54a20ce54c
docs: fix a typo in run.md
...
Signed-off-by: David Karlsson <35727626+dvdksn@users.noreply.github.com>
2024-09-26 15:33:09 +02:00
3a3fe840ed
Merge pull request #5428 from thaJeztah/bump_docker_28
...
vendor: github.com/docker/docker 164cae56ed95 (master, v-next)
2024-09-24 15:53:30 +01:00
b12ac897fb
vendor: github.com/docker/docker 164cae56ed95 (master, v-next)
...
full diff: 2269acc7a3...164cae56ed
2024-09-24 16:30:30 +02:00
ff853c42a5
Merge pull request #5454 from thaJeztah/touchup_codeql
...
gha: codeql: minor touch-ups and fixes
2024-09-24 12:03:11 +01:00
56d0af783c
Merge pull request #5474 from docker/change_to_inuse
...
Images Tree: Change 'Used' to 'In Use'
2024-09-24 10:37:17 +02:00
97a6bf3580
Merge pull request #5473 from rumpl/no-underline
...
Do not underline image name
2024-09-23 21:02:51 +02:00
df52ddcfcc
Images Tree: Change 'Used' to 'In Use'
...
Signed-off-by: Brian Goff <cpuguy83@gmail.com>
2024-09-23 11:26:42 -07:00
17040890e4
Do not underline image name
...
Blue text with underline looks too much as a hyperlink I can click on
Signed-off-by: Djordje Lukic <djordje.lukic@docker.com>
2024-09-23 15:36:18 +02:00
9d478be4a8
Merge pull request #5468 from akerouanton/fix-ps-ipv6
...
cli/formatter: fix unbracketed IPv6 addrs
2024-09-23 15:31:02 +02:00
66977d48e9
Merge pull request #5471 from dvdksn/fix-docker-login-anchorlink
...
docs: fix anchor link to web-based login section
2024-09-23 14:16:42 +01:00
465e87afc7
docs: fix anchor link to web-based login section
...
Signed-off-by: David Karlsson <35727626+dvdksn@users.noreply.github.com>
2024-09-23 13:48:33 +02:00
3e271461e6
cli/formatter: fix unbracketed IPv6 addrs
...
Commit 964155cd
2024-09-23 12:17:24 +02:00
baa7a9f7ad
Merge pull request #5460 from laurazard/master-update-VERSION
2024-09-20 11:48:05 +01:00
91c90a9797
Update `VERSION` file to `v27.3.1-dev`
...
Signed-off-by: Laura Brehm <laurabrehm@hey.com>
2024-09-20 11:41:30 +01:00
9b4daca9f2
Merge pull request #5459 from thaJeztah/bump_compose
...
Dockerfile: update compose to v2.29.7
2024-09-20 12:38:14 +02:00
ce26ebc0e9
Dockerfile: update compose to v2.29.7
...
Update the compose cli plugin used in the dev-container
full diff: https://github.com/docker/compose/compare/v2.29.4...v2.29.7
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2024-09-20 12:22:39 +02:00
48cfe2137c
Merge pull request #5456 from laurazard/fix-defer-mp-shutdown
...
telemetry: fix early meterprovider shutdown
2024-09-20 02:41:45 +02:00
1355d7e9f8
telemetry: fix early meterprovider shutdown
...
In 4b5a196fee
2024-09-20 01:29:19 +01:00
f468606163
gha: codeql: minor touch-ups and fixes
...
- remove trailing whitespace
- pin to a versioned ubuntu version
- adjust timeout to be more within expected duration
- remove redundant git checkout, which is no longer needed
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2024-09-19 11:09:51 +02:00
a5fb752ecf
Merge pull request #5445 from jsternberg/lowercase-windows-drive
...
command: change drive to lowercase for wsl path
2024-09-18 12:15:45 +02:00
4e64c59d64
Merge pull request #5446 from thaJeztah/codeql_updates
...
gha: update codeql workflow to go1.22.7
2024-09-18 11:04:32 +01:00
3472bbc28a
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>
2024-09-18 10:59:08 +01:00
649e564ee0
Merge pull request #5444 from jsternberg/handle-otel-errors
...
telemetry: pass otel errors to the otel handler for shutdown and force flush
2024-09-18 10:39:55 +01:00
e1213edcc6
gha: update codeql workflow to go1.22.7
...
commit d7d56599ca
2024-09-17 21:39:56 +02:00
b1956f5073
telemetry: pass otel errors to the otel handler for shutdown and force flush
...
Signed-off-by: Jonathan A. Sternberg <jonathan.sternberg@docker.com>
2024-09-17 10:47:04 -05:00
a4619f3676
Merge pull request #5435 from juliogarciape/docs-fix-container-run
...
Docs: Fix --rm=false flag in container_run.md
2024-09-16 15:17:06 +02:00
539a92baca
Merge pull request #5441 from thaJeztah/bump_buildx_compose
...
Dockerfile: update buildx to v0.17.1, compose to v2.29.4
2024-09-16 15:15:09 +02:00
f7a513cff0
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>
2024-09-16 15:03:15 +02:00
42ce06aa5b
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>
2024-09-16 15:01:56 +02:00
7b630458bd
Merge pull request #5437 from thaJeztah/remove_deprecated_cors_headers
...
docs, man: dockerd: remove --api-cors-header (deprecated)
2024-09-16 13:42:01 +01:00
ccc87eb6ab
Merge pull request #5438 from thaJeztah/dockerd_logformat
...
docs, man: dockerd: add documentation for "--log-format" option
2024-09-16 13:44:19 +02:00
4f78ffaa03
Merge pull request #5436 from thaJeztah/update_dockerd_docs
...
docs: add documentation for dockerd --feature flag
2024-09-16 13:43:57 +02:00
baceb4b158
docs: dockerd: add documentation for --log-format option
...
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2024-09-16 13:23:13 +02:00
a42ca1148d
docs/reference: dockerd: add docs for --feature option
...
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2024-09-16 13:20:48 +02:00
9ae514fdc7
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>
2024-09-16 12:46:30 +02:00
1a0e32099a
docs: dockerd: remove --api-cors-header (deprecated)
...
Updates 9d9bb19f01
2024-09-16 12:20:54 +02:00
9bfd0e1a40
man: remove docs for deprecated --api-cors-header
...
It was deprecated in 27.0x through 7ea9acc97f4c884ecdaebd06ed0353b28263d118,
and removed in ae96ce866f4b3dc09dc4eab019d7725a63623d94.
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2024-09-16 12:15:24 +02:00
a357db0aba
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>
2024-09-16 11:22:21 +02:00
Sebastiaan van Stijn
Sebastiaan van Stijn
Rob Murray
David Karlsson
Laura Brehm
Brian Goff
Djordje Lukic
Albin Kerouanton
Jonathan A. Sternberg