diff options
| author | OpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com> | 2020-05-08 19:24:27 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-05-08 19:24:27 +0200 |
| commit | 5ac8e15613b1fd9f16bb0339034bfb9510ed9e7d (patch) | |
| tree | 425c350d549621eab6de14d29916439868b2d67f /vendor | |
| parent | dca68567289c1fb14ade1eb702718bf815386061 (diff) | |
| parent | cb7b97ce5ed30bbe1239d2bcbc1be282ba56ed9e (diff) | |
| download | podman-5ac8e15613b1fd9f16bb0339034bfb9510ed9e7d.tar.gz podman-5ac8e15613b1fd9f16bb0339034bfb9510ed9e7d.tar.bz2 podman-5ac8e15613b1fd9f16bb0339034bfb9510ed9e7d.zip | |
Merge pull request #6125 from rhatdan/reset
Update containers/common to v0.8.3
Diffstat (limited to 'vendor')
| -rw-r--r-- | vendor/github.com/containers/common/pkg/config/config.go | 10 | ||||
| -rw-r--r-- | vendor/modules.txt | 2 |
2 files changed, 1 insertions, 11 deletions
diff --git a/vendor/github.com/containers/common/pkg/config/config.go b/vendor/github.com/containers/common/pkg/config/config.go index b65db2722..aa956da04 100644 --- a/vendor/github.com/containers/common/pkg/config/config.go +++ b/vendor/github.com/containers/common/pkg/config/config.go @@ -435,16 +435,6 @@ func readConfigFromFile(path string, config *Config) (*Config, error) { if err != nil { return nil, fmt.Errorf("unable to decode configuration %v: %v", path, err) } - if config.Engine.VolumePath != "" { - config.Engine.VolumePathSet = true - } - if config.Engine.StaticDir != "" { - config.Engine.StaticDirSet = true - } - if config.Engine.TmpDir != "" { - config.Engine.TmpDirSet = true - } - return config, err } diff --git a/vendor/modules.txt b/vendor/modules.txt index 0c0b07b12..80c968ba4 100644 --- a/vendor/modules.txt +++ b/vendor/modules.txt @@ -82,7 +82,7 @@ github.com/containers/buildah/pkg/secrets github.com/containers/buildah/pkg/supplemented github.com/containers/buildah/pkg/umask github.com/containers/buildah/util -# github.com/containers/common v0.8.2 +# github.com/containers/common v0.8.3 github.com/containers/common/pkg/apparmor github.com/containers/common/pkg/capabilities github.com/containers/common/pkg/cgroupv2 |