1berry/docker-cli
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #5729 from thaJeztah/cleanup_plugin_install

Browse Source 
cli/command/plugin: runCreate: minor cleanup
This commit is contained in:
Sebastiaan van Stijn 2025-01-08 18:57:11 +01:00 committed by GitHub
commit ff4697d820
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 5 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
cli/command/plugin/create.go
View File

@ -4,7 +4,6 @@ import (
"context" "context"
"encoding/json" "encoding/json"
"fmt" "fmt"
"io"
"os" "os"
"path/filepath" "path/filepath"
@ -35,7 +34,7 @@ func validateConfig(path string) error {
m := types.PluginConfig{} m := types.PluginConfig{}
err = json.NewDecoder(dt).Decode(&m) err = json.NewDecoder(dt).Decode(&m)
dt.Close() _ = dt.Close()
return err return err
} }
@ -87,11 +86,6 @@ func newCreateCommand(dockerCli command.Cli) *cobra.Command {
} }
func runCreate(ctx context.Context, dockerCli command.Cli, options pluginCreateOptions) error { func runCreate(ctx context.Context, dockerCli command.Cli, options pluginCreateOptions) error {
var (
createCtx io.ReadCloser
err error
)
if err := validateTag(options.repoName); err != nil { if err := validateTag(options.repoName); err != nil {
return err return err
} }
@ -111,17 +105,17 @@ func runCreate(ctx context.Context, dockerCli command.Cli, options pluginCreateO
compression = archive.Gzip compression = archive.Gzip
} }
createCtx, err = archive.TarWithOptions(absContextDir, &archive.TarOptions{ createCtx, err := archive.TarWithOptions(absContextDir, &archive.TarOptions{
Compression: compression, Compression: compression,
}) })
if err != nil { if err != nil {
return err return err
} }
createOptions := types.PluginCreateOptions{RepoName: options.repoName} err = dockerCli.Client().PluginCreate(ctx, createCtx, types.PluginCreateOptions{RepoName: options.repoName})
if err = dockerCli.Client().PluginCreate(ctx, createCtx, createOptions); err != nil { if err != nil {
return err return err
} }
fmt.Fprintln(dockerCli.Out(), options.repoName) _, _ = fmt.Fprintln(dockerCli.Out(), options.repoName)
return nil return nil
} }