diff options
| author | OpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com> | 2022-02-23 13:07:00 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-02-23 13:07:00 -0500 |
| commit | 991c90de1fca66e7c99b864816d0292dd33b73dc (patch) | |
| tree | fc405d7a90ae4d3f755a4760c17f3d84e94550f7 /pkg/domain/infra | |
| parent | 113f855802176a4ffbe167304ab83942116a65f1 (diff) | |
| parent | fbbcb957c710ab817c969a8dc3ff3c46619604e2 (diff) | |
| download | podman-991c90de1fca66e7c99b864816d0292dd33b73dc.tar.gz podman-991c90de1fca66e7c99b864816d0292dd33b73dc.tar.bz2 podman-991c90de1fca66e7c99b864816d0292dd33b73dc.zip | |
Merge pull request #13314 from flouthoc/container-commit-squash
container-commit: support `--squash` to squash layers into one if users want.
Diffstat (limited to 'pkg/domain/infra')
| -rw-r--r-- | pkg/domain/infra/abi/containers.go | 1 | ||||
| -rw-r--r-- | pkg/domain/infra/tunnel/containers.go | 2 |
2 files changed, 2 insertions, 1 deletions
diff --git a/pkg/domain/infra/abi/containers.go b/pkg/domain/infra/abi/containers.go index 92f5b1a80..e6feb7c82 100644 --- a/pkg/domain/infra/abi/containers.go +++ b/pkg/domain/infra/abi/containers.go @@ -529,6 +529,7 @@ func (ic *ContainerEngine) ContainerCommit(ctx context.Context, nameOrID string, Message: options.Message, Changes: options.Changes, Author: options.Author, + Squash: options.Squash, } newImage, err := ctr.Commit(ctx, options.ImageName, opts) if err != nil { diff --git a/pkg/domain/infra/tunnel/containers.go b/pkg/domain/infra/tunnel/containers.go index aa4baf846..fe986361b 100644 --- a/pkg/domain/infra/tunnel/containers.go +++ b/pkg/domain/infra/tunnel/containers.go @@ -302,7 +302,7 @@ func (ic *ContainerEngine) ContainerCommit(ctx context.Context, nameOrID string, return nil, errors.Errorf("invalid image name %q", opts.ImageName) } } - options := new(containers.CommitOptions).WithAuthor(opts.Author).WithChanges(opts.Changes).WithComment(opts.Message) + options := new(containers.CommitOptions).WithAuthor(opts.Author).WithChanges(opts.Changes).WithComment(opts.Message).WithSquash(opts.Squash) options.WithFormat(opts.Format).WithPause(opts.Pause).WithRepo(repo).WithTag(tag) response, err := containers.Commit(ic.ClientCtx, nameOrID, options) if err != nil { |