Skip to content

Remove "cli" package (step 1)#44642

Merged
thaJeztah merged 3 commits intomoby:masterfrom
thaJeztah:remote_cli_package_step1
Dec 15, 2022
Merged

Remove "cli" package (step 1)#44642
thaJeztah merged 3 commits intomoby:masterfrom
thaJeztah:remote_cli_package_step1

Conversation

@thaJeztah
Copy link
Member

@thaJeztah thaJeztah commented Dec 14, 2022

cli: remove unused Errors type

cli: move cobra customizations into cmd/dockerd

The cli package is a leftover from when the "docker" and "dockerd" cli
were both maintained in this repository; the only consumer of this is
now the dockerd CLI, so we can move this code (it should not be imported
by anyone).

cli: remove cli/config package, integrate into cmd/dockerd

The configDir (and "DOCKER_CONFIG" environment variable) is now only used
for the default location for TLS certificates to secure the daemon API.
It is a leftover from when the "docker" and "dockerd" CLI shared the same
binary, allowing the DOCKER_CONFIG environment variable to set the location
for certificates to be used by both.

This patch merges it into cmd/dockerd, which is where it was used.

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
The cli package is a leftover from when the "docker" and "dockerd" cli
were both maintained in this repository; the only consumer of this is
now the dockerd CLI, so we can move this code (it should not be imported
by anyone).

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
@thaJeztah thaJeztah added area/cli Client status/2-code-review area/daemon Core Engine kind/refactor PR's that refactor, or clean-up code labels Dec 14, 2022
@thaJeztah thaJeztah added this to the v-next milestone Dec 14, 2022
@thaJeztah

This comment was marked as resolved.

@thaJeztah thaJeztah force-pushed the remote_cli_package_step1 branch from 64973b4 to 23f85bb Compare December 14, 2022 11:47
The configDir (and "DOCKER_CONFIG" environment variable) is now only used
for the default location for TLS certificates to secure the daemon API.
It is a leftover from when the "docker" and "dockerd" CLI shared the same
binary, allowing the DOCKER_CONFIG environment variable to set the location
for certificates to be used by both.

This patch merges it into cmd/dockerd, which is where it was used.

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
@thaJeztah thaJeztah force-pushed the remote_cli_package_step1 branch from 23f85bb to ef7ab7b Compare December 14, 2022 11:52
@thaJeztah
Copy link
Member Author

@corhere @cpuguy83 ptal

@thaJeztah thaJeztah merged commit 0738791 into moby:master Dec 15, 2022
@thaJeztah thaJeztah deleted the remote_cli_package_step1 branch December 15, 2022 08:41
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

area/cli Client area/daemon Core Engine kind/refactor PR's that refactor, or clean-up code status/2-code-review

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants