diff options
| author | OpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com> | 2020-05-12 03:13:12 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-05-12 03:13:12 -0700 |
| commit | 2ad59d311b8c573186574cec6d4dc57bff0c3a53 (patch) | |
| tree | 70697fa1d2431eb06d8128fa69f2693e156e187a /pkg/domain/infra | |
| parent | 7837bf3c071f1259bc08d8f9e52ed2b4edbda428 (diff) | |
| parent | 1c3bd95b81e5247b7db3f8333aeb01ea58073fe9 (diff) | |
| download | podman-2ad59d311b8c573186574cec6d4dc57bff0c3a53.tar.gz podman-2ad59d311b8c573186574cec6d4dc57bff0c3a53.tar.bz2 podman-2ad59d311b8c573186574cec6d4dc57bff0c3a53.zip | |
Merge pull request #6186 from vrothberg/auto-update
auto-update: support authfiles
Diffstat (limited to 'pkg/domain/infra')
| -rw-r--r-- | pkg/domain/infra/abi/auto-update.go | 8 | ||||
| -rw-r--r-- | pkg/domain/infra/tunnel/auto-update.go | 2 |
2 files changed, 7 insertions, 3 deletions
diff --git a/pkg/domain/infra/abi/auto-update.go b/pkg/domain/infra/abi/auto-update.go index aa20664b4..9fcc451fd 100644 --- a/pkg/domain/infra/abi/auto-update.go +++ b/pkg/domain/infra/abi/auto-update.go @@ -7,7 +7,11 @@ import ( "github.com/containers/libpod/pkg/domain/entities" ) -func (ic *ContainerEngine) AutoUpdate(ctx context.Context) (*entities.AutoUpdateReport, []error) { - units, failures := autoupdate.AutoUpdate(ic.Libpod) +func (ic *ContainerEngine) AutoUpdate(ctx context.Context, options entities.AutoUpdateOptions) (*entities.AutoUpdateReport, []error) { + // Convert the entities options to the autoupdate ones. We can't use + // them in the entities package as low-level packages must not leak + // into the remote client. + autoOpts := autoupdate.Options{Authfile: options.Authfile} + units, failures := autoupdate.AutoUpdate(ic.Libpod, autoOpts) return &entities.AutoUpdateReport{Units: units}, failures } diff --git a/pkg/domain/infra/tunnel/auto-update.go b/pkg/domain/infra/tunnel/auto-update.go index fac033050..5c2dd360d 100644 --- a/pkg/domain/infra/tunnel/auto-update.go +++ b/pkg/domain/infra/tunnel/auto-update.go @@ -7,6 +7,6 @@ import ( "github.com/pkg/errors" ) -func (ic *ContainerEngine) AutoUpdate(ctx context.Context) (*entities.AutoUpdateReport, []error) { +func (ic *ContainerEngine) AutoUpdate(ctx context.Context, options entities.AutoUpdateOptions) (*entities.AutoUpdateReport, []error) { return nil, []error{errors.New("not implemented")} } |