diff options
| author | OpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com> | 2020-04-15 01:48:52 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-04-15 01:48:52 +0200 |
| commit | f0b6cdede554316643187d40c67684daf5a2a2bb (patch) | |
| tree | c2b3a369924f29ddf1762d32941dd10b38da2b9d /pkg/domain/infra/tunnel | |
| parent | 0d01f09bf4103538a6011019b690e5aa11c377db (diff) | |
| parent | d51727642603ba160a7898ee4597d0f071cdea44 (diff) | |
| download | podman-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/tunnel')
| -rw-r--r-- | pkg/domain/infra/tunnel/containers.go | 5 | ||||
| -rw-r--r-- | pkg/domain/infra/tunnel/images.go | 5 |
2 files changed, 10 insertions, 0 deletions
diff --git a/pkg/domain/infra/tunnel/containers.go b/pkg/domain/infra/tunnel/containers.go index f59d4eb0a..05b62efcf 100644 --- a/pkg/domain/infra/tunnel/containers.go +++ b/pkg/domain/infra/tunnel/containers.go @@ -5,6 +5,7 @@ import ( "io" "os" + "github.com/containers/common/pkg/config" "github.com/containers/image/v5/docker/reference" "github.com/containers/libpod/libpod/define" "github.com/containers/libpod/pkg/bindings/containers" @@ -362,3 +363,7 @@ func (ic *ContainerEngine) ContainerMount(ctx context.Context, nameOrIds []strin func (ic *ContainerEngine) ContainerUnmount(ctx context.Context, nameOrIds []string, options entities.ContainerUnmountOptions) ([]*entities.ContainerUnmountReport, error) { return nil, errors.New("unmounting containers is not supported for remote clients") } + +func (ic *ContainerEngine) Config(_ context.Context) (*config.Config, error) { + return config.Default() +} diff --git a/pkg/domain/infra/tunnel/images.go b/pkg/domain/infra/tunnel/images.go index 54f2e8334..7d40e0327 100644 --- a/pkg/domain/infra/tunnel/images.go +++ b/pkg/domain/infra/tunnel/images.go @@ -5,6 +5,7 @@ import ( "io/ioutil" "os" + "github.com/containers/common/pkg/config" "github.com/containers/image/v5/docker/reference" images "github.com/containers/libpod/pkg/bindings/images" "github.com/containers/libpod/pkg/domain/entities" @@ -254,3 +255,7 @@ func (ir *ImageEngine) Diff(ctx context.Context, nameOrId string, _ entities.Dif func (ir *ImageEngine) Search(ctx context.Context, term string, opts entities.ImageSearchOptions) ([]entities.ImageSearchReport, error) { return images.Search(ir.ClientCxt, term, opts) } + +func (ir *ImageEngine) Config(_ context.Context) (*config.Config, error) { + return config.Default() +} |