14962747e4
Merge pull request #3629 from thaJeztah/update_engine
...
vendor: github.com/docker/docker 8abb84c7342a19009d777ef3d871c0b2a5c032a5
2022-05-20 18:36:59 +02:00
baafc8f286
vendor: github.com/docker/docker 8abb84c7342a19009d777ef3d871c0b2a5c032a5
...
no changes in vendored code, just aligning to latest master
full diff: d633169483...8abb84c734
2022-05-20 18:10:05 +02:00
098a5d08a0
Merge pull request #3625 from thaJeztah/update_engine
...
vendor: github.com/docker/docker d633169483bbe22b92b8310c47e827451b594364
2022-05-19 23:48:18 +02:00
d945856e68
vendor: github.com/docker/docker d633169483bbe22b92b8310c47e827451b594364
...
Notable changes:
- introduce CreateMountpoint for parity between binds and mounts
full diff: c9d04033d4...d633169483
2022-05-19 23:12:08 +02:00
0e4dde2487
Merge pull request #3623 from thaJeztah/update_engine
2022-05-19 12:24:30 +02:00
8378b4277d
vendor: github.com/docker/docker c9d04033d443e359e73e5da58a6b46ec1b8f2373
...
Updating to latest master
full diff: f1dd6bf84e...c9d04033d4
2022-05-19 11:56:35 +02:00
557e6a6793
Merge pull request #3619 from vvoland/3554-initial-console-size
...
cli/container: Fill ConsoleSize in create
2022-05-18 13:28:18 +02:00
6d3bda1e7c
cli/container: Move filling ConsoleSize to create
...
This makes the containers have an expected console size not only for
`run` but also for `create`. Also remove the comment, as this is no
longer ignored on Linux daemon since e994efcf64c133de799f16f5cd6feb1fc41fade4
Signed-off-by: Paweł Gronowski <pawel.gronowski@docker.com>
2022-05-18 12:56:32 +02:00
b6aa28b6c7
Merge pull request #2907 from ollypom/stack-deploy-swarm-jobs
...
Added Swarm Job support to Stack Deploy
2022-05-17 22:58:25 +02:00
3997f3431f
Added Swarm Job support to Stack Deploy
...
Added the support for both `global-job` and `replicated-job` to Docker
stack deploy.
Signed-off-by: ollypom <oppomeroy@gmail.com>
2022-05-17 22:30:22 +02:00
7f073ab823
Merge pull request #3606 from thaJeztah/carry_csi_volumes
...
Proposed Cluster (CSI) Volume Command (rebase)
2022-05-17 18:43:16 +02:00
b655203b06
Merge pull request #3614 from thaJeztah/signal_options
...
add --signal option to stop and restart
2022-05-17 14:31:26 +02:00
e55151fb7c
Merge pull request #3612 from thaJeztah/daemon_cluster_opts
...
remove documentation and completion for deprecated legacy overlay networks
2022-05-17 14:30:49 +02:00
2c9626096d
Merge pull request #3615 from thaJeztah/update_version
2022-05-17 12:17:00 +02:00
77e8c6f682
Update version to 22.06.0-dev
...
We should consider removing this file, but it's still used in some
scripts, so let's keep that one for later.
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2022-05-17 11:41:40 +02:00
a1c4af7648
docs/deprecated: update version to 22.06
...
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2022-05-17 11:41:21 +02:00
86c30e6a0d
add --signal option to stop and restart
...
Wording and documentation still need to be updated, but will do
so in a follow-up.
Also removing the default "10 seconds" from the timeout flags, as
this default is not actually used, and may not match the actual
default (which is defined on the daemon side).
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2022-05-17 11:35:16 +02:00
5eb24bfd11
completion: remove options related to deprecated cluster-store
...
This removes completion for flags related to legacy overlay networks using
an external k/v store.
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2022-05-17 11:03:25 +02:00
1fafae3efc
info: remove cluster store from docker info output
...
This removes the cluster store information from the output of "docker info".
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2022-05-17 11:01:49 +02:00
28e2b92b58
docs: remove documentation about deprecated cluster-store
...
This removes documentation related to legacy overlay networks using
an external k/v store.
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2022-05-17 11:00:51 +02:00
7236f78242
man: use "console" hints in markdown
...
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2022-05-17 10:45:43 +02:00
53f8ed4bec
Merge pull request #3608 from thaJeztah/formatstats_optimize
...
Small performance optimizations for formatting stats
2022-05-17 10:10:14 +02:00
e1556de337
Merge pull request #3607 from thaJeztah/remove_redundant_nolints
...
lint: update some nolint comments:
2022-05-17 10:09:36 +02:00
2c92c535f8
Merge pull request #3609 from thaJeztah/no_more_chickens
...
remove unused poule.yml
2022-05-14 08:05:50 -07:00
a7c8cb514a
remove unused poule.yml
...
this bot is no longer running
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2022-05-13 22:01:51 +02:00
a2e9ed3b87
cli/command/container: use RWMutex for stats to allow concurrent reads
...
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2022-05-13 21:39:03 +02:00
34dd43bf1b
cli/command/container: some small performance optimizations for formatting stats
...
Formatting stats runs in a loop to refresh the stats for each container. This
patch makes some small performance improvments by reducing the use of Sprintf
in favor of concatenating strings, and using strconv directly where possible.
Benchmark can be run with:
GO111MODULE=off go test -test.v -test.bench '^BenchmarkStatsFormat' -test.run '^$' ./cli/command/container/
Before/after:
BenchmarkStatsFormatOld-8 2655 428064 ns/op 62432 B/op 5600 allocs/op
BenchmarkStatsFormat-8 3338 335822 ns/op 52832 B/op 4700 allocs/op
Average of 5 runs;
benchstat old.txt new.txt
name old time/op new time/op delta
StatsFormat-8 432µs ± 1% 344µs ± 5% -20.42% (p=0.008 n=5+5)
name old alloc/op new alloc/op delta
StatsFormat-8 62.4kB ± 0% 52.8kB ± 0% -15.38% (p=0.000 n=5+4)
name old allocs/op new allocs/op delta
StatsFormat-8 5.60k ± 0% 4.70k ± 0% -16.07% (p=0.008 n=5+5)
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2022-05-13 21:38:06 +02:00
7bcc03d972
cli/command/container: add BenchmarkStatsFormat()
...
To test:
GO111MODULE=off go test -test.v -test.bench '^BenchmarkStatsFormat' -test.run '^$' ./cli/command/container/
goos: darwin
goarch: amd64
pkg: github.com/docker/cli/cli/command/container
cpu: Intel(R) Core(TM) i7-4790K CPU @ 4.00GHz
BenchmarkStatsFormat
BenchmarkStatsFormat-8 2482 522721 ns/op 62439 B/op 5600 allocs/op
PASS
ok github.com/docker/cli/cli/command/container 1.369s
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2022-05-13 21:26:38 +02:00
868adb13c6
lint: update some nolint comments:
...
```
cli/command/container/hijack.go:188:1⚠️ nolint directive did not match any issue (nolint)
cli/command/image/trust.go:346:1⚠️ nolint directive did not match any issue (nolint)
cli/command/manifest/push.go:211:1⚠️ nolint directive did not match any issue (nolint)
cli/command/trust/signer_remove.go:79:1⚠️ nolint directive did not match any issue (nolint)
internal/pkg/containerized/snapshot.go:95:1⚠️ nolint directive did not match any issue (nolint)
internal/pkg/containerized/snapshot.go:138:1⚠️ nolint directive did not match any issue (nolint)
```
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2022-05-13 20:50:19 +02:00
0fab8ecf36
volume: annotate cluster-volumes flags for API version and swarm
...
This hides the flags when connecting to an older engine, or if
swarm is not enabled, and is also used to add badges in the
documentation.
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2022-05-13 20:22:38 +02:00
3455580ebc
Add cluster volume support
...
- Write test for cluster volumes
- Add inspect test, add update command
- Add cluster volume opts to create
- Add requisite and preferred topology flags
- volume: move cluster bool in opts
Signed-off-by: Drew Erny <derny@mirantis.com>
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2022-05-13 20:06:11 +02:00
d0df532a25
Merge pull request #3605 from thaJeztah/update_engine
...
vendor: github.com/docker/docker f1dd6bf84e28930e1ccd903361f9284fb22d3b8a
2022-05-13 16:41:25 +02:00
9bf28fc003
vendor: github.com/docker/docker f1dd6bf84e28930e1ccd903361f9284fb22d3b8a
...
full diff: 7c69b6dc08...f1dd6bf84e
2022-05-13 14:44:41 +02:00
ec37bfb245
Merge pull request #3583 from thaJeztah/update_tests
...
TestSaveFileToDirs: use filepath.Join()
2022-05-13 11:46:06 +02:00
55de347230
Merge pull request #3271 from thaJeztah/kill_canonical_signal_name
...
docker kill: don't set default signal on the client side
2022-05-13 11:06:23 +02:00
20138a81bc
docker kill: don't set default signal on the client side
...
The default signal is already determined by the daemon, so the
CLI should not send a signal.
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2022-05-13 10:10:17 +02:00
1b922a47c1
Merge pull request #3603 from thaJeztah/completion_follow_ups
...
completion v2: some small follow-ups
2022-05-12 18:19:37 +02:00
e6efcd9e49
Merge pull request #3602 from thaJeztah/update_engine
...
vendor: update moby to latest
2022-05-12 13:49:30 +02:00
66b9056500
completion v2: some small follow-ups
...
- Prevent completion on "create" subcommands to prevent them
from completing with local filenames
- Add completion for "docker image save"
- Add completion for "docker image tag"
- Disable completion for "docker login"
- Exclude "paused" containers for "docker container attach" and
"docker container exec"
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2022-05-12 13:25:15 +02:00
a09e61a247
Merge pull request #3429 from ndeloof/cobra_completion_v2
...
Cobra completion v2 with CLI plugin support
2022-05-12 13:18:20 +02:00
cbec75e2f3
Adopt Cobra completion v2 to support completion by CLI plugins
...
Signed-off-by: Nicolas De Loof <nicolas.deloof@gmail.com>
2022-05-12 12:59:10 +02:00
2b4ffb301b
Merge pull request #3597 from teivah/stats-race
...
Fixing stats race condition
2022-05-12 12:55:27 +02:00
b59219f0e2
vendor: github.com/moby/buildkit v0.10.3
...
no changes in vendored code
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2022-05-12 12:52:42 +02:00
ef3790757c
vendor: github.com/docker/docker 7c69b6dc08c7
...
full diff: 2ed904cad7...7c69b6dc08
2022-05-12 12:50:31 +02:00
1629df514a
vendor: github.com/containerd/containerd v1.6.4
...
No changes in vendored code
full diff: https://github.com/containerd/containerd/compare/v1.6.3...v1.6.4
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2022-05-12 12:50:02 +02:00
030eed90a8
Merge pull request #3564 from thaJeztah/update_engine_hide_swarm_commands
...
hide swarm-related commands based on the current swarm status and role
2022-05-12 12:44:06 +02:00
354bdf369c
Merge pull request #3600 from thaJeztah/bump_golang_1.18.2
...
update golang to 1.18.2, golang.org/x/sys v0.0.0-20220412211240-33da011f77ad
2022-05-11 16:25:39 +02:00
05279c7c6a
vendor: golang.org/x/sys v0.0.0-20220412211240-33da011f77ad
...
Includes fixes for:
- CVE-2022-29526 (http://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2022-29526 );
(description at https://go.dev/issue/52313 ).
full diff: 1e041c57c4...33da011f77
2022-05-11 14:33:05 +02:00
f5d16893dd
update golang to 1.18.2
...
go1.18.2 (released 2022-05-10) includes security fixes to the syscall package,
as well as bug fixes to the compiler, runtime, the go command, and the crypto/x509,
go/types, net/http/httptest, reflect, and sync/atomic packages. See the Go 1.18.2
milestone on the issue tracker for details:
https://github.com/golang/go/issues?q=milestone%3AGo1.18.2+label%3ACherryPickApproved
Full diff: http://github.com/golang/go/compare/go1.18.1...go1.18.2
Includes fixes for:
- CVE-2022-29526 (http://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2022-29526 );
(description at https://go.dev/issue/52313 ).
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2022-05-11 14:20:44 +02:00
8b4958455e
Merge pull request #3594 from thaJeztah/improve_info_formatting
2022-05-11 10:26:58 +02:00
Sebastiaan van Stijn
Sebastiaan van Stijn
Nicolas De loof
Paweł Gronowski
ollypom
Brian Goff
Drew Erny