diff options
| author | openshift-ci[bot] <75433959+openshift-ci[bot]@users.noreply.github.com> | 2021-08-17 19:05:42 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-08-17 19:05:42 +0000 |
| commit | a7a55ea7fb18bdcda8c310fadcacb77dd2a9e90a (patch) | |
| tree | 3bb2ab6ca5c946979026e16589959cdb0180a858 /libpod | |
| parent | 7abc8d40d01541766387b61893b3ec80770556a6 (diff) | |
| parent | 1f632f35727f91558049d3b7ee78d9952c8bddb2 (diff) | |
| download | podman-a7a55ea7fb18bdcda8c310fadcacb77dd2a9e90a.tar.gz podman-a7a55ea7fb18bdcda8c310fadcacb77dd2a9e90a.tar.bz2 podman-a7a55ea7fb18bdcda8c310fadcacb77dd2a9e90a.zip | |
Merge pull request #11231 from flouthoc/move-volume-dest-to-server
volume: move validating volume dest from client to server.
Diffstat (limited to 'libpod')
| -rw-r--r-- | libpod/options.go | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/libpod/options.go b/libpod/options.go index b94ef88ba..59aec66c6 100644 --- a/libpod/options.go +++ b/libpod/options.go @@ -268,7 +268,7 @@ func WithRegistriesConf(path string) RuntimeOption { logrus.Debugf("Setting custom registries.conf: %q", path) return func(rt *Runtime) error { if _, err := os.Stat(path); err != nil { - return errors.Wrap(err, "error locating specified registries.conf") + return errors.Wrap(err, "locating specified registries.conf") } if rt.imageContext == nil { rt.imageContext = &types.SystemContext{ @@ -1453,7 +1453,7 @@ func WithNamedVolumes(volumes []*ContainerNamedVolume) CtrCreateOption { for _, vol := range volumes { mountOpts, err := util.ProcessOptions(vol.Options, false, "") if err != nil { - return errors.Wrapf(err, "error processing options for named volume %q mounted at %q", vol.Name, vol.Dest) + return errors.Wrapf(err, "processing options for named volume %q mounted at %q", vol.Name, vol.Dest) } ctr.config.NamedVolumes = append(ctr.config.NamedVolumes, &ContainerNamedVolume{ |