diff options
| author | OpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com> | 2020-12-23 16:40:22 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-12-23 16:40:22 +0100 |
| commit | 0778c114d3001bdd4f40fe46283457481d983b64 (patch) | |
| tree | 8f7899db5c874eed3a8fc4de1a4d6c551530572f /libpod | |
| parent | 3728ca9e8ded1b63b0f90f3ca5fbf0dc681b1f5d (diff) | |
| parent | 28138dafcc391b0d03633ee9c8e23ebc229842ba (diff) | |
| download | podman-0778c114d3001bdd4f40fe46283457481d983b64.tar.gz podman-0778c114d3001bdd4f40fe46283457481d983b64.tar.bz2 podman-0778c114d3001bdd4f40fe46283457481d983b64.zip | |
Merge pull request #8793 from zhangguanzhang/vol-op
Fix missing options in volume's display while setting uid and gid
Diffstat (limited to 'libpod')
| -rw-r--r-- | libpod/options.go | 2 | ||||
| -rw-r--r-- | libpod/runtime_volume_linux.go | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/libpod/options.go b/libpod/options.go index c2db13560..1ef058cc8 100644 --- a/libpod/options.go +++ b/libpod/options.go @@ -1593,7 +1593,7 @@ func WithVolumeOptions(options map[string]string) VolumeCreateOption { volume.config.Options = make(map[string]string) for key, value := range options { switch key { - case "type", "device", "o": + case "type", "device", "o", "UID", "GID": volume.config.Options[key] = value default: return errors.Wrapf(define.ErrInvalidArg, "unrecognized volume option %q is not supported with local driver", key) diff --git a/libpod/runtime_volume_linux.go b/libpod/runtime_volume_linux.go index e1877b17d..9bf0fd108 100644 --- a/libpod/runtime_volume_linux.go +++ b/libpod/runtime_volume_linux.go @@ -58,7 +58,7 @@ func (r *Runtime) newVolume(ctx context.Context, options ...VolumeCreateOption) // Validate options for key := range volume.config.Options { switch key { - case "device", "o", "type": + case "device", "o", "type", "UID", "GID": // Do nothing, valid keys default: return nil, errors.Wrapf(define.ErrInvalidArg, "invalid mount option %s for driver 'local'", key) |