diff options
| author | Matthew Heon <matthew.heon@gmail.com> | 2018-07-20 08:49:30 -0400 |
|---|---|---|
| committer | Matthew Heon <matthew.heon@gmail.com> | 2018-07-24 16:12:31 -0400 |
| commit | 486c5c87bca028ba41dfb9f516ae37b9d6a984cb (patch) | |
| tree | 2279b83bf0237dda62434d0e7a1267936323e15b /libpod | |
| parent | 7a358e427738294180a14b1298dfc3a569f0e0fc (diff) | |
| download | podman-486c5c87bca028ba41dfb9f516ae37b9d6a984cb.tar.gz podman-486c5c87bca028ba41dfb9f516ae37b9d6a984cb.tar.bz2 podman-486c5c87bca028ba41dfb9f516ae37b9d6a984cb.zip | |
Add missing runtime.go lines to set namespace
Also add namespace to inspect output to verify its presence
Signed-off-by: Matthew Heon <matthew.heon@gmail.com>
Diffstat (limited to 'libpod')
| -rw-r--r-- | libpod/container_inspect.go | 1 | ||||
| -rw-r--r-- | libpod/runtime.go | 5 |
2 files changed, 6 insertions, 0 deletions
diff --git a/libpod/container_inspect.go b/libpod/container_inspect.go index a1070cf99..dec0b47b4 100644 --- a/libpod/container_inspect.go +++ b/libpod/container_inspect.go @@ -69,6 +69,7 @@ func (c *Container) getContainerInspectData(size bool, driverData *inspect.Data) ImageID: config.RootfsImageID, ImageName: config.RootfsImageName, ExitCommand: config.ExitCommand, + Namespace: config.Namespace, Rootfs: config.Rootfs, ResolvConfPath: resolvPath, HostnamePath: hostnamePath, diff --git a/libpod/runtime.go b/libpod/runtime.go index a0b673d81..1a384fde2 100644 --- a/libpod/runtime.go +++ b/libpod/runtime.go @@ -505,6 +505,11 @@ func makeRuntime(runtime *Runtime) (err error) { return errors.Wrapf(ErrInvalidArg, "unrecognized state type passed") } + if err := runtime.state.SetNamespace(runtime.config.Namespace); err != nil { + return errors.Wrapf(err, "error setting libpod namespace in state") + } + logrus.Debugf("Set libpod namespace to %q", runtime.config.Namespace) + // We now need to see if the system has restarted // We check for the presence of a file in our tmp directory to verify this // This check must be locked to prevent races |