fix: image push

go-zoox · Jul 31, 2024 · 7ac2179 · 7ac2179
1 parent 2cb6431
commit 7ac2179
Show file tree

Hide file tree

Showing 13 changed files with 91 additions and 49 deletions.
diff --git a/cmd/docker/image/build.go b/cmd/docker/image/build.go
@@ -44,7 +44,7 @@ func Build() *cli.Command {
 				return err
 			}
 
-			return client.Image().Build(ctx.Context, src, func(opt *image.BuildOption) {
+			return client.Image().Build(ctx.Context, src, func(opt *image.BuildConfig) {
 				opt.Dockerfile = ctx.String("file")
 				opt.Tags = ctx.StringSlice("tag")
 

diff --git a/cmd/docker/image/list.go b/cmd/docker/image/list.go
@@ -29,7 +29,7 @@ func List() *cli.Command {
 				return err
 			}
 
-			images, err := client.Image().List(ctx.Context, func(opt *image.ListOption) {
+			images, err := client.Image().List(ctx.Context, func(opt *image.ListConfig) {
 				opt.All = ctx.Bool("all")
 			})
 			if err != nil {

diff --git a/cmd/docker/image/push.go b/cmd/docker/image/push.go
@@ -0,0 +1,28 @@
+package image
+
+import (
+	"github.com/go-zoox/cli"
+	"github.com/go-zoox/core-utils/fmt"
+	"github.com/go-zoox/docker"
+)
+
+func Push() *cli.Command {
+	return &cli.Command{
+		Name:  "push",
+		Usage: "Push an image to a registry",
+		Flags: []cli.Flag{},
+		Action: func(ctx *cli.Context) error {
+			image := ctx.Args().First()
+			if image == "" {
+				return fmt.Errorf("image name is required")
+			}
+
+			client, err := docker.New()
+			if err != nil {
+				return err
+			}
+
+			return client.Image().Push(ctx.Context, image)
+		},
+	}
+}
diff --git a/cmd/docker/image/remove.go b/cmd/docker/image/remove.go
@@ -33,7 +33,7 @@ func Remove() *cli.Command {
 				return fmt.Errorf("container id is required")
 			}
 
-			imagesDeleted, err := client.Image().Remove(ctx.Context, imageID, func(opt *image.RemoveOption) {
+			imagesDeleted, err := client.Image().Remove(ctx.Context, imageID, func(opt *image.RemoveConfig) {
 				opt.Force = ctx.Bool("force")
 				opt.PruneChildren = ctx.Bool("no-prune")
 			})

diff --git a/cmd/docker/main.go b/cmd/docker/main.go
@@ -45,6 +45,7 @@ func main() {
 			image.Remove(),
 			//
 			image.Pull(),
+			image.Push(),
 			//
 			image.Build(),
 			//

diff --git a/image/build.go b/image/build.go
@@ -10,22 +10,22 @@ import (
 	"github.com/docker/docker/pkg/jsonmessage"
 )
 
-// BuildOption is the configuration for building a image
-type BuildOption = types.ImageBuildOptions
+// BuildConfig is the configuration for building a image
+type BuildConfig = types.ImageBuildOptions
 
 // Build builds a image
-func (i *image) Build(ctx context.Context, src string, opts ...func(opt *BuildOption)) error {
-	opt := &BuildOption{}
+func (i *image) Build(ctx context.Context, src string, opts ...func(cfg *BuildConfig)) error {
+	cfg := &BuildConfig{}
 	for _, o := range opts {
-		o(opt)
+		o(cfg)
 	}
 
 	tar, err := archive.TarWithOptions(src, &archive.TarOptions{})
 	if err != nil {
 		return err
 	}
 
-	response, err := i.client.ImageBuild(ctx, tar, *opt)
+	response, err := i.client.ImageBuild(ctx, tar, *cfg)
 	if err != nil {
 		return err
 	}

diff --git a/image/image.go b/image/image.go
@@ -11,16 +11,18 @@ import (
 
 // Image is the docker image client interface
 type Image interface {
-	List(ctx context.Context, opts ...func(opt *ListOption)) (images []entity.Image, err error)
-	Inspect(ctx context.Context, id string, opts ...func(opt *InspectOption)) (*types.ImageInspect, error)
-	Remove(ctx context.Context, id string, opts ...func(opt *RemoveOption)) ([]ti.DeleteResponse, error)
+	List(ctx context.Context, opts ...func(cfg *ListConfig)) (images []entity.Image, err error)
+	Inspect(ctx context.Context, id string, opts ...func(cfg *InspectConfig)) (*types.ImageInspect, error)
+	Remove(ctx context.Context, id string, opts ...func(cfg *RemoveConfig)) ([]ti.DeleteResponse, error)
+	//
+	Build(ctx context.Context, src string, opts ...func(cfg *BuildConfig)) error
+	//
+	Pull(ctx context.Context, name string, opts ...func(cfg *PullConfig)) error
+	Push(ctx context.Context, name string, opts ...func(cfg *PushConfig)) error
 	//
-	Build(ctx context.Context, src string, opts ...func(opt *BuildOption)) error
-	Pull(ctx context.Context, name string, opts ...func(opt *PullOption)) error
-	// Push(ctx context.Context, opts ...func(opt *PushOption)) error
 	Tag(ctx context.Context, source, target string) error
 	//
-	Prune(ctx context.Context, opts ...func(opt *PruneOption)) (types.ImagesPruneReport, error)
+	Prune(ctx context.Context, opts ...func(cfg *PruneConfig)) (types.ImagesPruneReport, error)
 }
 
 type image struct {

diff --git a/image/inspect.go b/image/inspect.go
@@ -6,13 +6,13 @@ import (
 	"github.com/docker/docker/api/types"
 )
 
-type InspectOption struct {
+type InspectConfig struct {
 }
 
-func (i *image) Inspect(ctx context.Context, id string, opts ...func(opt *InspectOption)) (*types.ImageInspect, error) {
-	opt := &InspectOption{}
+func (i *image) Inspect(ctx context.Context, id string, opts ...func(opt *InspectConfig)) (*types.ImageInspect, error) {
+	cfg := &InspectConfig{}
 	for _, o := range opts {
-		o(opt)
+		o(cfg)
 	}
 
 	inspect, _, err := i.client.ImageInspectWithRaw(ctx, id)

diff --git a/image/list.go b/image/list.go
@@ -10,7 +10,7 @@ import (
 	"github.com/go-zoox/docker/entity"
 )
 
-type ListOption struct {
+type ListConfig struct {
 	// All controls whether all images in the graph are filtered, or just
 	// the heads.
 	All bool
@@ -25,8 +25,8 @@ type ListOption struct {
 	ContainerCount bool
 }
 
-func (i *image) List(ctx context.Context, opts ...func(opt *ListOption)) (images []entity.Image, err error) {
-	opt := &ListOption{}
+func (i *image) List(ctx context.Context, opts ...func(opt *ListConfig)) (images []entity.Image, err error) {
+	opt := &ListConfig{}
 	for _, o := range opts {
 		o(opt)
 	}

diff --git a/image/prune.go b/image/prune.go
@@ -7,10 +7,10 @@ import (
 	"github.com/docker/docker/api/types/filters"
 )
 
-type PruneOption = filters.Args
+type PruneConfig = filters.Args
 
-func (i *image) Prune(ctx context.Context, opts ...func(opt *PruneOption)) (types.ImagesPruneReport, error) {
-	opt := &PruneOption{}
+func (i *image) Prune(ctx context.Context, opts ...func(opt *PruneConfig)) (types.ImagesPruneReport, error) {
+	opt := &PruneConfig{}
 	for _, o := range opts {
 		o(opt)
 	}

diff --git a/image/pull.go b/image/pull.go
@@ -13,8 +13,8 @@ import (
 	"github.com/docker/docker/pkg/jsonmessage"
 )
 
-// PullOption is the options for pulling an image
-type PullOption struct {
+// PullConfig is the options for pulling an image
+type PullConfig struct {
 	Auth struct {
 		Username string
 		Password string
@@ -25,19 +25,19 @@ type PullOption struct {
 }
 
 // Pull pulls an image
-func (i *image) Pull(ctx context.Context, name string, opts ...func(opt *PullOption)) error {
-	opt := &PullOption{
+func (i *image) Pull(ctx context.Context, name string, opts ...func(opt *PullConfig)) error {
+	cfg := &PullConfig{
 		Stdout: os.Stdout,
 	}
 	for _, o := range opts {
-		o(opt)
+		o(cfg)
 	}
 
 	auth := ""
-	if opt.Auth.Username != "" && opt.Auth.Password != "" {
+	if cfg.Auth.Username != "" && cfg.Auth.Password != "" {
 		authConfig := registry.AuthConfig{
-			Username: opt.Auth.Username,
-			Password: opt.Auth.Password,
+			Username: cfg.Auth.Username,
+			Password: cfg.Auth.Password,
 		}
 		encodedJSON, err := json.Marshal(authConfig)
 		if err != nil {
@@ -48,14 +48,14 @@ func (i *image) Pull(ctx context.Context, name string, opts ...func(opt *PullOpt
 
 	reader, err := i.client.ImagePull(ctx, name, dimage.PullOptions{
 		RegistryAuth: auth,
-		Platform:     opt.Platform,
+		Platform:     cfg.Platform,
 	})
 	if err != nil {
 		return err
 	}
 	defer reader.Close()
 
-	if err := jsonmessage.DisplayJSONMessagesToStream(reader, streams.NewOut(opt.Stdout), nil); err != nil {
+	if err := jsonmessage.DisplayJSONMessagesToStream(reader, streams.NewOut(cfg.Stdout), nil); err != nil {
 		return err
 	}
 

diff --git a/image/push.go b/image/push.go
@@ -6,29 +6,35 @@ import (
 	"encoding/json"
 	"io"
 	"os"
-	"time"
 
+	"github.com/docker/cli/cli/streams"
 	dimage "github.com/docker/docker/api/types/image"
 	"github.com/docker/docker/api/types/registry"
 	"github.com/docker/docker/client"
+	"github.com/docker/docker/pkg/jsonmessage"
 )
 
-// PushOption is the configuration for pushing an image
-type PushOption struct {
-	Name string
+// PushConfig is the configuration for pushing an image
+type PushConfig struct {
 	Auth struct {
 		Username string
 		Password string
 		Server   string
 	}
+
+	Stdout io.Writer
 }
 
 // Push pushes an image
-func Push(cfg *PushOption) error {
-	ctx, cancel := context.WithTimeout(context.Background(), 1*time.Hour)
-	defer cancel()
+func (i *image) Push(ctx context.Context, name string, opts ...func(cfg *PushConfig)) error {
+	cfg := &PushConfig{
+		Stdout: os.Stdout,
+	}
+	for _, o := range opts {
+		o(cfg)
+	}
 
-	auth := ""
+	auth := "no-auth" // @TODO fix: bad parameters and missing X-Registry-Auth: invalid X-Registry-Auth header: EOF
 	if cfg.Auth.Username != "" && cfg.Auth.Password != "" {
 		authConfig := registry.AuthConfig{
 			Username:      cfg.Auth.Username,
@@ -47,13 +53,18 @@ func Push(cfg *PushOption) error {
 		return err
 	}
 
-	reader, err := cli.ImagePush(ctx, cfg.Name, dimage.PushOptions{
+	reader, err := cli.ImagePush(ctx, name, dimage.PushOptions{
+		All:          true,
 		RegistryAuth: auth,
 	})
 	if err != nil {
 		return err
 	}
-	io.Copy(os.Stdout, reader)
+	defer reader.Close()
+
+	if err := jsonmessage.DisplayJSONMessagesToStream(reader, streams.NewOut(cfg.Stdout), nil); err != nil {
+		return err
+	}
 
 	return nil
 }
diff --git a/image/remove.go b/image/remove.go
@@ -6,13 +6,13 @@ import (
 	ti "github.com/docker/docker/api/types/image"
 )
 
-type RemoveOption struct {
+type RemoveConfig struct {
 	Force         bool
 	PruneChildren bool
 }
 
-func (i *image) Remove(ctx context.Context, id string, opts ...func(opt *RemoveOption)) ([]ti.DeleteResponse, error) {
-	opt := &RemoveOption{}
+func (i *image) Remove(ctx context.Context, id string, opts ...func(opt *RemoveConfig)) ([]ti.DeleteResponse, error) {
+	opt := &RemoveConfig{}
 	for _, o := range opts {
 		o(opt)
 	}