diff options
| author | OpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com> | 2019-12-06 04:09:06 -0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-12-06 04:09:06 -0800 |
| commit | 8924a302a2470abc56e7d9ef64e0b29ba5b6db0d (patch) | |
| tree | cf6a96d812167f9488e5d4ea9d1fbe272df7acfd /libpod/runtime_img.go | |
| parent | e9c48206019be6b95b5cc8700945b773a857ae26 (diff) | |
| parent | 60bfa305a88c686c91ebc0f8f98ac14405ae10cf (diff) | |
| download | podman-8924a302a2470abc56e7d9ef64e0b29ba5b6db0d.tar.gz podman-8924a302a2470abc56e7d9ef64e0b29ba5b6db0d.tar.bz2 podman-8924a302a2470abc56e7d9ef64e0b29ba5b6db0d.zip | |
Merge pull request #4563 from mheon/fix_change_parsing
Fix parsing for arrays of values in image changes
Diffstat (limited to 'libpod/runtime_img.go')
| -rw-r--r-- | libpod/runtime_img.go | 3 |
1 files changed, 2 insertions, 1 deletions
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{ |