diff options
| author | Matthew Heon <matthew.heon@pm.me> | 2019-12-05 15:11:40 -0500 |
|---|---|---|
| committer | Matthew Heon <matthew.heon@pm.me> | 2019-12-05 15:11:40 -0500 |
| commit | 60bfa305a88c686c91ebc0f8f98ac14405ae10cf (patch) | |
| tree | b83e8a8c2decb9fc831d818a6d10824115251b9e /libpod | |
| parent | c4fbd2fc9489b318298ada61e4f98d0097bc0b0d (diff) | |
| download | podman-60bfa305a88c686c91ebc0f8f98ac14405ae10cf.tar.gz podman-60bfa305a88c686c91ebc0f8f98ac14405ae10cf.tar.bz2 podman-60bfa305a88c686c91ebc0f8f98ac14405ae10cf.zip | |
Add ONBUILD support to --change
Return types had to change a bit for this, but since we can wrap
the old v1.ImageConfig, changes are overall not particularly bad.
At present, I believe this only works with commit, not import.
This matches how things were before we changed to the new parsing
so I think this is fine.
Signed-off-by: Matthew Heon <matthew.heon@pm.me>
Diffstat (limited to 'libpod')
| -rw-r--r-- | libpod/container_commit.go | 3 | ||||
| -rw-r--r-- | libpod/runtime_img.go | 3 |
2 files changed, 5 insertions, 1 deletions
diff --git a/libpod/container_commit.go b/libpod/container_commit.go index cab204546..a0ba57f4f 100644 --- a/libpod/container_commit.go +++ b/libpod/container_commit.go @@ -183,6 +183,9 @@ func (c *Container) Commit(ctx context.Context, destImage string, options Contai if newImageConfig.StopSignal != "" { importBuilder.SetStopSignal(newImageConfig.StopSignal) } + for _, onbuild := range newImageConfig.OnBuild { + importBuilder.SetOnBuild(onbuild) + } candidates, _, _, err := util.ResolveName(destImage, "", sc, c.runtime.store) if err != nil { diff --git a/libpod/runtime_img.go b/libpod/runtime_img.go index f2784c07d..abd8b581d 100644 --- a/libpod/runtime_img.go +++ b/libpod/runtime_img.go @@ -160,10 +160,11 @@ func (r *Runtime) Import(ctx context.Context, source string, reference string, c ic := v1.ImageConfig{} if len(changes) > 0 { - ic, err = util.GetImageConfig(changes) + config, err := util.GetImageConfig(changes) if err != nil { return "", errors.Wrapf(err, "error adding config changes to image %q", source) } + ic = config.ImageConfig } hist := []v1.History{ |