summaryrefslogtreecommitdiff
path: root/pkg/domain/infra/abi/containers.go
diff options
context:
space:
mode:
authorOpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com>2020-04-15 01:48:52 +0200
committerGitHub <noreply@github.com>2020-04-15 01:48:52 +0200
commitf0b6cdede554316643187d40c67684daf5a2a2bb (patch)
treec2b3a369924f29ddf1762d32941dd10b38da2b9d /pkg/domain/infra/abi/containers.go
parent0d01f09bf4103538a6011019b690e5aa11c377db (diff)
parentd51727642603ba160a7898ee4597d0f071cdea44 (diff)
downloadpodman-f0b6cdede554316643187d40c67684daf5a2a2bb.tar.gz
podman-f0b6cdede554316643187d40c67684daf5a2a2bb.tar.bz2
podman-f0b6cdede554316643187d40c67684daf5a2a2bb.zip
Merge pull request #5812 from jwhonce/wip/options
Add support for the global flags and config files
Diffstat (limited to 'pkg/domain/infra/abi/containers.go')
-rw-r--r--pkg/domain/infra/abi/containers.go6
1 files changed, 6 insertions, 0 deletions
diff --git a/pkg/domain/infra/abi/containers.go b/pkg/domain/infra/abi/containers.go
index 92668190c..f464df3ac 100644
--- a/pkg/domain/infra/abi/containers.go
+++ b/pkg/domain/infra/abi/containers.go
@@ -12,6 +12,7 @@ import (
"sync"
"github.com/containers/buildah"
+ "github.com/containers/common/pkg/config"
"github.com/containers/image/v5/manifest"
"github.com/containers/libpod/libpod"
"github.com/containers/libpod/libpod/define"
@@ -893,3 +894,8 @@ func (ic *ContainerEngine) ContainerUnmount(ctx context.Context, nameOrIds []str
}
return reports, nil
}
+
+// GetConfig returns a copy of the configuration used by the runtime
+func (ic *ContainerEngine) Config(_ context.Context) (*config.Config, error) {
+ return ic.Libpod.GetConfig()
+}