diff options
| author | OpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com> | 2018-12-21 06:09:45 -0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-12-21 06:09:45 -0800 |
| commit | faa7ff3568a6cdc52caa99dfa88b656818574fdc (patch) | |
| tree | 7d1e1382bc74cf4bdbac3b5b60b3a70bd84fd68e /libpod | |
| parent | 28e30408b6f6088545421e0cfb8ca3e05d1cdc06 (diff) | |
| parent | 0ed55f75abac1311b61a17079ae9314ec5459bfd (diff) | |
| download | podman-faa7ff3568a6cdc52caa99dfa88b656818574fdc.tar.gz podman-faa7ff3568a6cdc52caa99dfa88b656818574fdc.tar.bz2 podman-faa7ff3568a6cdc52caa99dfa88b656818574fdc.zip | |
Merge pull request #2028 from giuseppe/fix-rootless-export
rootless: fix export when using fuse-overlayfs
Diffstat (limited to 'libpod')
| -rw-r--r-- | libpod/runtime_ctr.go | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/libpod/runtime_ctr.go b/libpod/runtime_ctr.go index ba8eaacbe..c108febd7 100644 --- a/libpod/runtime_ctr.go +++ b/libpod/runtime_ctr.go @@ -8,6 +8,7 @@ import ( "strings" "time" + "github.com/containers/libpod/pkg/rootless" "github.com/containers/storage" "github.com/containers/storage/pkg/stringid" spec "github.com/opencontainers/runtime-spec/specs-go" @@ -154,6 +155,10 @@ func (r *Runtime) newContainer(ctx context.Context, rSpec *spec.Spec, options .. } }() + if rootless.IsRootless() && ctr.config.ConmonPidFile == "" { + ctr.config.ConmonPidFile = filepath.Join(ctr.state.RunDir, "conmon.pid") + } + // Go through the volume mounts and check for named volumes // If the named volme already exists continue, otherwise create // the storage for the named volume. |