diff options
| author | Valentin Rothberg <rothberg@redhat.com> | 2020-04-17 13:34:14 +0200 |
|---|---|---|
| committer | Valentin Rothberg <rothberg@redhat.com> | 2020-04-21 08:12:25 +0200 |
| commit | 09dc701097ac874c3885fa58ed4f143c29ae83f0 (patch) | |
| tree | c6e320c49d6d223e4009a3ee5a54793777579c82 /cmd/podman/system/service.go | |
| parent | 89276a5f92717c4c6a299ca2be182a3797d9c90d (diff) | |
| download | podman-09dc701097ac874c3885fa58ed4f143c29ae83f0.tar.gz podman-09dc701097ac874c3885fa58ed4f143c29ae83f0.tar.bz2 podman-09dc701097ac874c3885fa58ed4f143c29ae83f0.zip | |
podman rmi: refactor logic
While this commit was initially meant to fix #5847, it has turned into a
bigger refactoring which I did not manage to break into smaller pieces:
* Fix #5847 by refactoring the image-removal logic.
* Make the api handler for image-removal use the ABI code. This way,
both (i.e., ABI and Tunnel) end up using the same code. Achieving
this code share required to move some code around to prevent circular
dependencies.
* Everything in pkg/api (excluding pkg/api/types) must now only be
accessed from code using `ABISupport`.
* Avoid imports from entities on handlers to prevent circular
dependencies.
* Move `podman system service` logic into `cmd` to prevent circular
dependencies - it depends on pkg/api.
* Also remove the build header from infra/abi files. It will otherwise
confuse swagger and other tools; errors we cannot fix as go doesn't
expose a build-tag env variable.
Fixes: #5847
Signed-off-by: Valentin Rothberg <rothberg@redhat.com>
Diffstat (limited to 'cmd/podman/system/service.go')
| -rw-r--r-- | cmd/podman/system/service.go | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/cmd/podman/system/service.go b/cmd/podman/system/service.go index e09107b53..f4b91dd78 100644 --- a/cmd/podman/system/service.go +++ b/cmd/podman/system/service.go @@ -90,7 +90,8 @@ func service(cmd *cobra.Command, args []string) error { logrus.Warn("This function is EXPERIMENTAL") fmt.Fprintf(os.Stderr, "This function is EXPERIMENTAL.\n") - return registry.ContainerEngine().RestService(registry.GetContext(), opts) + + return restService(opts, cmd.Flags(), registry.PodmanConfig()) } func resolveApiURI(_url []string) (string, error) { |