diff options
| author | OpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com> | 2019-10-24 01:07:43 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-10-24 01:07:43 +0200 |
| commit | 4b8832a9af85471bab64963bea42d8e54fad0877 (patch) | |
| tree | 6b480ba95e7588de1bdff548413a001e344b195a /pkg | |
| parent | 2e6c9aa4901b30653d814f4984663cf07fc5e57f (diff) | |
| parent | f60a814e4d9da87ac0dd5835b9a790a0b63f54b3 (diff) | |
| download | podman-4b8832a9af85471bab64963bea42d8e54fad0877.tar.gz podman-4b8832a9af85471bab64963bea42d8e54fad0877.tar.bz2 podman-4b8832a9af85471bab64963bea42d8e54fad0877.zip | |
Merge pull request #4298 from mheon/uid_gid_options
Add parsing for UID, GID in volume "o" option
Diffstat (limited to 'pkg')
| -rw-r--r-- | pkg/adapter/runtime.go | 7 | ||||
| -rw-r--r-- | pkg/varlinkapi/volumes.go | 6 |
2 files changed, 11 insertions, 2 deletions
diff --git a/pkg/adapter/runtime.go b/pkg/adapter/runtime.go index 0706d4b6a..84d43c337 100644 --- a/pkg/adapter/runtime.go +++ b/pkg/adapter/runtime.go @@ -186,7 +186,12 @@ func (r *LocalRuntime) CreateVolume(ctx context.Context, c *cliconfig.VolumeCrea } if len(opts) != 0 { - options = append(options, libpod.WithVolumeOptions(opts)) + // We need to process -o for uid, gid + parsedOptions, err := shared.ParseVolumeOptions(opts) + if err != nil { + return "", err + } + options = append(options, parsedOptions...) } newVolume, err := r.NewVolume(ctx, options...) if err != nil { diff --git a/pkg/varlinkapi/volumes.go b/pkg/varlinkapi/volumes.go index 0ba76902e..2dddd3008 100644 --- a/pkg/varlinkapi/volumes.go +++ b/pkg/varlinkapi/volumes.go @@ -24,7 +24,11 @@ func (i *LibpodAPI) VolumeCreate(call iopodman.VarlinkCall, options iopodman.Vol volumeOptions = append(volumeOptions, libpod.WithVolumeLabels(options.Labels)) } if len(options.Options) > 0 { - volumeOptions = append(volumeOptions, libpod.WithVolumeOptions(options.Options)) + parsedOptions, err := shared.ParseVolumeOptions(options.Options) + if err != nil { + return call.ReplyErrorOccurred(err.Error()) + } + volumeOptions = append(volumeOptions, parsedOptions...) } newVolume, err := i.Runtime.NewVolume(getContext(), volumeOptions...) if err != nil { |