toolshed/docker-cli
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity
8,876 Commits 3 Branches 295 Tags
6654ea1434f51931e6f2bed77bb3c947052047a0
Commit Graph
8876 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
Sebastiaan van StijnandGitHub 6654ea1434 Merge pull request #4422 from thaJeztah/update_engine 
vendor: github.com/docker/docker dab9ffb252186f4c47416addb136d579f9314c6a (25.0-dev)
 2023-07-15 14:07:30 +02:00
Sebastiaan van Stijn 3469beb80d replace uses of deprecated api/types that moved to api/types/system 
These types were moved to api/types/system:

- types.Info
- types.Commit
- types.PluginsInfo
- types.NetworkAddressPool
- types.Runtime
- types.SecurityOpt
- types/KeyValue
- types.DecodeSecurityOptions()

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
 2023-07-15 01:20:49 +02:00
Sebastiaan van Stijn 1f87420b5b vendor: github.com/docker/docker dab9ffb252186f4c47416addb136d579f9314c6a (25.0-dev) 
full diff: https://github.com/docker/docker/compare/98d3da79ef9c...dab9ffb252186f4c47416addb136d579f9314c6a

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
 2023-07-15 01:20:49 +02:00
Sebastiaan van Stijn 4d03b935c1 vendor: github.com/moby/swarmkit/v2 v2.0.0-20230707182847-6f78b8199b05 
no changes in vendored files

full diff: https://github.com/moby/swarmkit/compare/ad0f3ae162fa...6f78b8199b05

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
 2023-07-15 01:19:23 +02:00
Sebastiaan van StijnandGitHub a87d1373de Merge pull request #4408 from thaJeztah/update_deps 
vendor: github.com/moby/swarmkit/v2 v2.0.0-20230627115642-ad0f3ae162fa
 2023-07-15 01:16:49 +02:00
Sebastiaan van StijnandGitHub 424e499b6a Merge pull request #4415 from vvoland/dont-ignore-volume-parse-err 
cli/container: Don't ignore error when parsing volume spec
 2023-07-15 00:05:56 +02:00
Sebastiaan van StijnandGitHub dbd53f0419 Merge pull request #4411 from crazy-max/update-xx 
Dockerfile: update to xx 1.2.1
 2023-07-13 00:38:48 +02:00
Sebastiaan van StijnandGitHub a6a69c83f2 Merge pull request #4416 from elezar/bump-cdi-dependency 
Bump container-device-interface dependency to v0.6.0
 2023-07-12 22:39:49 +02:00
Paweł Gronowski fe7afb700f cli/container: Don't ignore error when parsing volume spec 
Signed-off-by: Paweł Gronowski <pawel.gronowski@docker.com>
 2023-07-12 09:45:55 +02:00
Evan Lezar 323ca1d567 Bump container-device-interface dependency to v0.6.0 
Signed-off-by: Evan Lezar <elezar@nvidia.com>
 2023-07-11 23:30:59 +02:00
CrazyMax fca67dd817 Dockerfile: update to xx 1.2.1 
Signed-off-by: CrazyMax <crazy-max@users.noreply.github.com>
 2023-07-10 13:09:07 +02:00
Sebastiaan van Stijn de9f1f5b90 vendor: github.com/moby/swarmkit/v2 v2.0.0-20230627115642-ad0f3ae162fa 
no changes in vendored files, but keeping in sync with the docker/docker version

full diff: https://github.com/moby/swarmkit/compare/36334ed18760...ad0f3ae162fa

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
 2023-07-07 18:18:14 +02:00
Sebastiaan van StijnandGitHub df04aca5d2 Merge pull request #4405 from cpuguy83/health_start_interval 
Add support for health start interval
 2023-07-07 18:15:10 +02:00
Sebastiaan van StijnandGitHub b8f51d9591 Merge pull request #4084 from elezar/add-cdi-support 
Support CDI devices in --device flag
 2023-07-06 22:44:58 +02:00
Brian Goff 125eeb7ab6 Add docs for health-start-interval 
Signed-off-by: Brian Goff <cpuguy83@gmail.com>
 2023-07-06 19:41:34 +00:00
Brian Goff 986879c071 Add flags to container/service for health start interval 
Signed-off-by: Brian Goff <cpuguy83@gmail.com>
 2023-07-06 19:05:34 +00:00
Brian Goff 9bfaa6ff79 revendor docker/docker from master 
Revendoring to get new StartInterval field for container health config

Signed-off-by: Brian Goff <cpuguy83@gmail.com>
 2023-07-06 19:05:13 +00:00
Evan Lezar dbd9d5d74f Update vendoring for CDI parser 
Signed-off-by: Evan Lezar <elezar@nvidia.com>
 2023-07-04 15:14:34 +02:00
Evan Lezar dad225d1e2 Support CDI devices in --device flag 
Signed-off-by: Evan Lezar <elezar@nvidia.com>
 2023-07-04 14:52:46 +02:00
Sebastiaan van StijnandGitHub dc2eb3bf7c Merge pull request #4394 from laurazard/fix-flaky-ssh 
commandconn: return original error while closing
 2023-06-30 19:25:22 +02:00
Laura BrehmandSebastiaan van Stijn d5f564adaa commandconn: return original error while closing 
Changes the `Read` and `Write` error handling
logic to return the original error while closing
the connection. We still skip calling `handleEOF`
if already closing the connection.

Fixes the flaky `TestCloseWhileWriting` and
`TestCloseWhileReading` tests.

Co-authored-by: Sebastiaan van Stijn <github@gone.nl>
Signed-off-by: Laura Brehm <laurabrehm@hey.com>
 2023-06-30 19:15:18 +02:00
Sebastiaan van StijnandGitHub e413dae9fb Merge pull request #4392 from thaJeztah/debug_relax 
docker info: fix condition for printing debug information
 2023-06-30 15:38:36 +02:00
Sebastiaan van Stijn 92d7a234dd docker info: fix condition for printing debug information 
The daemon collects this information regardless if "debug" is
enabled. Print the debugging information if either the daemon,
or the client has debug enabled.

We should probably improve this logic and print any of these if
set (but some special rules are needed for file-descriptors, which
may use "-1".

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
 2023-06-30 15:00:31 +02:00
Sebastiaan van StijnandGitHub cb1def79e5 Merge pull request #4389 from thaJeztah/remove_redundant_flag 
cli: SetupRootCommand: remove redundant flags return
 2023-06-28 18:25:16 +02:00
Sebastiaan van Stijn 88f44ec159 cli: SetupRootCommand: remove redundant flags return 
The flag-set that was returned is a pointer to the command's Flags(), which
is in itself passed by reference (as it is modified / set up).

This patch removes the flags return, to prevent assuming it's different than
the command's flags.

While SetupRootCommand is exported, a search showed that it's only used internally,
so changing the signature should not be a problem.

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
 2023-06-28 16:26:50 +02:00
Sebastiaan van StijnandGitHub d2b376da92 Merge pull request #4388 from thaJeztah/move_config_flag 
cli: move "config" flag to cli/flags/ClientOptions.InstallFlags()
 2023-06-28 16:26:33 +02:00
Sebastiaan van Stijn 3cad05fbf9 cli: move "config" flag to cli/flags/ClientOptions.InstallFlags() 
This flag was kept separate from the other flags, because at the time, the
CLI code and Daemon code still used the same codebase, and shared some parts.
This option only applied to the `docker` CLI, and thus was kept separate when
migrating to Cobra in https://github.com/moby/moby/commit/0452ff5a4dd1b8fba707235d6f12a4038208f34b

Now that this code is only used for the CLI (and plugins), we can move this
flag together with the other flags.

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
 2023-06-28 16:04:09 +02:00
Sebastiaan van StijnandGitHub 3403f277f2 Merge pull request #4383 from thaJeztah/update_engine 
vendor: docker/docker 7f8b1cd7f928dee54174d51dc9da17f443c31480 (v25.0-dev)
 2023-06-28 14:42:37 +02:00
Sebastiaan van StijnandGitHub 27bae1172a Merge pull request #4366 from thaJeztah/remove_deprecated_context_stubs 
cli/command/context: remove deprecated k8s / orchestrator option-stubs
 2023-06-28 14:42:18 +02:00
Sebastiaan van StijnandGitHub fcaf1def27 Merge pull request #4386 from thaJeztah/tls_const 
cli/flags: add EnvEnableTLS const for "DOCKER_TLS"
 2023-06-28 14:41:59 +02:00
Sebastiaan van StijnandGitHub 697bd4bebf Merge pull request #4378 from acim/master 
rename and update mergo module
 2023-06-28 14:17:24 +02:00
Sebastiaan van StijnandGitHub e382d43f20 Merge pull request #4384 from thaJeztah/config_sync 
cli/config: add synchronisation for configDir (Dir, SetDir)
 2023-06-28 14:11:36 +02:00
Sebastiaan van StijnandGitHub 8b4d29a453 Merge pull request #4385 from thaJeztah/config_envvar_const 
cli/config: add EnvOverrideConfigDir const
 2023-06-28 14:07:48 +02:00
Sebastiaan van Stijn 1c1329fc7e cli/flags: add EnvEnableTLS const for "DOCKER_TLS" 
Add a const to allow documenting the environment variable in code. The location
of this const is a bit "unfortunate", due to CLI and Client-config to be spread
over the cli/config, cli/config/configfile, and docker/docker/client packages
(some options are for the client, others for the CLI), and some reorganizing
may be useful for easier consumption.

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
 2023-06-28 13:56:24 +02:00
Sebastiaan van Stijn 0b3cadb056 cli/config: add EnvOverrideConfigDir const 
Add a const for the DOCKER_CONFIG to allow documenting its purpose
in code.

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
 2023-06-28 13:20:29 +02:00
Sebastiaan van Stijn 13e842a110 cli/config: add synchronisation for configDir (Dir, SetDir) 
commit 8a30653ed5 introduced a sync.Once
to allow for the config-directory (and home-dir) to be looked up lazily
instead of in an `init()`.

However, the package-level `configDir` variable can be set through two
separate paths; implicitly (through `config.Dir()`), and explicitly,
through `config.SetDir()`. The existing code had no synchronisation for
this, which could lead to a potential race-condition (code requesting
`config.Dir()` and code setting a custom path through `config.SetDir()`).

This patch adds synchronisation by triggering the `sync.Once` as part of
`config.SetDir()` to prevent it being triggered later (overwriting the
value that was set). It also restores the `resetConfigDir()` utility that
was removed in 379122b033, to allow resetting
the `sync.Once` for this test.

In general, we should get rid of this package-level variable, and store
it as a config on the client (passing the option to locations where its
used instead).

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
 2023-06-28 12:58:26 +02:00
Sebastiaan van Stijn 9f4af6cb7d vendor: docker/docker 7f8b1cd7f928dee54174d51dc9da17f443c31480 (v25.0-dev) 
full diff: https://github.com/docker/docker/compare/ed798d651a50...7f8b1cd7f928dee54174d51dc9da17f443c31480

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
 2023-06-27 16:33:21 +02:00
Sebastiaan van StijnandGitHub a26e6011f0 Merge pull request #4289 from dvdksn/docs/update-link-overlay-driver 
docs: update link location for the overlay driver
 2023-06-27 09:27:13 +02:00
Boban Acimovic b32264a1af rename and update mergo module 
Signed-off-by: Boban Acimovic <boban.acimovic@gmail.com>
 2023-06-26 22:25:52 +02:00
Sebastiaan van StijnandGitHub 605942cb2c Merge pull request #4374 from dvdksn/docs/run-staticip-subnet 
docs: fix static ip example, network needs a subnet
 2023-06-26 16:50:22 +02:00
David Karlsson 5936fd2a86 docs: fix static ip example, network needs a subnet 
Signed-off-by: David Karlsson <35727626+dvdksn@users.noreply.github.com>
 2023-06-26 15:42:50 +02:00
Sebastiaan van StijnandGitHub adc9d1f921 Merge pull request #4372 from dvdksn/docs/fix-broken-link 
docs: fix broken link
 2023-06-26 15:16:03 +02:00
David Karlsson b85d6a8f9e docs: fix broken link 
Signed-off-by: David Karlsson <35727626+dvdksn@users.noreply.github.com>
 2023-06-26 15:01:19 +02:00
Bjorn NeergaardandGitHub 6140a8c7b0 Merge pull request #4370 from thaJeztah/no_homedir 
cli/command/context: don't use pkg/homedir in test
 2023-06-26 06:11:58 -06:00
Sebastiaan van Stijn 79ff64f06d cli/command/context: don't use pkg/homedir in test 
I'm considering deprecating the "Key()" utility, as it was only
used in tests.

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
 2023-06-26 13:35:42 +02:00
Sebastiaan van StijnandGitHub 41384b0678 Merge pull request #4344 from dvdksn/docs/dockerd-runtimes-refresh 
docs: update the runtime configuration section
 2023-06-26 12:46:13 +02:00
David Karlsson 6c7d17fa01 docs: update the runtime configuration section 
Signed-off-by: David Karlsson <35727626+dvdksn@users.noreply.github.com>
 2023-06-22 21:14:44 +02:00
Sebastiaan van StijnandGitHub 87cc259b5e Merge pull request #4361 from thaJeztah/update_buildx_0.11 
Dockerfile: update buildx to v0.11.0
 2023-06-21 16:27:09 +02:00
Sebastiaan van StijnandGitHub 085d5c2816 Merge pull request #4343 from thaJeztah/cleanup_sprintf 
replace some basic uses of fmt.Sprintf(), and minor refactor
 2023-06-21 11:49:50 +02:00
Sebastiaan van StijnandGitHub c96484a114 Merge pull request #4346 from thaJeztah/build_errors 
build: error if Dockerfile name is passed with Dockerfile from stdin
 2023-06-21 11:48:12 +02:00