working commit

Makefile.am

@@ -150,17 +150,13 @@ EXTRA_mstored_SOURCES += \
 	pkg/auxutar/utar.go \
 	pkg/auxuuid/uuid.go \
 	pkg/auxx509/x509cert.go \
-	pkg/client/account.go \
 	pkg/client/client.go \
-	pkg/client/grant.go \
-	pkg/client/httpcall.go \
 	pkg/client/imageaux.go \
 	pkg/client/imagedelete.go \
 	pkg/client/imageinfo.go \
 	pkg/client/imagepull.go \
 	pkg/client/imagepush.go \
 	pkg/client/servaux.go \
-	pkg/client/service.go \
 	pkg/descr/account.go \
 	pkg/descr/blob.go \
 	pkg/descr/file.go \

Makefile.in

@@ -432,12 +432,10 @@ EXTRA_mstored_SOURCES = cmd/mstored/starter/starter.go \
 	pkg/auxtool/fileex.go pkg/auxtool/randstr.go \
 	pkg/auxtool/tmpfile.go pkg/auxtool/unixnow.go \
 	pkg/auxutar/utar.go pkg/auxuuid/uuid.go \
-	pkg/auxx509/x509cert.go pkg/client/account.go \
-	pkg/client/client.go pkg/client/grant.go \
-	pkg/client/httpcall.go pkg/client/imageaux.go \
-	pkg/client/imagedelete.go pkg/client/imageinfo.go \
-	pkg/client/imagepull.go pkg/client/imagepush.go \
-	pkg/client/servaux.go pkg/client/service.go \
+	pkg/auxx509/x509cert.go pkg/client/client.go \
+	pkg/client/imageaux.go pkg/client/imagedelete.go \
+	pkg/client/imageinfo.go pkg/client/imagepull.go \
+	pkg/client/imagepush.go pkg/client/servaux.go \
 	pkg/descr/account.go pkg/descr/blob.go pkg/descr/file.go \
 	pkg/descr/grant.go pkg/descr/manifest.go pkg/descr/server.go \
 	pkg/digest/digest.go pkg/filecli/authbas.go \

app/config/variant.go

@@ -6,5 +6,5 @@ const (
 	logdir  = "/home/ziggi/mstore2/tmp/log"
 	datadir = "/home/ziggi/mstore2/tmp/data"
 	version = "0.2.0"
-        srvname = "mstored"
+	srvname = "mstored"
 )

cmd/mstorectl/imagecmd/catimages.go

@@ -0,0 +1,57 @@
+/*
+ * Copyright 2026 Oleg Borodin <onborodin@gmail.com>
+ *
+ * This work is published and licensed under a Creative Commons
+ * Attribution-NonCommercial-NoDerivatives 4.0 International License.
+ *
+ * Distribution of this work is permitted, but commercial use and
+ * modifications are strictly prohibited.
+ */
+package imagecmd
+
+import (
+	"context"
+	"time"
+
+	"github.com/spf13/cobra"
+
+	"mstore/pkg/client"
+)
+
+// CatalogImages
+type CatalogImagesParams struct {
+	Source string
+}
+
+type CatalogImagesResult struct {
+	Repositories []string `json:"repositories"`
+}
+
+func (util *ImageUtil) CatalogImages(cmd *cobra.Command, args []string) {
+	util.catalogImagesParams.Source = args[0]
+	res, err := util.catalogImages(&util.commonImageParams, &util.catalogImagesParams)
+	printResponse(res, err)
+}
+
+func (util *ImageUtil) catalogImages(common *CommonImageParams, params *CatalogImagesParams) (*CatalogImagesResult, error) {
+	var err error
+	res := &CatalogImagesResult{
+		Repositories: make([]string, 0),
+	}
+	ctx := context.Background()
+
+	cli := client.NewClient(common.SkipTLSVerify)
+	timeout := time.Duration(common.Timeout) * time.Second
+
+	params.Source, err = packUserinfo(params.Source, common.Username, common.Password)
+	if err != nil {
+		return res, err
+	}
+	ctx, _ = context.WithTimeout(ctx, timeout)
+	opres, err := cli.CatalogImages(ctx, params.Source)
+	if err != nil {
+		return res, err
+	}
+	res.Repositories = opres
+	return res, err
+}

cmd/mstorectl/imagecmd/delimage.go

@@ -0,0 +1,53 @@
+/*
+ * Copyright 2026 Oleg Borodin <onborodin@gmail.com>
+ *
+ * This work is published and licensed under a Creative Commons
+ * Attribution-NonCommercial-NoDerivatives 4.0 International License.
+ *
+ * Distribution of this work is permitted, but commercial use and
+ * modifications are strictly prohibited.
+ */
+package imagecmd
+
+import (
+	"context"
+	"time"
+
+	"github.com/spf13/cobra"
+
+	"mstore/pkg/client"
+)
+
+// DeleteImage
+type DeleteImageParams struct {
+	Imagepath string
+}
+
+type DeleteImageResult struct {
+}
+
+func (util *ImageUtil) DeleteImage(cmd *cobra.Command, args []string) {
+	util.deleteImageParams.Imagepath = args[0]
+	res, err := util.deleteImage(&util.commonImageParams, &util.deleteImageParams)
+	printResponse(res, err)
+}
+
+func (util *ImageUtil) deleteImage(common *CommonImageParams, params *DeleteImageParams) (*DeleteImageResult, error) {
+	var err error
+	res := &DeleteImageResult{}
+	ctx := context.Background()
+
+	cli := client.NewClient(common.SkipTLSVerify)
+	timeout := time.Duration(common.Timeout) * time.Second
+
+	params.Imagepath, err = packUserinfo(params.Imagepath, common.Username, common.Password)
+	if err != nil {
+		return res, err
+	}
+	ctx, _ = context.WithTimeout(ctx, timeout)
+	err = cli.DeleteImage(ctx, params.Imagepath)
+	if err != nil {
+		return res, err
+	}
+	return res, err
+}

cmd/mstorectl/imagecmd/imagecmd.go

@@ -10,22 +10,12 @@
 package imagecmd
 
 import (
-	"context"
-	"encoding/json"
-	"fmt"
 	"net/url"
-	"os"
 	"path"
 	"strings"
-	"time"
 
 	"github.com/spf13/cobra"
 	"github.com/spf13/viper"
-
-	"mstore/pkg/client"
-	"mstore/pkg/repocli"
-
-	ocispec "github.com/opencontainers/image-spec/specs-go/v1"
 )
 
 func packUserinfo(resurseuri, username, password string) (string, error) {
@@ -150,289 +140,3 @@ type CommonImageParams struct {
 	Password      string
 	SkipTLSVerify bool
 }
-
-// PushImage
-type PushImageParams struct {
-	Imagepath string
-	Filepath  string
-}
-
-type PushImageResult struct{}
-
-func (util *ImageUtil) PushImage(cmd *cobra.Command, args []string) {
-	util.pushImageParams.Filepath = args[0]
-	util.pushImageParams.Imagepath = args[1]
-
-	res, err := util.pushImage(&util.commonImageParams, &util.pushImageParams)
-	printResponse(res, err)
-}
-
-func (util *ImageUtil) pushImage(common *CommonImageParams, params *PushImageParams) (*PushImageResult, error) {
-	var err error
-	ctx := context.Background()
-	res := &PushImageResult{}
-
-	cli := client.NewClient(common.SkipTLSVerify)
-	timeout := time.Duration(common.Timeout) * time.Second
-	params.Imagepath, err = packUserinfo(params.Imagepath, common.Username, common.Password)
-	if err != nil {
-		return res, err
-	}
-	ctx, _ = context.WithTimeout(ctx, timeout)
-	err = cli.PushImage(ctx, params.Filepath, params.Imagepath)
-	if err != nil {
-		return res, err
-	}
-	return res, err
-}
-
-// PullImage
-type PullImageParams struct {
-	Imagepath string
-	Filepath  string
-}
-
-type PullImageResult struct {
-	Filepath string `json:"filepath"`
-	Size     int64  `json:"size"`
-}
-
-func (util *ImageUtil) PullImage(cmd *cobra.Command, args []string) {
-	util.pullImageParams.Imagepath = args[0]
-	util.pullImageParams.Filepath = args[1]
-	res, err := util.pullImage(&util.commonImageParams, &util.pullImageParams)
-	printResponse(res, err)
-}
-
-func (util *ImageUtil) pullImage(common *CommonImageParams, params *PullImageParams) (*PullImageResult, error) {
-	var err error
-
-	ctx := context.Background()
-	res := &PullImageResult{}
-
-	cli := client.NewClient(common.SkipTLSVerify)
-	timeout := time.Duration(common.Timeout) * time.Second
-	params.Imagepath, err = packUserinfo(params.Imagepath, common.Username, common.Password)
-	if err != nil {
-		return res, err
-	}
-	ctx, _ = context.WithTimeout(ctx, timeout)
-	err = cli.PullImage(ctx, params.Imagepath, params.Filepath)
-	if err != nil {
-		return res, err
-	}
-	filestat, err := os.Stat(params.Filepath)
-	if err != nil {
-		return res, err
-	}
-	res.Size = filestat.Size()
-	res.Filepath = params.Filepath
-
-	return res, err
-}
-
-// DeleteImage
-type DeleteImageParams struct {
-	Imagepath string
-}
-
-type DeleteImageResult struct {
-}
-
-func (util *ImageUtil) DeleteImage(cmd *cobra.Command, args []string) {
-	util.deleteImageParams.Imagepath = args[0]
-	res, err := util.deleteImage(&util.commonImageParams, &util.deleteImageParams)
-	printResponse(res, err)
-}
-
-func (util *ImageUtil) deleteImage(common *CommonImageParams, params *DeleteImageParams) (*DeleteImageResult, error) {
-	var err error
-	res := &DeleteImageResult{}
-	ctx := context.Background()
-
-	cli := client.NewClient(common.SkipTLSVerify)
-	timeout := time.Duration(common.Timeout) * time.Second
-
-	params.Imagepath, err = packUserinfo(params.Imagepath, common.Username, common.Password)
-	if err != nil {
-		return res, err
-	}
-	ctx, _ = context.WithTimeout(ctx, timeout)
-	err = cli.DeleteImage(ctx, params.Imagepath)
-	if err != nil {
-		return res, err
-	}
-	return res, err
-}
-
-// ImageManifest
-type ImageManifestParams struct {
-	Imagepath string
-}
-
-type ImageManifestResult struct {
-	Index    *ocispec.Index    `json:"index,omitempty"`
-	Manifest *ocispec.Manifest `json:"manifest,omitempty"`
-}
-
-func (util *ImageUtil) ImageManifest(cmd *cobra.Command, args []string) {
-	util.imageManifestParams.Imagepath = args[0]
-	res, err := util.imageManifest(&util.commonImageParams, &util.imageManifestParams)
-	printResponse(res, err)
-}
-
-func (util *ImageUtil) imageManifest(common *CommonImageParams, params *ImageManifestParams) (*ImageManifestResult, error) {
-	var err error
-	res := &ImageManifestResult{
-		Index:    &ocispec.Index{},
-		Manifest: &ocispec.Manifest{},
-	}
-	params.Imagepath, err = packUserinfo(params.Imagepath, common.Username, common.Password)
-	if err != nil {
-		return res, err
-	}
-	timeout := time.Duration(common.Timeout) * time.Second
-	ctx, _ := context.WithTimeout(context.Background(), timeout)
-	ref, err := repocli.ParseReference(params.Imagepath)
-	if err != nil {
-		return res, err
-	}
-	mw := repocli.NewBasicAuthMiddleware(ref.Userinfo())
-	cli := repocli.NewClientWithTransport(nil, mw)
-	exists, mime, man, err := cli.GetManifest(ctx, ref.Repo(), ref.Tag())
-	if !exists {
-		err = fmt.Errorf("Manifest not found")
-		return res, err
-
-	}
-	switch mime {
-	case repocli.MediaTypeDDMLv2, repocli.MediaTypeOIIv1:
-		err = json.Unmarshal(man, res.Index)
-		if err != nil {
-			return res, err
-		}
-	case repocli.MediaTypeDDMv2, repocli.MediaTypeOIMv1:
-		err = json.Unmarshal(man, res.Manifest)
-		if err != nil {
-			return res, err
-		}
-	default:
-		err = fmt.Errorf("Unknown content type: %s", mime)
-		return res, err
-	}
-	return res, err
-}
-
-// ImageTags
-type ImageTagsParams struct {
-	Imagepath string
-}
-
-type ImageTagsResult struct {
-	ImageTags []string `json:"imageTags"`
-}
-
-func (util *ImageUtil) ImageTags(cmd *cobra.Command, args []string) {
-	util.imageTagsParams.Imagepath = args[0]
-	res, err := util.imageTags(&util.commonImageParams, &util.imageTagsParams)
-	printResponse(res, err)
-}
-
-func (util *ImageUtil) imageTags(common *CommonImageParams, params *ImageTagsParams) (*ImageTagsResult, error) {
-	var err error
-	res := &ImageTagsResult{
-		ImageTags: make([]string, 0),
-	}
-	ctx := context.Background()
-
-	cli := client.NewClient(common.SkipTLSVerify)
-	timeout := time.Duration(common.Timeout) * time.Second
-
-	params.Imagepath, err = packUserinfo(params.Imagepath, common.Username, common.Password)
-	if err != nil {
-		return res, err
-	}
-	ctx, _ = context.WithTimeout(ctx, timeout)
-	opres, err := cli.ImageTags(ctx, params.Imagepath)
-	if err != nil {
-		return res, err
-	}
-	res.ImageTags = opres
-	return res, err
-}
-
-// ImageConfig
-type ImageConfigParams struct {
-	Imagepath string
-}
-
-type ImageConfigResult struct {
-	ImageConfig *ocispec.Image `json:"imageConfig"`
-}
-
-func (util *ImageUtil) ImageConfig(cmd *cobra.Command, args []string) {
-	util.imageConfigParams.Imagepath = args[0]
-	res, err := util.imageConfig(&util.commonImageParams, &util.imageConfigParams)
-	printResponse(res, err)
-}
-
-func (util *ImageUtil) imageConfig(common *CommonImageParams, params *ImageConfigParams) (*ImageConfigResult, error) {
-	var err error
-	res := &ImageConfigResult{
-		ImageConfig: &ocispec.Image{},
-	}
-	ctx := context.Background()
-
-	cli := client.NewClient(common.SkipTLSVerify)
-	timeout := time.Duration(common.Timeout) * time.Second
-
-	params.Imagepath, err = packUserinfo(params.Imagepath, common.Username, common.Password)
-	if err != nil {
-		return res, err
-	}
-	ctx, _ = context.WithTimeout(ctx, timeout)
-	opres, err := cli.ImageConfig(ctx, params.Imagepath)
-	if err != nil {
-		return res, err
-	}
-	res.ImageConfig = opres
-	return res, err
-}
-
-// CatalogImages
-type CatalogImagesParams struct {
-	Source string
-}
-
-type CatalogImagesResult struct {
-	Repositories []string `json:"repositories"`
-}
-
-func (util *ImageUtil) CatalogImages(cmd *cobra.Command, args []string) {
-	util.catalogImagesParams.Source = args[0]
-	res, err := util.catalogImages(&util.commonImageParams, &util.catalogImagesParams)
-	printResponse(res, err)
-}
-
-func (util *ImageUtil) catalogImages(common *CommonImageParams, params *CatalogImagesParams) (*CatalogImagesResult, error) {
-	var err error
-	res := &CatalogImagesResult{
-		Repositories: make([]string, 0),
-	}
-	ctx := context.Background()
-
-	cli := client.NewClient(common.SkipTLSVerify)
-	timeout := time.Duration(common.Timeout) * time.Second
-
-	params.Source, err = packUserinfo(params.Source, common.Username, common.Password)
-	if err != nil {
-		return res, err
-	}
-	ctx, _ = context.WithTimeout(ctx, timeout)
-	opres, err := cli.CatalogImages(ctx, params.Source)
-	if err != nil {
-		return res, err
-	}
-	res.Repositories = opres
-	return res, err
-}

cmd/mstorectl/imagecmd/imageconf.go

@@ -0,0 +1,59 @@
+/*
+ * Copyright 2026 Oleg Borodin <onborodin@gmail.com>
+ *
+ * This work is published and licensed under a Creative Commons
+ * Attribution-NonCommercial-NoDerivatives 4.0 International License.
+ *
+ * Distribution of this work is permitted, but commercial use and
+ * modifications are strictly prohibited.
+ */
+package imagecmd
+
+import (
+	"context"
+	"time"
+
+	"github.com/spf13/cobra"
+
+	"mstore/pkg/client"
+
+	ocispec "github.com/opencontainers/image-spec/specs-go/v1"
+)
+
+// ImageConfig
+type ImageConfigParams struct {
+	Imagepath string
+}
+
+type ImageConfigResult struct {
+	ImageConfig *ocispec.Image `json:"imageConfig"`
+}
+
+func (util *ImageUtil) ImageConfig(cmd *cobra.Command, args []string) {
+	util.imageConfigParams.Imagepath = args[0]
+	res, err := util.imageConfig(&util.commonImageParams, &util.imageConfigParams)
+	printResponse(res, err)
+}
+
+func (util *ImageUtil) imageConfig(common *CommonImageParams, params *ImageConfigParams) (*ImageConfigResult, error) {
+	var err error
+	res := &ImageConfigResult{
+		ImageConfig: &ocispec.Image{},
+	}
+	ctx := context.Background()
+
+	cli := client.NewClient(common.SkipTLSVerify)
+	timeout := time.Duration(common.Timeout) * time.Second
+
+	params.Imagepath, err = packUserinfo(params.Imagepath, common.Username, common.Password)
+	if err != nil {
+		return res, err
+	}
+	ctx, _ = context.WithTimeout(ctx, timeout)
+	opres, err := cli.ImageConfig(ctx, params.Imagepath)
+	if err != nil {
+		return res, err
+	}
+	res.ImageConfig = opres
+	return res, err
+}

cmd/mstorectl/imagecmd/imageman.go

@@ -0,0 +1,81 @@
+/*
+ * Copyright 2026 Oleg Borodin <onborodin@gmail.com>
+ *
+ * This work is published and licensed under a Creative Commons
+ * Attribution-NonCommercial-NoDerivatives 4.0 International License.
+ *
+ * Distribution of this work is permitted, but commercial use and
+ * modifications are strictly prohibited.
+ */
+package imagecmd
+
+import (
+	"context"
+	"encoding/json"
+	"fmt"
+	"time"
+
+	"github.com/spf13/cobra"
+
+	"mstore/pkg/repocli"
+
+	ocispec "github.com/opencontainers/image-spec/specs-go/v1"
+)
+
+// ImageManifest
+type ImageManifestParams struct {
+	Imagepath string
+}
+
+type ImageManifestResult struct {
+	Index    *ocispec.Index    `json:"index,omitempty"`
+	Manifest *ocispec.Manifest `json:"manifest,omitempty"`
+}
+
+func (util *ImageUtil) ImageManifest(cmd *cobra.Command, args []string) {
+	util.imageManifestParams.Imagepath = args[0]
+	res, err := util.imageManifest(&util.commonImageParams, &util.imageManifestParams)
+	printResponse(res, err)
+}
+
+func (util *ImageUtil) imageManifest(common *CommonImageParams, params *ImageManifestParams) (*ImageManifestResult, error) {
+	var err error
+	res := &ImageManifestResult{
+		Index:    &ocispec.Index{},
+		Manifest: &ocispec.Manifest{},
+	}
+	params.Imagepath, err = packUserinfo(params.Imagepath, common.Username, common.Password)
+	if err != nil {
+		return res, err
+	}
+	timeout := time.Duration(common.Timeout) * time.Second
+	ctx, _ := context.WithTimeout(context.Background(), timeout)
+	ref, err := repocli.ParseReference(params.Imagepath)
+	if err != nil {
+		return res, err
+	}
+	mw := repocli.NewBasicAuthMiddleware(ref.Userinfo())
+	cli := repocli.NewClientWithTransport(nil, mw)
+	exists, mime, man, err := cli.GetManifest(ctx, ref.Repo(), ref.Tag())
+	if !exists {
+		err = fmt.Errorf("Manifest not found")
+		return res, err
+
+	}
+	switch mime {
+	case repocli.MediaTypeDDMLv2, repocli.MediaTypeOIIv1:
+		err = json.Unmarshal(man, res.Index)
+		if err != nil {
+			return res, err
+		}
+	case repocli.MediaTypeDDMv2, repocli.MediaTypeOIMv1:
+		err = json.Unmarshal(man, res.Manifest)
+		if err != nil {
+			return res, err
+		}
+	default:
+		err = fmt.Errorf("Unknown content type: %s", mime)
+		return res, err
+	}
+	return res, err
+}

cmd/mstorectl/imagecmd/imagetags.go

@@ -0,0 +1,57 @@
+/*
+ * Copyright 2026 Oleg Borodin <onborodin@gmail.com>
+ *
+ * This work is published and licensed under a Creative Commons
+ * Attribution-NonCommercial-NoDerivatives 4.0 International License.
+ *
+ * Distribution of this work is permitted, but commercial use and
+ * modifications are strictly prohibited.
+ */
+package imagecmd
+
+import (
+	"context"
+	"time"
+
+	"github.com/spf13/cobra"
+
+	"mstore/pkg/client"
+)
+
+// ImageTags
+type ImageTagsParams struct {
+	Imagepath string
+}
+
+type ImageTagsResult struct {
+	ImageTags []string `json:"imageTags"`
+}
+
+func (util *ImageUtil) ImageTags(cmd *cobra.Command, args []string) {
+	util.imageTagsParams.Imagepath = args[0]
+	res, err := util.imageTags(&util.commonImageParams, &util.imageTagsParams)
+	printResponse(res, err)
+}
+
+func (util *ImageUtil) imageTags(common *CommonImageParams, params *ImageTagsParams) (*ImageTagsResult, error) {
+	var err error
+	res := &ImageTagsResult{
+		ImageTags: make([]string, 0),
+	}
+	ctx := context.Background()
+
+	cli := client.NewClient(common.SkipTLSVerify)
+	timeout := time.Duration(common.Timeout) * time.Second
+
+	params.Imagepath, err = packUserinfo(params.Imagepath, common.Username, common.Password)
+	if err != nil {
+		return res, err
+	}
+	ctx, _ = context.WithTimeout(ctx, timeout)
+	opres, err := cli.ImageTags(ctx, params.Imagepath)
+	if err != nil {
+		return res, err
+	}
+	res.ImageTags = opres
+	return res, err
+}

cmd/mstorectl/imagecmd/pullimage.go

@@ -0,0 +1,65 @@
+/*
+ * Copyright 2026 Oleg Borodin <onborodin@gmail.com>
+ *
+ * This work is published and licensed under a Creative Commons
+ * Attribution-NonCommercial-NoDerivatives 4.0 International License.
+ *
+ * Distribution of this work is permitted, but commercial use and
+ * modifications are strictly prohibited.
+ */
+package imagecmd
+
+import (
+	"context"
+	"os"
+	"time"
+
+	"github.com/spf13/cobra"
+
+	"mstore/pkg/client"
+)
+
+// PullImage
+type PullImageParams struct {
+	Imagepath string
+	Filepath  string
+}
+
+type PullImageResult struct {
+	Filepath string `json:"filepath"`
+	Size     int64  `json:"size"`
+}
+
+func (util *ImageUtil) PullImage(cmd *cobra.Command, args []string) {
+	util.pullImageParams.Imagepath = args[0]
+	util.pullImageParams.Filepath = args[1]
+	res, err := util.pullImage(&util.commonImageParams, &util.pullImageParams)
+	printResponse(res, err)
+}
+
+func (util *ImageUtil) pullImage(common *CommonImageParams, params *PullImageParams) (*PullImageResult, error) {
+	var err error
+
+	ctx := context.Background()
+	res := &PullImageResult{}
+
+	cli := client.NewClient(common.SkipTLSVerify)
+	timeout := time.Duration(common.Timeout) * time.Second
+	params.Imagepath, err = packUserinfo(params.Imagepath, common.Username, common.Password)
+	if err != nil {
+		return res, err
+	}
+	ctx, _ = context.WithTimeout(ctx, timeout)
+	err = cli.PullImage(ctx, params.Imagepath, params.Filepath)
+	if err != nil {
+		return res, err
+	}
+	filestat, err := os.Stat(params.Filepath)
+	if err != nil {
+		return res, err
+	}
+	res.Size = filestat.Size()
+	res.Filepath = params.Filepath
+
+	return res, err
+}

cmd/mstorectl/imagecmd/pushimage.go

@@ -0,0 +1,54 @@
+/*
+ * Copyright 2026 Oleg Borodin <onborodin@gmail.com>
+ *
+ * This work is published and licensed under a Creative Commons
+ * Attribution-NonCommercial-NoDerivatives 4.0 International License.
+ *
+ * Distribution of this work is permitted, but commercial use and
+ * modifications are strictly prohibited.
+ */
+package imagecmd
+
+import (
+	"context"
+	"time"
+
+	"github.com/spf13/cobra"
+
+	"mstore/pkg/client"
+)
+
+// PushImage
+type PushImageParams struct {
+	Imagepath string
+	Filepath  string
+}
+
+type PushImageResult struct{}
+
+func (util *ImageUtil) PushImage(cmd *cobra.Command, args []string) {
+	util.pushImageParams.Filepath = args[0]
+	util.pushImageParams.Imagepath = args[1]
+
+	res, err := util.pushImage(&util.commonImageParams, &util.pushImageParams)
+	printResponse(res, err)
+}
+
+func (util *ImageUtil) pushImage(common *CommonImageParams, params *PushImageParams) (*PushImageResult, error) {
+	var err error
+	ctx := context.Background()
+	res := &PushImageResult{}
+
+	cli := client.NewClient(common.SkipTLSVerify)
+	timeout := time.Duration(common.Timeout) * time.Second
+	params.Imagepath, err = packUserinfo(params.Imagepath, common.Username, common.Password)
+	if err != nil {
+		return res, err
+	}
+	ctx, _ = context.WithTimeout(ctx, timeout)
+	err = cli.PushImage(ctx, params.Filepath, params.Imagepath)
+	if err != nil {
+		return res, err
+	}
+	return res, err
+}