From 4cf91c5352b765f977ee86fa33c89b1248bc68d1 Mon Sep 17 00:00:00 2001 From: baude Date: Fri, 23 Feb 2018 13:14:50 -0600 Subject: [PATCH 001/110] v0.2.2 --- .gitignore | 1 + podman.spec | 7 +++++-- sources | 2 +- 3 files changed, 7 insertions(+), 3 deletions(-) diff --git a/.gitignore b/.gitignore index ecec477..913e118 100644 --- a/.gitignore +++ b/.gitignore @@ -1,3 +1,4 @@ /libpod-367213a.tar.gz /libpod-3d0100b.tar.gz /libpod-3723cec.tar.gz +/libpod-525e3b1.tar.gz diff --git a/podman.spec b/podman.spec index 36bdc45..8e32313 100644 --- a/podman.spec +++ b/podman.spec @@ -40,11 +40,11 @@ # https://github.com/projectatomic/libpod %global provider_prefix %{provider}.%{provider_tld}/%{project}/%{repo} %global import_path %{provider_prefix} -%global commit 3723cecc33399629408770e44eb363e9ca36fdce +%global commit 525e3b17e4723afeebf45a1a24f00b2af17ddedf %global shortcommit %(c=%{commit}; echo ${c:0:7}) Name: podman -Version: 0.2.1 +Version: 0.2.2 Release: 1.git%{shortcommit}%{?dist} Summary: Manage Pods, Containers and Container Images License: ASL 2.0 @@ -457,6 +457,9 @@ export GOPATH=%{buildroot}/%{gopath}:$(pwd)/vendor:%{gopath} %endif %changelog +* Fri Feb 23 2018 baude - 0.2.2-1.git525e3b1 +- Release 0.2.2 + * Fri Feb 16 2018 baude - 0.2.1-1.git3d0100b - Release 0.2.1 diff --git a/sources b/sources index f13cf7a..769f3d8 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (libpod-3723cec.tar.gz) = 02bff640fbb450dc219afab588ee590cb29252a7cffc42949483a9666119d422a78eb93f0f10d83ef91ab3bc2a8010f8e441282fd1f15dd91ef6bcad37a98338 +SHA512 (libpod-525e3b1.tar.gz) = 0826e974cb84a1f82977a1adea97f622d1b6027076e3c2f367641c7f47bb101bcd7f1c88f5803bd122a41948be029780f34b27fe567e97d71114fb9899d3150e From 1088201f447aa2537617fe6dc73d5c4ff802814c Mon Sep 17 00:00:00 2001 From: baude Date: Fri, 2 Mar 2018 15:23:47 -0600 Subject: [PATCH 002/110] Release 0.3.1-1 Signed-off-by: baude --- podman.spec | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/podman.spec b/podman.spec index f21a88c..d1f48be 100644 --- a/podman.spec +++ b/podman.spec @@ -40,12 +40,12 @@ # https://github.com/projectatomic/libpod %global provider_prefix %{provider}.%{provider_tld}/%{project}/%{repo} %global import_path %{provider_prefix} -%global commit 525e3b17e4723afeebf45a1a24f00b2af17ddedf +%global commit c187538b9e7fa9af75a4123ff3dc128ce6f4ba1b %global shortcommit %(c=%{commit}; echo ${c:0:7}) Name: podman Version: 0.2.2 -Release: 2.git%{shortcommit}%{?dist} +Release: 3.git%{shortcommit}%{?dist} Summary: Manage Pods, Containers and Container Images License: ASL 2.0 URL: https://%{provider_prefix} @@ -457,6 +457,9 @@ export GOPATH=%{buildroot}/%{gopath}:$(pwd)/vendor:%{gopath} %endif %changelog +* Fri Mar 02 2018 baude - 0.3.1-1.gitc187538 +- Release 0.3.1-1 + * Sun Feb 25 2018 Peter Robinson 0.2.2-2.git525e3b1 - Build on ARMv7 too (Fedora supports containers on that arch too) From fbf1e09beec151a5bbc645670f018b7a3209e6c5 Mon Sep 17 00:00:00 2001 From: baude Date: Fri, 2 Mar 2018 15:29:45 -0600 Subject: [PATCH 003/110] correct version/release Signed-off-by: baude --- podman.spec | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/podman.spec b/podman.spec index d1f48be..5703b56 100644 --- a/podman.spec +++ b/podman.spec @@ -44,8 +44,8 @@ %global shortcommit %(c=%{commit}; echo ${c:0:7}) Name: podman -Version: 0.2.2 -Release: 3.git%{shortcommit}%{?dist} +Version: 0.3.1 +Release: 1.git%{shortcommit}%{?dist} Summary: Manage Pods, Containers and Container Images License: ASL 2.0 URL: https://%{provider_prefix} From 2582eb7057f0234e870a7c17cf03c4cf13340419 Mon Sep 17 00:00:00 2001 From: baude Date: Fri, 2 Mar 2018 15:36:04 -0600 Subject: [PATCH 004/110] 0.3.1-1 --- .gitignore | 1 + sources | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/.gitignore b/.gitignore index 913e118..d13e468 100644 --- a/.gitignore +++ b/.gitignore @@ -2,3 +2,4 @@ /libpod-3d0100b.tar.gz /libpod-3723cec.tar.gz /libpod-525e3b1.tar.gz +/libpod-c187538.tar.gz diff --git a/sources b/sources index 769f3d8..300bdfa 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (libpod-525e3b1.tar.gz) = 0826e974cb84a1f82977a1adea97f622d1b6027076e3c2f367641c7f47bb101bcd7f1c88f5803bd122a41948be029780f34b27fe567e97d71114fb9899d3150e +SHA512 (libpod-c187538.tar.gz) = c210c695b55bffebee2b2896f59bbc9258a3b2321ea7fa24f501ddd8cd4ae2e361e8c1b3a2ee0a798c83795929b640c2f059a4c955c1966d0bac8457cfba110f From 2a9ea33c6698475a1081ec321b61d4a0ead1134c Mon Sep 17 00:00:00 2001 From: baude Date: Sun, 4 Mar 2018 11:16:19 -0600 Subject: [PATCH 005/110] version correction --- .gitignore | 1 + podman.spec | 7 +++++-- sources | 2 +- 3 files changed, 7 insertions(+), 3 deletions(-) diff --git a/.gitignore b/.gitignore index d13e468..6c0ca4d 100644 --- a/.gitignore +++ b/.gitignore @@ -3,3 +3,4 @@ /libpod-3723cec.tar.gz /libpod-525e3b1.tar.gz /libpod-c187538.tar.gz +/libpod-98b95ff.tar.gz diff --git a/podman.spec b/podman.spec index 5703b56..e26a477 100644 --- a/podman.spec +++ b/podman.spec @@ -40,12 +40,12 @@ # https://github.com/projectatomic/libpod %global provider_prefix %{provider}.%{provider_tld}/%{project}/%{repo} %global import_path %{provider_prefix} -%global commit c187538b9e7fa9af75a4123ff3dc128ce6f4ba1b +%global commit 98b95ff47f8387f47687fb2d1377b722bd6a2915 %global shortcommit %(c=%{commit}; echo ${c:0:7}) Name: podman Version: 0.3.1 -Release: 1.git%{shortcommit}%{?dist} +Release: 2.git%{shortcommit}%{?dist} Summary: Manage Pods, Containers and Container Images License: ASL 2.0 URL: https://%{provider_prefix} @@ -457,6 +457,9 @@ export GOPATH=%{buildroot}/%{gopath}:$(pwd)/vendor:%{gopath} %endif %changelog +* Sun Mar 04 2018 baude - 0.3.1-2.git98b95ff +- version correction + * Fri Mar 02 2018 baude - 0.3.1-1.gitc187538 - Release 0.3.1-1 diff --git a/sources b/sources index 300bdfa..69a42e4 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (libpod-c187538.tar.gz) = c210c695b55bffebee2b2896f59bbc9258a3b2321ea7fa24f501ddd8cd4ae2e361e8c1b3a2ee0a798c83795929b640c2f059a4c955c1966d0bac8457cfba110f +SHA512 (libpod-98b95ff.tar.gz) = 0ce06bfc4f873354185565980c6b587f98f68cce26bfddaffaa6bfc405c3bd78f6182c829e903d3faa23385d643e66f36c9c0a09d76a1301f5d72ac2159ff3cd From 0e356c10ffccf3491175608d1d00675d8b6b0f12 Mon Sep 17 00:00:00 2001 From: baude Date: Fri, 9 Mar 2018 09:21:45 -0600 Subject: [PATCH 006/110] Version 0.3.2-1 --- .gitignore | 1 + podman.spec | 9 ++++++--- sources | 2 +- 3 files changed, 8 insertions(+), 4 deletions(-) diff --git a/.gitignore b/.gitignore index 6c0ca4d..809f283 100644 --- a/.gitignore +++ b/.gitignore @@ -4,3 +4,4 @@ /libpod-525e3b1.tar.gz /libpod-c187538.tar.gz /libpod-98b95ff.tar.gz +/libpod-f79a39a.tar.gz diff --git a/podman.spec b/podman.spec index e26a477..c8f61ad 100644 --- a/podman.spec +++ b/podman.spec @@ -40,12 +40,12 @@ # https://github.com/projectatomic/libpod %global provider_prefix %{provider}.%{provider_tld}/%{project}/%{repo} %global import_path %{provider_prefix} -%global commit 98b95ff47f8387f47687fb2d1377b722bd6a2915 +%global commit f79a39abb7725109cd3469f74fd6789d9a62a308 %global shortcommit %(c=%{commit}; echo ${c:0:7}) Name: podman -Version: 0.3.1 -Release: 2.git%{shortcommit}%{?dist} +Version: 0.3.2 +Release: 1.git%{shortcommit}%{?dist} Summary: Manage Pods, Containers and Container Images License: ASL 2.0 URL: https://%{provider_prefix} @@ -457,6 +457,9 @@ export GOPATH=%{buildroot}/%{gopath}:$(pwd)/vendor:%{gopath} %endif %changelog +* Fri Mar 09 2018 baude - 0.3.1-3.gitf79a39a +- Release 0.3.2-1 + * Sun Mar 04 2018 baude - 0.3.1-2.git98b95ff - version correction diff --git a/sources b/sources index 69a42e4..dfa852b 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (libpod-98b95ff.tar.gz) = 0ce06bfc4f873354185565980c6b587f98f68cce26bfddaffaa6bfc405c3bd78f6182c829e903d3faa23385d643e66f36c9c0a09d76a1301f5d72ac2159ff3cd +SHA512 (libpod-f79a39a.tar.gz) = dfdc90cf1bae56179896293bad438c5a109c716b855e172f8aedd225de224b1bfacd6d3a491bffa74fc11158231e7dd6c989654098e564bb11af134ea0f2f90d From 8e969a4644736540bdfad7ed1caa142517e7a649 Mon Sep 17 00:00:00 2001 From: Lokesh Mandvekar Date: Wed, 14 Mar 2018 14:08:03 -0400 Subject: [PATCH 007/110] podman-0.3.3-1.dev.gitbc358eb - built podman commit bc358eb - built conmon from cri-o commit 712f3b8 Signed-off-by: Lokesh Mandvekar --- .gitignore | 2 ++ podman.spec | 70 +++++++++++++++++++++++++++++++++++++++-------------- sources | 3 ++- 3 files changed, 56 insertions(+), 19 deletions(-) diff --git a/.gitignore b/.gitignore index 809f283..943a240 100644 --- a/.gitignore +++ b/.gitignore @@ -5,3 +5,5 @@ /libpod-c187538.tar.gz /libpod-98b95ff.tar.gz /libpod-f79a39a.tar.gz +/cri-o-712f3b8.tar.gz +/libpod-bc358eb.tar.gz diff --git a/podman.spec b/podman.spec index c8f61ad..637d69c 100644 --- a/podman.spec +++ b/podman.spec @@ -40,16 +40,23 @@ # https://github.com/projectatomic/libpod %global provider_prefix %{provider}.%{provider_tld}/%{project}/%{repo} %global import_path %{provider_prefix} -%global commit f79a39abb7725109cd3469f74fd6789d9a62a308 +%global git_podman https://%{provider}.%{provider_tld}/%{project}/%{repo} +%global commit bc358eb396aa87f3122f0449945efc03ed64bfd2 %global shortcommit %(c=%{commit}; echo ${c:0:7}) +%global import_path_conmon github.com/kubernetes-incubator/cri-o +%global git_conmon https://%{import_path_conmon} +%global commit_conmon 712f3b8cf14cbbac298f3ccc020677ac2a65fa75 +%global shortcommit_conmon %(c=%{commit_conmon}; echo ${c:0:7}) + Name: podman -Version: 0.3.2 -Release: 1.git%{shortcommit}%{?dist} +Version: 0.3.3 +Release: 1.dev.git%{shortcommit}%{?dist} Summary: Manage Pods, Containers and Container Images License: ASL 2.0 -URL: https://%{provider_prefix} -Source0: https://%{provider_prefix}/archive/%{commit}/%{repo}-%{shortcommit}.tar.gz +URL: %{git_podman} +Source0: %{git_podman}/archive/%{commit}/%{repo}-%{shortcommit}.tar.gz +Source1: %{git_conmon}/archive/%{commit_conmon}/cri-o-%{shortcommit_conmon}.tar.gz # e.g. el6 has ppc64 arch without gcc-go, so EA tag is required #ExclusiveArch: %%{?go_arches:%%{go_arches}}%%{!?go_arches:%%{ix86} x86_64 aarch64 %%{arm}} @@ -69,18 +76,17 @@ BuildRequires: libgpg-error-devel BuildRequires: libseccomp-devel BuildRequires: libselinux-devel BuildRequires: pkgconfig -BuildRequires: runc -BuildRequires: skopeo-containers Requires: runc Requires: skopeo-containers -Requires: conmon +# can't use default conmon right now, so we ship our own +#Requires: conmon Requires: buildah Requires: containernetworking-cni > 0.6 Requires: iptables Requires: atomic-registries # vendored libraries -# awk '{print "Provides: bundled(golang("$1")) = "$2}' containerd-*/vendor.conf | sort +# awk '{print "Provides: bundled(golang("$1")) = "$2}' vendor.conf | sort # [thanks to Carl George for containerd.spec] Provides: bundled(golang(github.com/asaskevich/govalidator)) = v6 Provides: bundled(golang(github.com/Azure/go-ansiterm)) = 19f72df4d05d31cbe1c56bfc8045c96babff6c7e @@ -91,10 +97,10 @@ Provides: bundled(golang(github.com/BurntSushi/toml)) = v0.2.0 Provides: bundled(golang(github.com/containerd/cgroups)) = 7a5fdd8330119dc70d850260db8f3594d89d6943 Provides: bundled(golang(github.com/containerd/continuity)) = master Provides: bundled(golang(github.com/containernetworking/cni)) = v0.4.0 -Provides: bundled(golang(github.com/containers/image)) = 9b4510f6d1627c8e53c3303a8fe48ca7842c2ace -Provides: bundled(golang(github.com/containers/storage)) = 1824cf917a6b42d8c41179e807bb20a5fd6c0f0a +Provides: bundled(golang(github.com/containers/image)) = b129a8413fd1e8c53379acbbacfc7b667070ae50 +Provides: bundled(golang(github.com/containers/storage)) = 1e5ce40cdb84ab66e26186435b1273e04b879fef Provides: bundled(golang(github.com/coreos/go-systemd)) = v14 -Provides: bundled(golang(github.com/coreos/pkg)) = v3 +Provides: bundled(golang(github.com/cyphar/filepath-securejoin)) = v0.2.1 Provides: bundled(golang(github.com/davecgh/go-spew)) = v1.1.0 Provides: bundled(golang(github.com/dgrijalva/jwt-go)) = v3.0.0 Provides: bundled(golang(github.com/docker/distribution)) = 7a8efe719e55bbfaff7bc5718cdf0ed51ca821df @@ -128,7 +134,6 @@ Provides: bundled(golang(github.com/gorilla/mux)) = v1.3.0 Provides: bundled(golang(github.com/hashicorp/errwrap)) = 7554cd9344cec97297fa6649b055a8c98c2a1e55 Provides: bundled(golang(github.com/hashicorp/golang-lru)) = 0a025b7e63adc15a622f29b0b2c4c3848243bbf6 Provides: bundled(golang(github.com/hashicorp/go-multierror)) = 83588e72410abfbe4df460eeb6f30841ae47d4c4 -Provides: bundled(golang(github.com/hpcloud/tail)) = v1.0.0 Provides: bundled(golang(github.com/imdario/mergo)) = 0.2.2 Provides: bundled(golang(github.com/juju/ratelimit)) = 5b9ff866471762aa2ab2dced63c9fb6f53921342 Provides: bundled(golang(github.com/kr/pty)) = v1.0.0 @@ -139,11 +144,10 @@ Provides: bundled(golang(github.com/Microsoft/go-winio)) = 78439966b38d69bf38227 Provides: bundled(golang(github.com/Microsoft/hcsshim)) = 43f9725307998e09f2e3816c2c0c36dc98f0c982 Provides: bundled(golang(github.com/mistifyio/go-zfs)) = v2.1.1 Provides: bundled(golang(github.com/mitchellh/mapstructure)) = d0303fe809921458f417bcf828397a65db30a7e4 -Provides: bundled(golang(github.com/mrunalp/fileutils)) = master Provides: bundled(golang(github.com/mtrmac/gpgme)) = b2432428689ca58c2b8e8dea9449d3295cf96fc9 Provides: bundled(golang(github.com/opencontainers/go-digest)) = v1.0.0-rc0 Provides: bundled(golang(github.com/opencontainers/image-spec)) = v1.0.0 -Provides: bundled(golang(github.com/opencontainers/runc)) = 45bde006ca8c90e089894508708bcf0e2cdf9e13 +Provides: bundled(golang(github.com/opencontainers/runc)) = 6e15bc3f92fd4c58b3285e8f27eaeb6b22d62920 Provides: bundled(golang(github.com/opencontainers/runtime-spec)) = v1.0.0 Provides: bundled(golang(github.com/opencontainers/runtime-tools)) = 625e2322645b151a7cbb93a8b42920933e72167f Provides: bundled(golang(github.com/opencontainers/selinux)) = b29023b86e4a69d1b46b7e7b4e2b6fda03f0b9cd @@ -178,10 +182,8 @@ Provides: bundled(golang(golang.org/x/sys)) = 9aade4d3a3b7e6d876cd3823ad20ec45fc Provides: bundled(golang(golang.org/x/text)) = f72d8390a633d5dfb0cc84043294db9f6c935756 Provides: bundled(golang(google.golang.org/grpc)) = v1.0.4 Provides: bundled(golang(gopkg.in/cheggaaa/pb.v1)) = v1.0.7 -Provides: bundled(golang(gopkg.in/fsnotify.v1)) = v1.4.2 Provides: bundled(golang(gopkg.in/inf.v0)) = v0.9.0 Provides: bundled(golang(gopkg.in/mgo.v2)) = v2 -Provides: bundled(golang(gopkg.in/tomb.v1)) = v1 Provides: bundled(golang(gopkg.in/yaml.v2)) = v2 %description @@ -352,6 +354,9 @@ providing packages with %{import_path} prefix. %autosetup -Sgit -n %{repo}-%{commit} sed -i '/\/bin\/bash/d' completions/bash/%{name} +# untar cri-o +tar zxf %{SOURCE1} + %build mkdir _build pushd _build @@ -365,9 +370,32 @@ export BUILDTAGS="selinux seccomp $(hack/btrfs_installed_tag.sh) $(hack/btrfs_ta GOPATH=$GOPATH BUILDTAGS=$BUILDTAGS %gobuild -o bin/%{name} %{import_path}/cmd/%{name} BUILDTAGS=$BUILDTAGS make docs +# build conmon +pushd cri-o-%{commit_conmon} + +mkdir _output +pushd _output +mkdir -p src/%{provider}.%{provider_tld}/{kubernetes-incubator,opencontainers} +ln -s $(dirs +1 -l) src/%{import_path_conmon} +popd + +ln -s vendor src +export GOPATH=$(pwd)/_output:$(pwd):%{gopath} +export BUILDTAGS="selinux seccomp $(hack/btrfs_installed_tag.sh) $(hack/btrfs_tag.sh) containers_image_ostree_stub" +BUILDTAGS=$BUILDTAGS make conmon +popd + %install %make_install PREFIX=%{buildroot}%{_prefix} install install.completions +# install libpod.conf +install -dp %{buildroot}%{_datadir}/containers +install -p -m 644 %{repo}.conf %{buildroot}%{_datadir}/containers + +# install conmon +install -dp %{buildroot}%{_libexecdir}/%{name} +install -p -m 755 cri-o-%{commit_conmon}/bin/conmon %{buildroot}%{_libexecdir}/%{name} + # source codes for building projects %if 0%{?with_devel} install -d -p %{buildroot}/%{gopath}/src/%{import_path}/ @@ -441,7 +469,9 @@ export GOPATH=%{buildroot}/%{gopath}:$(pwd)/vendor:%{gopath} %{_bindir}/%{name} %{_mandir}/man1/*.1* %{_datadir}/bash-completion/completions/* +%{_libexecdir}/%{name}/conmon %config(noreplace) %{_sysconfdir}/cni/net.d/87-%{name}-bridge.conflist +%{_datadir}/containers/%{repo}.conf %if 0%{?with_devel} %files -n libpod-devel -f devel.file-list @@ -457,7 +487,11 @@ export GOPATH=%{buildroot}/%{gopath}:$(pwd)/vendor:%{gopath} %endif %changelog -* Fri Mar 09 2018 baude - 0.3.1-3.gitf79a39a +* Wed Mar 14 2018 Lokesh Mandvekar - 0.3.3-1.dev.gitbc358eb +- built podman commit bc358eb +- built conmon from cri-o commit 712f3b8 + +* Fri Mar 09 2018 baude - 0.3.2-1.gitf79a39a - Release 0.3.2-1 * Sun Mar 04 2018 baude - 0.3.1-2.git98b95ff diff --git a/sources b/sources index dfa852b..5b0bef9 100644 --- a/sources +++ b/sources @@ -1 +1,2 @@ -SHA512 (libpod-f79a39a.tar.gz) = dfdc90cf1bae56179896293bad438c5a109c716b855e172f8aedd225de224b1bfacd6d3a491bffa74fc11158231e7dd6c989654098e564bb11af134ea0f2f90d +SHA512 (cri-o-712f3b8.tar.gz) = 46f9cf6b2796b512eef15adf052842b50021ce07a8bb51bb6494698321e317d782f1978032e9cad0d836bc951ff61bfc778c6c57506475975acc0eac236fd354 +SHA512 (libpod-bc358eb.tar.gz) = b90100890d283e5d92e4201146cc40ccde7984e28007ec4cc7e5ec0b5a2aaf9bfc17f01a9d2fd2caa22b875a4f19fd9f9d4046660b37345b41326e1941fdfdd4 From 88f1d4ca3ce4977aa3c65035fd25aefb936b201d Mon Sep 17 00:00:00 2001 From: baude Date: Fri, 16 Mar 2018 10:31:52 -0500 Subject: [PATCH 008/110] upstream 0.3.3 --- .gitignore | 1 + podman.spec | 7 +++++-- sources | 2 +- 3 files changed, 7 insertions(+), 3 deletions(-) diff --git a/.gitignore b/.gitignore index 943a240..b37da35 100644 --- a/.gitignore +++ b/.gitignore @@ -7,3 +7,4 @@ /libpod-f79a39a.tar.gz /cri-o-712f3b8.tar.gz /libpod-bc358eb.tar.gz +/libpod-b47fc0d.tar.gz diff --git a/podman.spec b/podman.spec index 637d69c..c2d3ab4 100644 --- a/podman.spec +++ b/podman.spec @@ -41,7 +41,7 @@ %global provider_prefix %{provider}.%{provider_tld}/%{project}/%{repo} %global import_path %{provider_prefix} %global git_podman https://%{provider}.%{provider_tld}/%{project}/%{repo} -%global commit bc358eb396aa87f3122f0449945efc03ed64bfd2 +%global commit b47fc0dda522008ef4ed6abf72b764fb5b445f3a %global shortcommit %(c=%{commit}; echo ${c:0:7}) %global import_path_conmon github.com/kubernetes-incubator/cri-o @@ -51,7 +51,7 @@ Name: podman Version: 0.3.3 -Release: 1.dev.git%{shortcommit}%{?dist} +Release: 2.git%{shortcommit}%{?dist} Summary: Manage Pods, Containers and Container Images License: ASL 2.0 URL: %{git_podman} @@ -487,6 +487,9 @@ export GOPATH=%{buildroot}/%{gopath}:$(pwd)/vendor:%{gopath} %endif %changelog +* Fri Mar 16 2018 baude - 0.3.3-2.dev.gitbc358eb +- Upstream release 0.3.3 + * Wed Mar 14 2018 Lokesh Mandvekar - 0.3.3-1.dev.gitbc358eb - built podman commit bc358eb - built conmon from cri-o commit 712f3b8 diff --git a/sources b/sources index 5b0bef9..6bee6df 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ SHA512 (cri-o-712f3b8.tar.gz) = 46f9cf6b2796b512eef15adf052842b50021ce07a8bb51bb6494698321e317d782f1978032e9cad0d836bc951ff61bfc778c6c57506475975acc0eac236fd354 -SHA512 (libpod-bc358eb.tar.gz) = b90100890d283e5d92e4201146cc40ccde7984e28007ec4cc7e5ec0b5a2aaf9bfc17f01a9d2fd2caa22b875a4f19fd9f9d4046660b37345b41326e1941fdfdd4 +SHA512 (libpod-b47fc0d.tar.gz) = 1d935b18fd94c8ac14c9666fff52cbda23229bf5dd63894c0a003b2914e305dbfc3c1403cd6905ef23a33c9b7d1113bee86f11e0c371c6bd41fb5482974d4680 From 149573eb60575b820488c3f499661012cec54408 Mon Sep 17 00:00:00 2001 From: baude Date: Fri, 23 Mar 2018 13:15:18 -0500 Subject: [PATCH 009/110] Upstream release 0.3.4 --- .gitignore | 1 + podman.spec | 9 ++++++--- sources | 2 +- 3 files changed, 8 insertions(+), 4 deletions(-) diff --git a/.gitignore b/.gitignore index b37da35..51eb451 100644 --- a/.gitignore +++ b/.gitignore @@ -8,3 +8,4 @@ /cri-o-712f3b8.tar.gz /libpod-bc358eb.tar.gz /libpod-b47fc0d.tar.gz +/libpod-57b403e.tar.gz diff --git a/podman.spec b/podman.spec index c2d3ab4..15a5cfc 100644 --- a/podman.spec +++ b/podman.spec @@ -41,7 +41,7 @@ %global provider_prefix %{provider}.%{provider_tld}/%{project}/%{repo} %global import_path %{provider_prefix} %global git_podman https://%{provider}.%{provider_tld}/%{project}/%{repo} -%global commit b47fc0dda522008ef4ed6abf72b764fb5b445f3a +%global commit 57b403eda155d321d8aa29cfa0085aac8ce28a57 %global shortcommit %(c=%{commit}; echo ${c:0:7}) %global import_path_conmon github.com/kubernetes-incubator/cri-o @@ -50,8 +50,8 @@ %global shortcommit_conmon %(c=%{commit_conmon}; echo ${c:0:7}) Name: podman -Version: 0.3.3 -Release: 2.git%{shortcommit}%{?dist} +Version: 0.3.4 +Release: 1.git%{shortcommit}%{?dist} Summary: Manage Pods, Containers and Container Images License: ASL 2.0 URL: %{git_podman} @@ -487,6 +487,9 @@ export GOPATH=%{buildroot}/%{gopath}:$(pwd)/vendor:%{gopath} %endif %changelog +* Fri Mar 23 2018 baude - 0.3.4-1.git57b403eda155d321d8aa29cfa0085aac8ce28a57 +- Upstream release 0.3.4 + * Fri Mar 16 2018 baude - 0.3.3-2.dev.gitbc358eb - Upstream release 0.3.3 diff --git a/sources b/sources index 6bee6df..3978a2c 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ SHA512 (cri-o-712f3b8.tar.gz) = 46f9cf6b2796b512eef15adf052842b50021ce07a8bb51bb6494698321e317d782f1978032e9cad0d836bc951ff61bfc778c6c57506475975acc0eac236fd354 -SHA512 (libpod-b47fc0d.tar.gz) = 1d935b18fd94c8ac14c9666fff52cbda23229bf5dd63894c0a003b2914e305dbfc3c1403cd6905ef23a33c9b7d1113bee86f11e0c371c6bd41fb5482974d4680 +SHA512 (libpod-57b403e.tar.gz) = e10bfa6379789376be8acef4716c00ee3a6d678fe56e4e3f194e76a537784a797926ba8eec997a6b887b69fb190dd04032b50f6cbebcd5b65751dcf43d7ef64d From d8652e3ca301db9c69b44a621dabd236648feca4 Mon Sep 17 00:00:00 2001 From: baude Date: Thu, 29 Mar 2018 13:40:58 -0500 Subject: [PATCH 010/110] Upstream 0.3.5 --- .gitignore | 1 + podman.spec | 7 +++++-- sources | 2 +- 3 files changed, 7 insertions(+), 3 deletions(-) diff --git a/.gitignore b/.gitignore index 51eb451..6656804 100644 --- a/.gitignore +++ b/.gitignore @@ -9,3 +9,4 @@ /libpod-bc358eb.tar.gz /libpod-b47fc0d.tar.gz /libpod-57b403e.tar.gz +/libpod-db6bf9e.tar.gz diff --git a/podman.spec b/podman.spec index 15a5cfc..545162e 100644 --- a/podman.spec +++ b/podman.spec @@ -41,7 +41,7 @@ %global provider_prefix %{provider}.%{provider_tld}/%{project}/%{repo} %global import_path %{provider_prefix} %global git_podman https://%{provider}.%{provider_tld}/%{project}/%{repo} -%global commit 57b403eda155d321d8aa29cfa0085aac8ce28a57 +%global commit db6bf9e3ad7900f0bf062fd12b80706c1bd7bb5f %global shortcommit %(c=%{commit}; echo ${c:0:7}) %global import_path_conmon github.com/kubernetes-incubator/cri-o @@ -50,7 +50,7 @@ %global shortcommit_conmon %(c=%{commit_conmon}; echo ${c:0:7}) Name: podman -Version: 0.3.4 +Version: 0.3.5 Release: 1.git%{shortcommit}%{?dist} Summary: Manage Pods, Containers and Container Images License: ASL 2.0 @@ -487,6 +487,9 @@ export GOPATH=%{buildroot}/%{gopath}:$(pwd)/vendor:%{gopath} %endif %changelog +* Thu Mar 29 2018 baude - 0.3.5-1.git712f3b8cf14 +- Upstream release 0.3.5 + * Fri Mar 23 2018 baude - 0.3.4-1.git57b403eda155d321d8aa29cfa0085aac8ce28a57 - Upstream release 0.3.4 diff --git a/sources b/sources index 3978a2c..e46c6b5 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ SHA512 (cri-o-712f3b8.tar.gz) = 46f9cf6b2796b512eef15adf052842b50021ce07a8bb51bb6494698321e317d782f1978032e9cad0d836bc951ff61bfc778c6c57506475975acc0eac236fd354 -SHA512 (libpod-57b403e.tar.gz) = e10bfa6379789376be8acef4716c00ee3a6d678fe56e4e3f194e76a537784a797926ba8eec997a6b887b69fb190dd04032b50f6cbebcd5b65751dcf43d7ef64d +SHA512 (libpod-db6bf9e.tar.gz) = 489d9d5fe3d62a2307f0d06e8781305130d0d6fbcc2a14e28e0c6db4ef07acf402895bd88340fe5863332ae717fc36d220041816079ef9eeb97129f133785591 From 582532fe267afe9bedd25cbd81719f3f7d34bcb9 Mon Sep 17 00:00:00 2001 From: Daniel J Walsh Date: Tue, 3 Apr 2018 08:24:05 -0400 Subject: [PATCH 011/110] Add proper version of conmon --- podman.spec | 7 +++++-- sources | 2 +- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/podman.spec b/podman.spec index 545162e..a5f68a4 100644 --- a/podman.spec +++ b/podman.spec @@ -46,12 +46,12 @@ %global import_path_conmon github.com/kubernetes-incubator/cri-o %global git_conmon https://%{import_path_conmon} -%global commit_conmon 712f3b8cf14cbbac298f3ccc020677ac2a65fa75 +%global commit_conmon 6a018deb09e704e24ae8ff9d7c79ca8aa650c04c %global shortcommit_conmon %(c=%{commit_conmon}; echo ${c:0:7}) Name: podman Version: 0.3.5 -Release: 1.git%{shortcommit}%{?dist} +Release: 2.git%{shortcommit}%{?dist} Summary: Manage Pods, Containers and Container Images License: ASL 2.0 URL: %{git_podman} @@ -487,6 +487,9 @@ export GOPATH=%{buildroot}/%{gopath}:$(pwd)/vendor:%{gopath} %endif %changelog +* Tue Apr 3 2018 Dan Walsh - 0.3.5-2.git712f3b8cf14 +- Add proper version of conmon + * Thu Mar 29 2018 baude - 0.3.5-1.git712f3b8cf14 - Upstream release 0.3.5 diff --git a/sources b/sources index e46c6b5..3bfbadd 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -SHA512 (cri-o-712f3b8.tar.gz) = 46f9cf6b2796b512eef15adf052842b50021ce07a8bb51bb6494698321e317d782f1978032e9cad0d836bc951ff61bfc778c6c57506475975acc0eac236fd354 SHA512 (libpod-db6bf9e.tar.gz) = 489d9d5fe3d62a2307f0d06e8781305130d0d6fbcc2a14e28e0c6db4ef07acf402895bd88340fe5863332ae717fc36d220041816079ef9eeb97129f133785591 +SHA512 (cri-o-6a018de.tar.gz) = fadce72967c78afd2c711907f48bdfdac908eaf9a6d09fbb03e4d0aa8613c13b4080257ff5d4f4ac6246f3e98df10c0e083182f91f438749cd61a55fa4bb5152 From da31d4ffcb58b8f2e22ff701d41e457e1c223e38 Mon Sep 17 00:00:00 2001 From: Daniel J Walsh Date: Tue, 3 Apr 2018 08:44:59 -0400 Subject: [PATCH 012/110] Add proper version of conmon --- podman.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/podman.spec b/podman.spec index a5f68a4..fe055b0 100644 --- a/podman.spec +++ b/podman.spec @@ -382,7 +382,7 @@ popd ln -s vendor src export GOPATH=$(pwd)/_output:$(pwd):%{gopath} export BUILDTAGS="selinux seccomp $(hack/btrfs_installed_tag.sh) $(hack/btrfs_tag.sh) containers_image_ostree_stub" -BUILDTAGS=$BUILDTAGS make conmon +BUILDTAGS=$BUILDTAGS make -C conmon popd %install From 7e4a45e6c2aeb994152c2dec5df1965837394c9c Mon Sep 17 00:00:00 2001 From: baude Date: Thu, 5 Apr 2018 12:25:35 -0500 Subject: [PATCH 013/110] Upstream release 0.4.1 --- .gitignore | 2 ++ podman.spec | 9 ++++++--- sources | 2 +- 3 files changed, 9 insertions(+), 4 deletions(-) diff --git a/.gitignore b/.gitignore index 6656804..e46748c 100644 --- a/.gitignore +++ b/.gitignore @@ -10,3 +10,5 @@ /libpod-b47fc0d.tar.gz /libpod-57b403e.tar.gz /libpod-db6bf9e.tar.gz +/cri-o-6a018de.tar.gz +/libpod-b51d327.tar.gz diff --git a/podman.spec b/podman.spec index fe055b0..4a5a17b 100644 --- a/podman.spec +++ b/podman.spec @@ -41,7 +41,7 @@ %global provider_prefix %{provider}.%{provider_tld}/%{project}/%{repo} %global import_path %{provider_prefix} %global git_podman https://%{provider}.%{provider_tld}/%{project}/%{repo} -%global commit db6bf9e3ad7900f0bf062fd12b80706c1bd7bb5f +%global commit b51d32703f80e40487a5f494d6209ffd7e596ada %global shortcommit %(c=%{commit}; echo ${c:0:7}) %global import_path_conmon github.com/kubernetes-incubator/cri-o @@ -50,8 +50,8 @@ %global shortcommit_conmon %(c=%{commit_conmon}; echo ${c:0:7}) Name: podman -Version: 0.3.5 -Release: 2.git%{shortcommit}%{?dist} +Version: 0.4.1 +Release: 1.git%{shortcommit}%{?dist} Summary: Manage Pods, Containers and Container Images License: ASL 2.0 URL: %{git_podman} @@ -487,6 +487,9 @@ export GOPATH=%{buildroot}/%{gopath}:$(pwd)/vendor:%{gopath} %endif %changelog +* Thu Apr 05 2018 baude - 0.4.1-1.gitb51d3270 +- Upstream release 0.4.1 + * Tue Apr 3 2018 Dan Walsh - 0.3.5-2.git712f3b8cf14 - Add proper version of conmon diff --git a/sources b/sources index 3bfbadd..2e27fbe 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -SHA512 (libpod-db6bf9e.tar.gz) = 489d9d5fe3d62a2307f0d06e8781305130d0d6fbcc2a14e28e0c6db4ef07acf402895bd88340fe5863332ae717fc36d220041816079ef9eeb97129f133785591 SHA512 (cri-o-6a018de.tar.gz) = fadce72967c78afd2c711907f48bdfdac908eaf9a6d09fbb03e4d0aa8613c13b4080257ff5d4f4ac6246f3e98df10c0e083182f91f438749cd61a55fa4bb5152 +SHA512 (libpod-b51d327.tar.gz) = 3959450167bac50a133b8f9cc07713844d7589153eb80cd36a4ab7a05b20eb12aeef375eb249f77aba83de876813302af92f4493df867166836102c5bd47c10a From ec027cf18b292ee168942f433a5a247ee4784528 Mon Sep 17 00:00:00 2001 From: baude Date: Fri, 13 Apr 2018 14:13:42 -0500 Subject: [PATCH 014/110] New Upstream 0.4.2 release and updated conmon --- .gitignore | 2 ++ podman.spec | 10 +++++++--- sources | 4 ++-- 3 files changed, 11 insertions(+), 5 deletions(-) diff --git a/.gitignore b/.gitignore index e46748c..5d48b41 100644 --- a/.gitignore +++ b/.gitignore @@ -12,3 +12,5 @@ /libpod-db6bf9e.tar.gz /cri-o-6a018de.tar.gz /libpod-b51d327.tar.gz +/cri-o-c24e0d9.tar.gz +/libpod-f740ee0.tar.gz diff --git a/podman.spec b/podman.spec index 4a5a17b..99195aa 100644 --- a/podman.spec +++ b/podman.spec @@ -41,16 +41,16 @@ %global provider_prefix %{provider}.%{provider_tld}/%{project}/%{repo} %global import_path %{provider_prefix} %global git_podman https://%{provider}.%{provider_tld}/%{project}/%{repo} -%global commit b51d32703f80e40487a5f494d6209ffd7e596ada +%global commit f740ee0ba60c9a07edaa8560043f3c3fe953cd3c %global shortcommit %(c=%{commit}; echo ${c:0:7}) %global import_path_conmon github.com/kubernetes-incubator/cri-o %global git_conmon https://%{import_path_conmon} -%global commit_conmon 6a018deb09e704e24ae8ff9d7c79ca8aa650c04c +%global commit_conmon c24e0d9ee7f74082d1ddb6154e0ba3418b538276 %global shortcommit_conmon %(c=%{commit_conmon}; echo ${c:0:7}) Name: podman -Version: 0.4.1 +Version: 0.4.2 Release: 1.git%{shortcommit}%{?dist} Summary: Manage Pods, Containers and Container Images License: ASL 2.0 @@ -487,6 +487,10 @@ export GOPATH=%{buildroot}/%{gopath}:$(pwd)/vendor:%{gopath} %endif %changelog +* Fri Apr 13 2018 baude - 0.4.2-1.gitf740ee0b +- Upstream release 0.4.2 +- Update conmon for new console-related features + * Thu Apr 05 2018 baude - 0.4.1-1.gitb51d3270 - Upstream release 0.4.1 diff --git a/sources b/sources index 2e27fbe..b95ed64 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -SHA512 (cri-o-6a018de.tar.gz) = fadce72967c78afd2c711907f48bdfdac908eaf9a6d09fbb03e4d0aa8613c13b4080257ff5d4f4ac6246f3e98df10c0e083182f91f438749cd61a55fa4bb5152 -SHA512 (libpod-b51d327.tar.gz) = 3959450167bac50a133b8f9cc07713844d7589153eb80cd36a4ab7a05b20eb12aeef375eb249f77aba83de876813302af92f4493df867166836102c5bd47c10a +SHA512 (cri-o-c24e0d9.tar.gz) = 9f410e76920c3acd449665e437013b390cfb1e05af7da72716580f3dfb49c41a1610e0a97278d20901168b9ef65b5248b5f4ebcb46e44c5dc84781f9ba23c984 +SHA512 (libpod-f740ee0.tar.gz) = 43e88d3dd3dfe8f11ebd391ce8db9cd0067e2da26629f853933a1ff9a613b17bca534cc201cb167e2b904c31f01daee7b09836f4e2686276e6e02549079f961b From c8ef7b7fa237d6d8e64ca8f82c5ec8273df3149e Mon Sep 17 00:00:00 2001 From: baude Date: Mon, 16 Apr 2018 13:22:42 -0500 Subject: [PATCH 015/110] Add runtime dep for oci-systemd-hook Signed-off-by: baude --- podman.spec | 1 + 1 file changed, 1 insertion(+) diff --git a/podman.spec b/podman.spec index 99195aa..76293e7 100644 --- a/podman.spec +++ b/podman.spec @@ -84,6 +84,7 @@ Requires: buildah Requires: containernetworking-cni > 0.6 Requires: iptables Requires: atomic-registries +Requires: oci-systemd-hook # vendored libraries # awk '{print "Provides: bundled(golang("$1")) = "$2}' vendor.conf | sort From 0c45b4d7d469da665898cca26b28caf8fa223300 Mon Sep 17 00:00:00 2001 From: baude Date: Fri, 20 Apr 2018 12:47:04 -0500 Subject: [PATCH 016/110] Upstream 0.4.3 --- .gitignore | 1 + podman.spec | 7 +++++-- sources | 2 +- 3 files changed, 7 insertions(+), 3 deletions(-) diff --git a/.gitignore b/.gitignore index 5d48b41..dd23d8a 100644 --- a/.gitignore +++ b/.gitignore @@ -14,3 +14,4 @@ /libpod-b51d327.tar.gz /cri-o-c24e0d9.tar.gz /libpod-f740ee0.tar.gz +/libpod-4c0d8b0.tar.gz diff --git a/podman.spec b/podman.spec index 76293e7..7579840 100644 --- a/podman.spec +++ b/podman.spec @@ -41,7 +41,7 @@ %global provider_prefix %{provider}.%{provider_tld}/%{project}/%{repo} %global import_path %{provider_prefix} %global git_podman https://%{provider}.%{provider_tld}/%{project}/%{repo} -%global commit f740ee0ba60c9a07edaa8560043f3c3fe953cd3c +%global commit 4c0d8b0d7fae6c0c156d27d519a21690516b4d1b %global shortcommit %(c=%{commit}; echo ${c:0:7}) %global import_path_conmon github.com/kubernetes-incubator/cri-o @@ -50,7 +50,7 @@ %global shortcommit_conmon %(c=%{commit_conmon}; echo ${c:0:7}) Name: podman -Version: 0.4.2 +Version: 0.4.3 Release: 1.git%{shortcommit}%{?dist} Summary: Manage Pods, Containers and Container Images License: ASL 2.0 @@ -488,6 +488,9 @@ export GOPATH=%{buildroot}/%{gopath}:$(pwd)/vendor:%{gopath} %endif %changelog +* Fri Apr 20 2018 baude - 0.4.3-1.git4c0d8b0d +- Upstream release 0.4.3 + * Fri Apr 13 2018 baude - 0.4.2-1.gitf740ee0b - Upstream release 0.4.2 - Update conmon for new console-related features diff --git a/sources b/sources index b95ed64..d608178 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ SHA512 (cri-o-c24e0d9.tar.gz) = 9f410e76920c3acd449665e437013b390cfb1e05af7da72716580f3dfb49c41a1610e0a97278d20901168b9ef65b5248b5f4ebcb46e44c5dc84781f9ba23c984 -SHA512 (libpod-f740ee0.tar.gz) = 43e88d3dd3dfe8f11ebd391ce8db9cd0067e2da26629f853933a1ff9a613b17bca534cc201cb167e2b904c31f01daee7b09836f4e2686276e6e02549079f961b +SHA512 (libpod-4c0d8b0.tar.gz) = c0757c701080ff8fc6d28fb6e1dc9ea09736f8a54b057d8d1fbb95d41058a4a1b4f3e8a2451210b90912f5936a574d7923094c0a1b1edfdca337c0fb09c89784 From 6aebb2d2fbd4ef08fb1d6f675eed8c142e6b2147 Mon Sep 17 00:00:00 2001 From: baude Date: Fri, 27 Apr 2018 19:13:09 -0500 Subject: [PATCH 017/110] Upstream release 0.4.4 --- .gitignore | 1 + podman.spec | 12 +++++++++--- sources | 2 +- 3 files changed, 11 insertions(+), 4 deletions(-) diff --git a/.gitignore b/.gitignore index dd23d8a..1ae1058 100644 --- a/.gitignore +++ b/.gitignore @@ -15,3 +15,4 @@ /cri-o-c24e0d9.tar.gz /libpod-f740ee0.tar.gz /libpod-4c0d8b0.tar.gz +/libpod-888927a.tar.gz diff --git a/podman.spec b/podman.spec index 7579840..332a45a 100644 --- a/podman.spec +++ b/podman.spec @@ -41,7 +41,7 @@ %global provider_prefix %{provider}.%{provider_tld}/%{project}/%{repo} %global import_path %{provider_prefix} %global git_podman https://%{provider}.%{provider_tld}/%{project}/%{repo} -%global commit 4c0d8b0d7fae6c0c156d27d519a21690516b4d1b +%global commit 888927abaaca9ae13ff885f1f493e98b6e7bcb7b %global shortcommit %(c=%{commit}; echo ${c:0:7}) %global import_path_conmon github.com/kubernetes-incubator/cri-o @@ -50,7 +50,7 @@ %global shortcommit_conmon %(c=%{commit_conmon}; echo ${c:0:7}) Name: podman -Version: 0.4.3 +Version: 0.4.4 Release: 1.git%{shortcommit}%{?dist} Summary: Manage Pods, Containers and Container Images License: ASL 2.0 @@ -80,7 +80,6 @@ Requires: runc Requires: skopeo-containers # can't use default conmon right now, so we ship our own #Requires: conmon -Requires: buildah Requires: containernetworking-cni > 0.6 Requires: iptables Requires: atomic-registries @@ -387,6 +386,7 @@ BUILDTAGS=$BUILDTAGS make -C conmon popd %install +install -dp %{buildroot}%{_unitdir} %make_install PREFIX=%{buildroot}%{_prefix} install install.completions # install libpod.conf @@ -469,10 +469,13 @@ export GOPATH=%{buildroot}/%{gopath}:$(pwd)/vendor:%{gopath} %doc README.md CONTRIBUTING.md hooks.md install.md code-of-conduct.md transfer.md %{_bindir}/%{name} %{_mandir}/man1/*.1* +%{_mandir}/man5/*.5* %{_datadir}/bash-completion/completions/* %{_libexecdir}/%{name}/conmon %config(noreplace) %{_sysconfdir}/cni/net.d/87-%{name}-bridge.conflist %{_datadir}/containers/%{repo}.conf +%{_unitdir}/io.%{project}.%{name}.service +%{_unitdir}/io.%{project}.%{name}.socket %if 0%{?with_devel} %files -n libpod-devel -f devel.file-list @@ -488,6 +491,9 @@ export GOPATH=%{buildroot}/%{gopath}:$(pwd)/vendor:%{gopath} %endif %changelog +* Fri Apr 27 2018 baude - 0.4.3-2.git4c0d8b0 +- Upstream release 0.4.4 + * Fri Apr 20 2018 baude - 0.4.3-1.git4c0d8b0d - Upstream release 0.4.3 diff --git a/sources b/sources index d608178..b80d68d 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ SHA512 (cri-o-c24e0d9.tar.gz) = 9f410e76920c3acd449665e437013b390cfb1e05af7da72716580f3dfb49c41a1610e0a97278d20901168b9ef65b5248b5f4ebcb46e44c5dc84781f9ba23c984 -SHA512 (libpod-4c0d8b0.tar.gz) = c0757c701080ff8fc6d28fb6e1dc9ea09736f8a54b057d8d1fbb95d41058a4a1b4f3e8a2451210b90912f5936a574d7923094c0a1b1edfdca337c0fb09c89784 +SHA512 (libpod-888927a.tar.gz) = 5bd7445bdd72173a09e6a7583404f2f09e8c7665401a56a83a50684d5b55d287f1c82a08be97a07904dde8203321a1881b9c8a5e080b4f599834ecb35f563c75 From ef20a8ac6e206289fb43b35df4bb191a9e93b719 Mon Sep 17 00:00:00 2001 From: baude Date: Tue, 1 May 2018 07:56:34 -0500 Subject: [PATCH 018/110] Release 0.4.4-2 ... fixes to commit and systemd files --- .gitignore | 1 + podman.spec | 8 ++++++-- sources | 2 +- 3 files changed, 8 insertions(+), 3 deletions(-) diff --git a/.gitignore b/.gitignore index 1ae1058..ac248ea 100644 --- a/.gitignore +++ b/.gitignore @@ -16,3 +16,4 @@ /libpod-f740ee0.tar.gz /libpod-4c0d8b0.tar.gz /libpod-888927a.tar.gz +/libpod-9924956.tar.gz diff --git a/podman.spec b/podman.spec index 332a45a..f318607 100644 --- a/podman.spec +++ b/podman.spec @@ -41,7 +41,7 @@ %global provider_prefix %{provider}.%{provider_tld}/%{project}/%{repo} %global import_path %{provider_prefix} %global git_podman https://%{provider}.%{provider_tld}/%{project}/%{repo} -%global commit 888927abaaca9ae13ff885f1f493e98b6e7bcb7b +%global commit 9924956dc88bf91a4d0bf09249ffb4cb960dee01 %global shortcommit %(c=%{commit}; echo ${c:0:7}) %global import_path_conmon github.com/kubernetes-incubator/cri-o @@ -51,7 +51,7 @@ Name: podman Version: 0.4.4 -Release: 1.git%{shortcommit}%{?dist} +Release: 2.git%{shortcommit}%{?dist} Summary: Manage Pods, Containers and Container Images License: ASL 2.0 URL: %{git_podman} @@ -491,6 +491,10 @@ export GOPATH=%{buildroot}/%{gopath}:$(pwd)/vendor:%{gopath} %endif %changelog +* Tue May 01 2018 baude - 0.4.4-2.git9924956 +- Do not mount default volumes +- Fix varlink systemd service file + * Fri Apr 27 2018 baude - 0.4.3-2.git4c0d8b0 - Upstream release 0.4.4 diff --git a/sources b/sources index b80d68d..00723d9 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ SHA512 (cri-o-c24e0d9.tar.gz) = 9f410e76920c3acd449665e437013b390cfb1e05af7da72716580f3dfb49c41a1610e0a97278d20901168b9ef65b5248b5f4ebcb46e44c5dc84781f9ba23c984 -SHA512 (libpod-888927a.tar.gz) = 5bd7445bdd72173a09e6a7583404f2f09e8c7665401a56a83a50684d5b55d287f1c82a08be97a07904dde8203321a1881b9c8a5e080b4f599834ecb35f563c75 +SHA512 (libpod-9924956.tar.gz) = d4e74e9dc7b4e676534c664ee99591b9822e32703cc318224a43d3833d080c219a8d0227d25cdcf881eaefa6c737318a0377eef5d258840a05207c34ceec68db From b3440170715ca2ddc1f410e9ef2041fab77b6344 Mon Sep 17 00:00:00 2001 From: baude Date: Fri, 4 May 2018 10:48:45 -0500 Subject: [PATCH 019/110] Upstream 0.5.1 release --- .gitignore | 1 + podman.spec | 9 ++++++--- sources | 2 +- 3 files changed, 8 insertions(+), 4 deletions(-) diff --git a/.gitignore b/.gitignore index ac248ea..e61db68 100644 --- a/.gitignore +++ b/.gitignore @@ -17,3 +17,4 @@ /libpod-4c0d8b0.tar.gz /libpod-888927a.tar.gz /libpod-9924956.tar.gz +/libpod-d0fbfdc.tar.gz diff --git a/podman.spec b/podman.spec index f318607..f58a642 100644 --- a/podman.spec +++ b/podman.spec @@ -41,7 +41,7 @@ %global provider_prefix %{provider}.%{provider_tld}/%{project}/%{repo} %global import_path %{provider_prefix} %global git_podman https://%{provider}.%{provider_tld}/%{project}/%{repo} -%global commit 9924956dc88bf91a4d0bf09249ffb4cb960dee01 +%global commit d0fbfdc0accf4e491fdca778f6719e9158794108 %global shortcommit %(c=%{commit}; echo ${c:0:7}) %global import_path_conmon github.com/kubernetes-incubator/cri-o @@ -50,8 +50,8 @@ %global shortcommit_conmon %(c=%{commit_conmon}; echo ${c:0:7}) Name: podman -Version: 0.4.4 -Release: 2.git%{shortcommit}%{?dist} +Version: 0.5.1 +Release: 1.git%{shortcommit}%{?dist} Summary: Manage Pods, Containers and Container Images License: ASL 2.0 URL: %{git_podman} @@ -491,6 +491,9 @@ export GOPATH=%{buildroot}/%{gopath}:$(pwd)/vendor:%{gopath} %endif %changelog +* Fri May 04 2018 baude - 0.5.1-1.gitd0fbfdc +- Upstream release 0.5.1 + * Tue May 01 2018 baude - 0.4.4-2.git9924956 - Do not mount default volumes - Fix varlink systemd service file diff --git a/sources b/sources index 00723d9..b32ca97 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ SHA512 (cri-o-c24e0d9.tar.gz) = 9f410e76920c3acd449665e437013b390cfb1e05af7da72716580f3dfb49c41a1610e0a97278d20901168b9ef65b5248b5f4ebcb46e44c5dc84781f9ba23c984 -SHA512 (libpod-9924956.tar.gz) = d4e74e9dc7b4e676534c664ee99591b9822e32703cc318224a43d3833d080c219a8d0227d25cdcf881eaefa6c737318a0377eef5d258840a05207c34ceec68db +SHA512 (libpod-d0fbfdc.tar.gz) = 9b0ac5517457316cf5c85f0203b76f223cf5e6c4bbdd2bb1978401d90cdf39dba9604475ff411a55b2c4fe62e2c4acf308d58fc2764511091f10faeb0cad5e70 From 50ed84c11ad2c110850dc389230c09b14ec215e0 Mon Sep 17 00:00:00 2001 From: baude Date: Fri, 11 May 2018 13:16:42 -0500 Subject: [PATCH 020/110] Upstream 0.5.2 --- .gitignore | 1 + podman.spec | 14 +++++++++----- sources | 2 +- 3 files changed, 11 insertions(+), 6 deletions(-) diff --git a/.gitignore b/.gitignore index e61db68..67e5f11 100644 --- a/.gitignore +++ b/.gitignore @@ -18,3 +18,4 @@ /libpod-888927a.tar.gz /libpod-9924956.tar.gz /libpod-d0fbfdc.tar.gz +/libpod-4631586.tar.gz diff --git a/podman.spec b/podman.spec index f58a642..9e9dfb3 100644 --- a/podman.spec +++ b/podman.spec @@ -41,7 +41,7 @@ %global provider_prefix %{provider}.%{provider_tld}/%{project}/%{repo} %global import_path %{provider_prefix} %global git_podman https://%{provider}.%{provider_tld}/%{project}/%{repo} -%global commit d0fbfdc0accf4e491fdca778f6719e9158794108 +%global commit 4631586aa3928804c164fce027b6589477f97fa0 %global shortcommit %(c=%{commit}; echo ${c:0:7}) %global import_path_conmon github.com/kubernetes-incubator/cri-o @@ -50,7 +50,7 @@ %global shortcommit_conmon %(c=%{commit_conmon}; echo ${c:0:7}) Name: podman -Version: 0.5.1 +Version: 0.5.2 Release: 1.git%{shortcommit}%{?dist} Summary: Manage Pods, Containers and Container Images License: ASL 2.0 @@ -353,6 +353,7 @@ providing packages with %{import_path} prefix. %prep %autosetup -Sgit -n %{repo}-%{commit} sed -i '/\/bin\/bash/d' completions/bash/%{name} +mv pkg/hooks/README.md pkg/hooks/README-hooks.md # untar cri-o tar zxf %{SOURCE1} @@ -466,7 +467,7 @@ export GOPATH=%{buildroot}/%{gopath}:$(pwd)/vendor:%{gopath} %files %license LICENSE -%doc README.md CONTRIBUTING.md hooks.md install.md code-of-conduct.md transfer.md +%doc README.md CONTRIBUTING.md pkg/hooks/README-hooks.md install.md code-of-conduct.md transfer.md %{_bindir}/%{name} %{_mandir}/man1/*.1* %{_mandir}/man5/*.5* @@ -480,17 +481,20 @@ export GOPATH=%{buildroot}/%{gopath}:$(pwd)/vendor:%{gopath} %if 0%{?with_devel} %files -n libpod-devel -f devel.file-list %license LICENSE -%doc README.md CONTRIBUTING.md hooks.md install.md code-of-conduct.md transfer.md +%doc README.md CONTRIBUTING.md pkg/hooks/README-hooks.md install.md code-of-conduct.md transfer.md %dir %{gopath}/src/%{provider}.%{provider_tld}/%{project} %endif %if 0%{?with_unit_test} && 0%{?with_devel} %files unit-test-devel -f unit-test-devel.file-list %license LICENSE -%doc README.md CONTRIBUTING.md hooks.md install.md code-of-conduct.md transfer.md +%doc README.md CONTRIBUTING.md pkg/hooks/README-hooks.md install.md code-of-conduct.md transfer.md %endif %changelog +* Fri May 11 2018 baude - 0.5.2-1.git4631586 +- Upstream release 0.5.2 + * Fri May 04 2018 baude - 0.5.1-1.gitd0fbfdc - Upstream release 0.5.1 diff --git a/sources b/sources index b32ca97..1809d7e 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ SHA512 (cri-o-c24e0d9.tar.gz) = 9f410e76920c3acd449665e437013b390cfb1e05af7da72716580f3dfb49c41a1610e0a97278d20901168b9ef65b5248b5f4ebcb46e44c5dc84781f9ba23c984 -SHA512 (libpod-d0fbfdc.tar.gz) = 9b0ac5517457316cf5c85f0203b76f223cf5e6c4bbdd2bb1978401d90cdf39dba9604475ff411a55b2c4fe62e2c4acf308d58fc2764511091f10faeb0cad5e70 +SHA512 (libpod-4631586.tar.gz) = 4ae2ebf89b6d5333145c4be8da6a4babfef3095b335b5cc788665f14b8ade07c0f14210b2656eb3c9e4c144e10b2ea3be786d679f938a6a64cdd6da9cbb42d0c From 5f72cc86c50806b53c8bb59c38b7ec86941083ad Mon Sep 17 00:00:00 2001 From: baude Date: Fri, 18 May 2018 13:24:57 -0500 Subject: [PATCH 021/110] Upstream 0.5.3 --- .gitignore | 1 + podman.spec | 61 ++++++++++++++++++++++++++++++++++++++++++++++------- sources | 2 +- 3 files changed, 55 insertions(+), 9 deletions(-) diff --git a/.gitignore b/.gitignore index 67e5f11..e5868f7 100644 --- a/.gitignore +++ b/.gitignore @@ -19,3 +19,4 @@ /libpod-9924956.tar.gz /libpod-d0fbfdc.tar.gz /libpod-4631586.tar.gz +/libpod-dc3f9df.tar.gz diff --git a/podman.spec b/podman.spec index 9e9dfb3..900aca6 100644 --- a/podman.spec +++ b/podman.spec @@ -23,7 +23,14 @@ # Generate unit-test rpm %global with_unit_test 0 +%if 0%{?fedora} >= 28 +%bcond_without varlink +%else +%bcond_with varlink +%endif + %if 0%{?with_debug} +%global _find_debuginfo_dwz_opts %{nil} %global _dwz_low_mem_die_limit 0 %else %global debug_package %{nil} @@ -41,7 +48,7 @@ %global provider_prefix %{provider}.%{provider_tld}/%{project}/%{repo} %global import_path %{provider_prefix} %global git_podman https://%{provider}.%{provider_tld}/%{project}/%{repo} -%global commit 4631586aa3928804c164fce027b6589477f97fa0 +%global commit dc3f9df0b35d47f48dd652687b8a5cf5ab01f778 %global shortcommit %(c=%{commit}; echo ${c:0:7}) %global import_path_conmon github.com/kubernetes-incubator/cri-o @@ -50,7 +57,7 @@ %global shortcommit_conmon %(c=%{commit_conmon}; echo ${c:0:7}) Name: podman -Version: 0.5.2 +Version: 0.5.3 Release: 1.git%{shortcommit}%{?dist} Summary: Manage Pods, Containers and Container Images License: ASL 2.0 @@ -191,6 +198,20 @@ Provides: bundled(golang(gopkg.in/yaml.v2)) = v2 libpod provides a library for applications looking to use the Container Pod concept popularized by Kubernetes. +%if %{with varlink} +%package -n python3-%{name} +BuildArch: noarch +BuildRequires: python3-devel +BuildRequires: python3-setuptools +BuildRequires: python3-varlink +Requires: python3-varlink +Provides: python3-%{name} = %{version}-%{release} +Summary: Python 3 bindings for %{name} + +%description -n python3-%{name} +This package contains Python 3 bindings for %{name}. +%endif # varlink + %if 0%{?with_devel} %package -n libpod-devel Summary: Library for applications looking to use Container Pods @@ -352,8 +373,7 @@ providing packages with %{import_path} prefix. %prep %autosetup -Sgit -n %{repo}-%{commit} -sed -i '/\/bin\/bash/d' completions/bash/%{name} -mv pkg/hooks/README.md pkg/hooks/README-hooks.md +sed -i '/\/bin\/env/d' completions/bash/%{name} # untar cri-o tar zxf %{SOURCE1} @@ -369,7 +389,14 @@ export GOPATH=$(pwd)/_build:$(pwd):$(pwd):%{gopath} export BUILDTAGS="selinux seccomp $(hack/btrfs_installed_tag.sh) $(hack/btrfs_tag.sh) $(hack/libdm_tag.sh) containers_image_ostree_stub" GOPATH=$GOPATH BUILDTAGS=$BUILDTAGS %gobuild -o bin/%{name} %{import_path}/cmd/%{name} -BUILDTAGS=$BUILDTAGS make docs +BUILDTAGS=$BUILDTAGS make binaries docs + +%if %{with varlink} +#untar contents for python-podman +pushd contrib/python/dist +tar zxf %{name}*.tar.gz +popd +%endif # varlink # build conmon pushd cri-o-%{commit_conmon} @@ -390,6 +417,13 @@ popd install -dp %{buildroot}%{_unitdir} %make_install PREFIX=%{buildroot}%{_prefix} install install.completions +%if %{with varlink} +#install python-podman +pushd contrib/python +%{__python3} setup.py install --root %{buildroot} +popd +%endif # varlink + # install libpod.conf install -dp %{buildroot}%{_datadir}/containers install -p -m 644 %{repo}.conf %{buildroot}%{_datadir}/containers @@ -467,7 +501,7 @@ export GOPATH=%{buildroot}/%{gopath}:$(pwd)/vendor:%{gopath} %files %license LICENSE -%doc README.md CONTRIBUTING.md pkg/hooks/README-hooks.md install.md code-of-conduct.md transfer.md +%doc README.md CONTRIBUTING.md install.md code-of-conduct.md transfer.md %{_bindir}/%{name} %{_mandir}/man1/*.1* %{_mandir}/man5/*.5* @@ -478,20 +512,31 @@ export GOPATH=%{buildroot}/%{gopath}:$(pwd)/vendor:%{gopath} %{_unitdir}/io.%{project}.%{name}.service %{_unitdir}/io.%{project}.%{name}.socket +%if %{with varlink} +%files -n python3-%{name} +%license LICENSE +%doc README.md CONTRIBUTING.md install.md code-of-conduct.md transfer.md +%dir %{python3_sitelib} +%{python3_sitelib}/* +%endif # varlink + %if 0%{?with_devel} %files -n libpod-devel -f devel.file-list %license LICENSE -%doc README.md CONTRIBUTING.md pkg/hooks/README-hooks.md install.md code-of-conduct.md transfer.md +%doc README.md CONTRIBUTING.md install.md code-of-conduct.md transfer.md %dir %{gopath}/src/%{provider}.%{provider_tld}/%{project} %endif %if 0%{?with_unit_test} && 0%{?with_devel} %files unit-test-devel -f unit-test-devel.file-list %license LICENSE -%doc README.md CONTRIBUTING.md pkg/hooks/README-hooks.md install.md code-of-conduct.md transfer.md +%doc README.md CONTRIBUTING.md install.md code-of-conduct.md transfer.md %endif %changelog +* Fri May 18 2018 baude - 0.5.3-1.gitdc3f9df +- Upstream release 0.5.3 + * Fri May 11 2018 baude - 0.5.2-1.git4631586 - Upstream release 0.5.2 diff --git a/sources b/sources index 1809d7e..d87d5ab 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ SHA512 (cri-o-c24e0d9.tar.gz) = 9f410e76920c3acd449665e437013b390cfb1e05af7da72716580f3dfb49c41a1610e0a97278d20901168b9ef65b5248b5f4ebcb46e44c5dc84781f9ba23c984 -SHA512 (libpod-4631586.tar.gz) = 4ae2ebf89b6d5333145c4be8da6a4babfef3095b335b5cc788665f14b8ade07c0f14210b2656eb3c9e4c144e10b2ea3be786d679f938a6a64cdd6da9cbb42d0c +SHA512 (libpod-dc3f9df.tar.gz) = 57c8a8ed0f840670bf33809e610904be30eab1b21eabad094e241ba97d40efb5c2e13aa67001fbad131517454375fb7bc2aa0a0a2e26a25a7bbb179f77c47b3d From 199c77bcd6996f4f564bb0dfe6399789b661772e Mon Sep 17 00:00:00 2001 From: baude Date: Sat, 19 May 2018 10:53:13 -0500 Subject: [PATCH 022/110] Patching to correct paths and security permissions --- ...ecurity-on-the-podman-varlink-socket.patch | 123 + ...finish-changing-the-path-for-varlink.patch | 3263 +++++++++++++++++ podman.spec | 8 +- 3 files changed, 3393 insertions(+), 1 deletion(-) create mode 100644 0001-Tighten-the-security-on-the-podman-varlink-socket.patch create mode 100644 0001-finish-changing-the-path-for-varlink.patch diff --git a/0001-Tighten-the-security-on-the-podman-varlink-socket.patch b/0001-Tighten-the-security-on-the-podman-varlink-socket.patch new file mode 100644 index 0000000..aa7c737 --- /dev/null +++ b/0001-Tighten-the-security-on-the-podman-varlink-socket.patch @@ -0,0 +1,123 @@ +From 9d7c50aa030ee70d507c414bb02f0add8ffa2835 Mon Sep 17 00:00:00 2001 +From: Daniel J Walsh +Date: Fri, 18 May 2018 16:28:51 -0400 +Subject: [PATCH] Tighten the security on the podman varlink socket + +We only want root to be allowed to access this socket. +Also move socket to /run/podman directory. This requires +us to drop a podman.conf tmpfiles.d file. + +Signed-off-by: Daniel J Walsh + +Closes: #806 +Approved by: mheon +--- + Makefile | 2 ++ + contrib/spec/podman.spec.in | 1 + + contrib/varlink/io.projectatomic.podman.service | 5 +++-- + contrib/varlink/io.projectatomic.podman.socket | 6 ++++-- + contrib/varlink/podman.conf | 1 + + docs/podman-varlink.1.md | 10 +++++++++- + 6 files changed, 20 insertions(+), 5 deletions(-) + create mode 100644 contrib/varlink/podman.conf + +diff --git a/Makefile b/Makefile +index a839b1a..3833ac7 100644 +--- a/Makefile ++++ b/Makefile +@@ -15,6 +15,7 @@ MANDIR ?= ${PREFIX}/share/man + SHAREDIR_CONTAINERS ?= ${PREFIX}/share/containers + ETCDIR ?= ${DESTDIR}/etc + ETCDIR_LIBPOD ?= ${ETCDIR}/crio ++TMPFILESDIR ?= ${PREFIX}/lib/tmpfiles.d + SYSTEMDDIR ?= ${PREFIX}/lib/systemd/system + BUILDTAGS ?= seccomp $(shell hack/btrfs_tag.sh) $(shell hack/libdm_tag.sh) $(shell hack/btrfs_installed_tag.sh) $(shell hack/ostree_tag.sh) $(shell hack/selinux_tag.sh) + PYTHON ?= /usr/bin/python3 +@@ -208,6 +209,7 @@ install.docker: docker-docs + install.systemd: + install ${SELINUXOPT} -m 644 -D contrib/varlink/io.projectatomic.podman.socket ${SYSTEMDDIR}/io.projectatomic.podman.socket + install ${SELINUXOPT} -m 644 -D contrib/varlink/io.projectatomic.podman.service ${SYSTEMDDIR}/io.projectatomic.podman.service ++ install ${SELINUXOPT} -m 644 -D contrib/varlink/podman.conf ${TMPFILESDIR}/podman.conf + + uninstall: + for i in $(filter %.1,$(MANPAGES)); do \ +diff --git a/contrib/spec/podman.spec.in b/contrib/spec/podman.spec.in +index d0ddcea..b1afee2 100644 +--- a/contrib/spec/podman.spec.in ++++ b/contrib/spec/podman.spec.in +@@ -469,6 +469,7 @@ export GOPATH=%{buildroot}/%{gopath}:$(pwd)/vendor:%{gopath} + %config(noreplace) %{_sysconfdir}/cni/net.d/87-%{name}-bridge.conflist + %{_unitdir}/io.%{project}.%{name}.service + %{_unitdir}/io.%{project}.%{name}.socket ++%{_tmpfilesdir}/%{name}.conf + + %if 0%{?fedora} >= 28 + %files -n python3-%{name} +diff --git a/contrib/varlink/io.projectatomic.podman.service b/contrib/varlink/io.projectatomic.podman.service +index fe3a236..1c4c143 100644 +--- a/contrib/varlink/io.projectatomic.podman.service ++++ b/contrib/varlink/io.projectatomic.podman.service +@@ -1,11 +1,12 @@ + [Unit] +-Description=Pod Manager ++Description=Podman Remote API Service + Requires=io.projectatomic.podman.socket + After=io.projectatomic.podman.socket ++Documentation=man:podman-varlink(1) + + [Service] + Type=simple +-ExecStart=/usr/bin/podman varlink unix:/run/io.projectatomic.podman ++ExecStart=/usr/bin/podman varlink unix:/run/podman/io.projectatomic.podman + + [Install] + WantedBy=multi-user.target +diff --git a/contrib/varlink/io.projectatomic.podman.socket b/contrib/varlink/io.projectatomic.podman.socket +index d49b458..bd82c42 100644 +--- a/contrib/varlink/io.projectatomic.podman.socket ++++ b/contrib/varlink/io.projectatomic.podman.socket +@@ -1,8 +1,10 @@ + [Unit] +-Description=Pod Manager Socket ++Description=Podman Remote API Socket ++Documentation=man:podman-varlink(1) + + [Socket] +-ListenStream=/run/io.projectatomic.podman ++ListenStream=/run/podman/io.projectatomic.podman ++SocketMode=0600 + + [Install] + WantedBy=sockets.target +diff --git a/contrib/varlink/podman.conf b/contrib/varlink/podman.conf +new file mode 100644 +index 0000000..732c151 +--- /dev/null ++++ b/contrib/varlink/podman.conf +@@ -0,0 +1 @@ ++d /run/podman 0700 root root +diff --git a/docs/podman-varlink.1.md b/docs/podman-varlink.1.md +index 6cfa8c8..68a0f08 100644 +--- a/docs/podman-varlink.1.md ++++ b/docs/podman-varlink.1.md +@@ -31,8 +31,16 @@ More will go here as the docs and api firm up. + as well. + --> + ++## CONFIGURATION ++ ++Users of the podman varlink service should enable the io.projectatomic.podman.socket and io.projectatomic.podman.service. ++ ++You can do this via systemctl ++ ++systemctl enable --now io.projectatomic.podman.socket ++ + ## SEE ALSO +-podman(1) ++podman(1), systemctl(1) + + ## HISTORY + April 2018, Originally compiled by Brent Baude +-- +2.14.3 + diff --git a/0001-finish-changing-the-path-for-varlink.patch b/0001-finish-changing-the-path-for-varlink.patch new file mode 100644 index 0000000..107ada3 --- /dev/null +++ b/0001-finish-changing-the-path-for-varlink.patch @@ -0,0 +1,3263 @@ +From 3f6a739ede65196a0098acba520cd30b9b036126 Mon Sep 17 00:00:00 2001 +From: baude +Date: Sat, 19 May 2018 10:00:52 -0500 +Subject: [PATCH] finish changing the path for varlink + +cleanup the last references to /run/io.projectatomic... and make sure +/run/podman/projectatomic... is used. + +Signed-off-by: baude +--- + API.md | 14 +- + cmd/podman/varlink/io.projectatomic.podman.varlink | 14 +- + cmd/podman/varlink/ioprojectatomicpodman.go | 1780 ++++++++++---------- + docs/podman-varlink.1.md | 2 +- + 4 files changed, 905 insertions(+), 905 deletions(-) + +diff --git a/API.md b/API.md +index af48c10..ba569d5 100755 +--- a/API.md ++++ b/API.md +@@ -206,7 +206,7 @@ contains attributes like memory and cpu usage. If the container cannot be found + [ContainerNotFound](#ContainerNotFound) error will be returned. + #### Example + ~~~ +-$ varlink call -m unix:/run/io.projectatomic.podman/io.projectatomic.podman.GetContainerStats '{"name": "c33e4164f384"}' ++$ varlink call -m unix:/run/podman/io.projectatomic.podman/io.projectatomic.podman.GetContainerStats '{"name": "c33e4164f384"}' + { + "container": { + "block_input": 0, +@@ -288,7 +288,7 @@ arguements that represent ps options. If the container cannot be found, a [Cont + error will be returned. + #### Example + ~~~ +-$ varlink call -m unix:/run/io.projectatomic.podman/io.projectatomic.podman.ListContainerProcesses '{"name": "135d71b9495f", "opts": []}' ++$ varlink call -m unix:/run/podman/io.projectatomic.podman/io.projectatomic.podman.ListContainerProcesses '{"name": "135d71b9495f", "opts": []}' + { + "container": [ + " UID PID PPID C STIME TTY TIME CMD", +@@ -324,7 +324,7 @@ method Ping() [StringResponse](#StringResponse) + Ping provides a response for developers to ensure their varlink setup is working. + #### Example + ~~~ +-$ varlink call -m unix:/run/io.projectatomic.podman/io.projectatomic.podman.Ping ++$ varlink call -m unix:/run/podman/io.projectatomic.podman/io.projectatomic.podman.Ping + { + "ping": { + "message": "OK" +@@ -339,7 +339,7 @@ PullImage pulls an image from a repository to local storage. After the pull is + is returned. + #### Example + ~~~ +-$ varlink call -m unix:/run/io.projectatomic.podman/io.projectatomic.podman.PullImage '{"name": "registry.fedoraproject.org/fedora"}' ++$ varlink call -m unix:/run/podman/io.projectatomic.podman/io.projectatomic.podman.PullImage '{"name": "registry.fedoraproject.org/fedora"}' + { + "id": "426866d6fa419873f97e5cbd320eeb22778244c1dfffa01c944db3114f55772e" + } +@@ -360,7 +360,7 @@ container can be stopped and removed. Upon sucessful removal of the container, + container cannot be found by name or ID, an [ContainerNotFound](#ContainerNotFound) error will be returned. + #### Error + ~~~ +-$ varlink call -m unix:/run/io.projectatomic.podman/io.projectatomic.podman.RemoveContainer '{"name": "62f4fd98cb57"}' ++$ varlink call -m unix:/run/podman/io.projectatomic.podman/io.projectatomic.podman.RemoveContainer '{"name": "62f4fd98cb57"}' + { + "container": "62f4fd98cb57f529831e8f90610e54bba74bd6f02920ffb485e15376ed365c20" + } +@@ -374,7 +374,7 @@ should be deleted. If the image cannot be found, an [ImageNotFound](#ImageNotFo + ID of the removed image is returned when complete. See also [DeleteUnusedImages](DeleteUnusedImages). + #### Example + ~~~ +-varlink call -m unix:/run/io.projectatomic.podman/io.projectatomic.podman.RemoveImage '{"name": "registry.fedoraproject.org/fedora", "force": true}' ++varlink call -m unix:/run/podman/io.projectatomic.podman/io.projectatomic.podman.RemoveImage '{"name": "registry.fedoraproject.org/fedora", "force": true}' + { + "image": "426866d6fa419873f97e5cbd320eeb22778244c1dfffa01c944db3114f55772e" + } +@@ -419,7 +419,7 @@ returns the container ID once stopped. If the container cannot be found, a [Cont + error will be returned instead. See also [KillContainer](KillContainer). + #### Error + ~~~ +-$ varlink call -m unix:/run/io.projectatomic.podman/io.projectatomic.podman.StopContainer '{"name": "135d71b9495f", "timeout": 5}' ++$ varlink call -m unix:/run/podman/io.projectatomic.podman/io.projectatomic.podman.StopContainer '{"name": "135d71b9495f", "timeout": 5}' + { + "container": "135d71b9495f7c3967f536edad57750bfdb569336cd107d8aabab45565ffcfb6" + } +diff --git a/cmd/podman/varlink/io.projectatomic.podman.varlink b/cmd/podman/varlink/io.projectatomic.podman.varlink +index 3de9ecd..70879b4 100644 +--- a/cmd/podman/varlink/io.projectatomic.podman.varlink ++++ b/cmd/podman/varlink/io.projectatomic.podman.varlink +@@ -176,7 +176,7 @@ type PodmanInfo ( + # Ping provides a response for developers to ensure their varlink setup is working. + # #### Example + # ~~~ +-# $ varlink call -m unix:/run/io.projectatomic.podman/io.projectatomic.podman.Ping ++# $ varlink call -m unix:/run/podman/io.projectatomic.podman/io.projectatomic.podman.Ping + # { + # "ping": { + # "message": "OK" +@@ -216,7 +216,7 @@ method InspectContainer(name: string) -> (container: string) + # error will be returned. + # #### Example + # ~~~ +-# $ varlink call -m unix:/run/io.projectatomic.podman/io.projectatomic.podman.ListContainerProcesses '{"name": "135d71b9495f", "opts": []}' ++# $ varlink call -m unix:/run/podman/io.projectatomic.podman/io.projectatomic.podman.ListContainerProcesses '{"name": "135d71b9495f", "opts": []}' + # { + # "container": [ + # " UID PID PPID C STIME TTY TIME CMD", +@@ -250,7 +250,7 @@ method ExportContainer(name: string, path: string) -> (tarfile: string) + # [ContainerNotFound](#ContainerNotFound) error will be returned. + # #### Example + # ~~~ +-# $ varlink call -m unix:/run/io.projectatomic.podman/io.projectatomic.podman.GetContainerStats '{"name": "c33e4164f384"}' ++# $ varlink call -m unix:/run/podman/io.projectatomic.podman/io.projectatomic.podman.GetContainerStats '{"name": "c33e4164f384"}' + # { + # "container": { + # "block_input": 0, +@@ -283,7 +283,7 @@ method StartContainer() -> (notimplemented: NotImplemented) + # error will be returned instead. See also [KillContainer](KillContainer). + # #### Error + # ~~~ +-# $ varlink call -m unix:/run/io.projectatomic.podman/io.projectatomic.podman.StopContainer '{"name": "135d71b9495f", "timeout": 5}' ++# $ varlink call -m unix:/run/podman/io.projectatomic.podman/io.projectatomic.podman.StopContainer '{"name": "135d71b9495f", "timeout": 5}' + # { + # "container": "135d71b9495f7c3967f536edad57750bfdb569336cd107d8aabab45565ffcfb6" + # } +@@ -330,7 +330,7 @@ method WaitContainer(name: string) -> (exitcode: int) + # container cannot be found by name or ID, an [ContainerNotFound](#ContainerNotFound) error will be returned. + # #### Error + # ~~~ +-# $ varlink call -m unix:/run/io.projectatomic.podman/io.projectatomic.podman.RemoveContainer '{"name": "62f4fd98cb57"}' ++# $ varlink call -m unix:/run/podman/io.projectatomic.podman/io.projectatomic.podman.RemoveContainer '{"name": "62f4fd98cb57"}' + # { + # "container": "62f4fd98cb57f529831e8f90610e54bba74bd6f02920ffb485e15376ed365c20" + # } +@@ -375,7 +375,7 @@ method TagImage(name: string, tagged: string) -> (image: string) + # ID of the removed image is returned when complete. See also [DeleteUnusedImages](DeleteUnusedImages). + # #### Example + # ~~~ +-# varlink call -m unix:/run/io.projectatomic.podman/io.projectatomic.podman.RemoveImage '{"name": "registry.fedoraproject.org/fedora", "force": true}' ++# varlink call -m unix:/run/podman/io.projectatomic.podman/io.projectatomic.podman.RemoveImage '{"name": "registry.fedoraproject.org/fedora", "force": true}' + # { + # "image": "426866d6fa419873f97e5cbd320eeb22778244c1dfffa01c944db3114f55772e" + # } +@@ -413,7 +413,7 @@ method ExportImage(name: string, destination: string, compress: bool) -> (image: + # is returned. + # #### Example + # ~~~ +-# $ varlink call -m unix:/run/io.projectatomic.podman/io.projectatomic.podman.PullImage '{"name": "registry.fedoraproject.org/fedora"}' ++# $ varlink call -m unix:/run/podman/io.projectatomic.podman/io.projectatomic.podman.PullImage '{"name": "registry.fedoraproject.org/fedora"}' + # { + # "id": "426866d6fa419873f97e5cbd320eeb22778244c1dfffa01c944db3114f55772e" + # } +diff --git a/cmd/podman/varlink/ioprojectatomicpodman.go b/cmd/podman/varlink/ioprojectatomicpodman.go +index 1748195..51812f1 100644 +--- a/cmd/podman/varlink/ioprojectatomicpodman.go ++++ b/cmd/podman/varlink/ioprojectatomicpodman.go +@@ -4,6 +4,82 @@ package ioprojectatomicpodman + import "github.com/varlink/go/varlink" + + // Type declarations ++type ContainerMount struct { ++ Destination string `json:"destination"` ++ Type string `json:"type"` ++ Source string `json:"source"` ++ Options []string `json:"options"` ++} ++ ++type InfoStore struct { ++ Containers int64 `json:"containers"` ++ Images int64 `json:"images"` ++ Graph_driver_name string `json:"graph_driver_name"` ++ Graph_driver_options string `json:"graph_driver_options"` ++ Graph_root string `json:"graph_root"` ++ Graph_status InfoGraphStatus `json:"graph_status"` ++ Run_root string `json:"run_root"` ++} ++ ++type PodmanInfo struct { ++ Host InfoHost `json:"host"` ++ Registries []string `json:"registries"` ++ Insecure_registries []string `json:"insecure_registries"` ++ Store InfoStore `json:"store"` ++ Podman InfoPodmanBinary `json:"podman"` ++} ++ ++type Version struct { ++ Version string `json:"version"` ++ Go_version string `json:"go_version"` ++ Git_commit string `json:"git_commit"` ++ Built int64 `json:"built"` ++ Os_arch string `json:"os_arch"` ++} ++ ++type StringResponse struct { ++ Message string `json:"message"` ++} ++ ++type ContainerChanges struct { ++ Changed []string `json:"changed"` ++ Added []string `json:"added"` ++ Deleted []string `json:"deleted"` ++} ++ ++type ListContainerData struct { ++ Id string `json:"id"` ++ Image string `json:"image"` ++ Imageid string `json:"imageid"` ++ Command []string `json:"command"` ++ Createdat string `json:"createdat"` ++ Runningfor string `json:"runningfor"` ++ Status string `json:"status"` ++ Ports []ContainerPortMappings `json:"ports"` ++ Rootfssize int64 `json:"rootfssize"` ++ Rwsize int64 `json:"rwsize"` ++ Names string `json:"names"` ++ Labels map[string]string `json:"labels"` ++ Mounts []ContainerMount `json:"mounts"` ++ Containerrunning bool `json:"containerrunning"` ++ Namespaces ContainerNameSpace `json:"namespaces"` ++} ++ ++type InfoPodmanBinary struct { ++ Compiler string `json:"compiler"` ++ Go_version string `json:"go_version"` ++ Podman_version string `json:"podman_version"` ++ Git_commit string `json:"git_commit"` ++} ++ ++type ImageSearch struct { ++ Description string `json:"description"` ++ Is_official bool `json:"is_official"` ++ Is_automated bool `json:"is_automated"` ++ Name string `json:"name"` ++ Star_count int64 `json:"star_count"` ++} ++ + type ContainerStats struct { + Id string `json:"id"` + Name string `json:"name"` +@@ -20,22 +96,42 @@ type ContainerStats struct { + Pids int64 `json:"pids"` + } + ++type ContainerPortMappings struct { ++ Host_port string `json:"host_port"` ++ Host_ip string `json:"host_ip"` ++ Protocol string `json:"protocol"` ++ Container_port string `json:"container_port"` ++} ++ + type InfoGraphStatus struct { + Backing_filesystem string `json:"backing_filesystem"` + Native_overlay_diff string `json:"native_overlay_diff"` + Supports_d_type string `json:"supports_d_type"` + } + +-type PodmanInfo struct { +- Host InfoHost `json:"host"` +- Registries []string `json:"registries"` +- Insecure_registries []string `json:"insecure_registries"` +- Store InfoStore `json:"store"` +- Podman InfoPodmanBinary `json:"podman"` ++type NotImplemented struct { ++ Comment string `json:"comment"` + } + +-type StringResponse struct { +- Message string `json:"message"` ++type ImageInList struct { ++ Id string `json:"id"` ++ ParentId string `json:"parentId"` ++ RepoTags []string `json:"repoTags"` ++ RepoDigests []string `json:"repoDigests"` ++ Created string `json:"created"` ++ Size int64 `json:"size"` ++ VirtualSize int64 `json:"virtualSize"` ++ Containers int64 `json:"containers"` ++ Labels map[string]string `json:"labels"` ++} ++ ++type ImageHistory struct { ++ Id string `json:"id"` ++ Created string `json:"created"` ++ CreatedBy string `json:"createdBy"` ++ Tags []string `json:"tags"` ++ Size int64 `json:"size"` ++ Comment string `json:"comment"` + } + + type ContainerNameSpace struct { +@@ -62,108 +158,12 @@ type InfoHost struct { + Uptime string `json:"uptime"` + } + +-type ContainerChanges struct { +- Changed []string `json:"changed"` +- Added []string `json:"added"` +- Deleted []string `json:"deleted"` +-} +- +-type ImageInList struct { +- Id string `json:"id"` +- ParentId string `json:"parentId"` +- RepoTags []string `json:"repoTags"` +- RepoDigests []string `json:"repoDigests"` +- Created string `json:"created"` +- Size int64 `json:"size"` +- VirtualSize int64 `json:"virtualSize"` +- Containers int64 `json:"containers"` +- Labels map[string]string `json:"labels"` +-} +- +-type ImageHistory struct { +- Id string `json:"id"` +- Created string `json:"created"` +- CreatedBy string `json:"createdBy"` +- Tags []string `json:"tags"` +- Size int64 `json:"size"` +- Comment string `json:"comment"` +-} +- +-type ContainerMount struct { +- Destination string `json:"destination"` +- Type string `json:"type"` +- Source string `json:"source"` +- Options []string `json:"options"` +-} +- +-type ContainerPortMappings struct { +- Host_port string `json:"host_port"` +- Host_ip string `json:"host_ip"` +- Protocol string `json:"protocol"` +- Container_port string `json:"container_port"` +-} +- +-type InfoPodmanBinary struct { +- Compiler string `json:"compiler"` +- Go_version string `json:"go_version"` +- Podman_version string `json:"podman_version"` +- Git_commit string `json:"git_commit"` +-} +- +-type Version struct { +- Version string `json:"version"` +- Go_version string `json:"go_version"` +- Git_commit string `json:"git_commit"` +- Built int64 `json:"built"` +- Os_arch string `json:"os_arch"` +-} +- +-type ImageSearch struct { +- Description string `json:"description"` +- Is_official bool `json:"is_official"` +- Is_automated bool `json:"is_automated"` +- Name string `json:"name"` +- Star_count int64 `json:"star_count"` +-} +- +-type ListContainerData struct { +- Id string `json:"id"` +- Image string `json:"image"` +- Imageid string `json:"imageid"` +- Command []string `json:"command"` +- Createdat string `json:"createdat"` +- Runningfor string `json:"runningfor"` +- Status string `json:"status"` +- Ports []ContainerPortMappings `json:"ports"` +- Rootfssize int64 `json:"rootfssize"` +- Rwsize int64 `json:"rwsize"` +- Names string `json:"names"` +- Labels map[string]string `json:"labels"` +- Mounts []ContainerMount `json:"mounts"` +- Containerrunning bool `json:"containerrunning"` +- Namespaces ContainerNameSpace `json:"namespaces"` +-} +- +-type InfoStore struct { +- Containers int64 `json:"containers"` +- Images int64 `json:"images"` +- Graph_driver_name string `json:"graph_driver_name"` +- Graph_driver_options string `json:"graph_driver_options"` +- Graph_root string `json:"graph_root"` +- Graph_status InfoGraphStatus `json:"graph_status"` +- Run_root string `json:"run_root"` +-} +- +-type NotImplemented struct { +- Comment string `json:"comment"` +-} +- + // Client method calls +-type AttachToContainer_methods struct{} ++type UpdateContainer_methods struct{} + +-func AttachToContainer() AttachToContainer_methods { return AttachToContainer_methods{} } ++func UpdateContainer() UpdateContainer_methods { return UpdateContainer_methods{} } + +-func (m AttachToContainer_methods) Call(c *varlink.Connection) (notimplemented_out_ NotImplemented, err_ error) { ++func (m UpdateContainer_methods) Call(c *varlink.Connection) (notimplemented_out_ NotImplemented, err_ error) { + receive, err_ := m.Send(c, 0) + if err_ != nil { + return +@@ -172,8 +172,8 @@ func (m AttachToContainer_methods) Call(c *varlink.Connection) (notimplemented_o + return + } + +-func (m AttachToContainer_methods) Send(c *varlink.Connection, flags uint64) (func() (NotImplemented, uint64, error), error) { +- receive, err := c.Send("io.projectatomic.podman.AttachToContainer", nil, flags) ++func (m UpdateContainer_methods) Send(c *varlink.Connection, flags uint64) (func() (NotImplemented, uint64, error), error) { ++ receive, err := c.Send("io.projectatomic.podman.UpdateContainer", nil, flags) + if err != nil { + return nil, err + } +@@ -190,68 +190,37 @@ func (m AttachToContainer_methods) Send(c *varlink.Connection, flags uint64) (fu + }, nil + } + +-type WaitContainer_methods struct{} ++type InspectImage_methods struct{} + +-func WaitContainer() WaitContainer_methods { return WaitContainer_methods{} } ++func InspectImage() InspectImage_methods { return InspectImage_methods{} } + +-func (m WaitContainer_methods) Call(c *varlink.Connection, name_in_ string) (exitcode_out_ int64, err_ error) { ++func (m InspectImage_methods) Call(c *varlink.Connection, name_in_ string) (image_out_ string, err_ error) { + receive, err_ := m.Send(c, 0, name_in_) + if err_ != nil { + return + } +- exitcode_out_, _, err_ = receive() ++ image_out_, _, err_ = receive() + return + } + +-func (m WaitContainer_methods) Send(c *varlink.Connection, flags uint64, name_in_ string) (func() (int64, uint64, error), error) { ++func (m InspectImage_methods) Send(c *varlink.Connection, flags uint64, name_in_ string) (func() (string, uint64, error), error) { + var in struct { + Name string `json:"name"` + } + in.Name = name_in_ +- receive, err := c.Send("io.projectatomic.podman.WaitContainer", in, flags) +- if err != nil { +- return nil, err +- } +- return func() (exitcode_out_ int64, flags uint64, err error) { +- var out struct { +- Exitcode int64 `json:"exitcode"` +- } +- flags, err = receive(&out) +- if err != nil { +- return +- } +- exitcode_out_ = out.Exitcode +- return +- }, nil +-} +- +-type DeleteUnusedImages_methods struct{} +- +-func DeleteUnusedImages() DeleteUnusedImages_methods { return DeleteUnusedImages_methods{} } +- +-func (m DeleteUnusedImages_methods) Call(c *varlink.Connection) (images_out_ []string, err_ error) { +- receive, err_ := m.Send(c, 0) +- if err_ != nil { +- return +- } +- images_out_, _, err_ = receive() +- return +-} +- +-func (m DeleteUnusedImages_methods) Send(c *varlink.Connection, flags uint64) (func() ([]string, uint64, error), error) { +- receive, err := c.Send("io.projectatomic.podman.DeleteUnusedImages", nil, flags) ++ receive, err := c.Send("io.projectatomic.podman.InspectImage", in, flags) + if err != nil { + return nil, err + } +- return func() (images_out_ []string, flags uint64, err error) { ++ return func() (image_out_ string, flags uint64, err error) { + var out struct { +- Images []string `json:"images"` ++ Image string `json:"image"` + } + flags, err = receive(&out) + if err != nil { + return + } +- images_out_ = []string(out.Images) ++ image_out_ = out.Image + return + }, nil + } +@@ -287,46 +256,42 @@ func (m GetInfo_methods) Send(c *varlink.Connection, flags uint64) (func() (Podm + }, nil + } + +-type GetContainer_methods struct{} ++type ResizeContainerTty_methods struct{} + +-func GetContainer() GetContainer_methods { return GetContainer_methods{} } ++func ResizeContainerTty() ResizeContainerTty_methods { return ResizeContainerTty_methods{} } + +-func (m GetContainer_methods) Call(c *varlink.Connection, name_in_ string) (container_out_ ListContainerData, err_ error) { +- receive, err_ := m.Send(c, 0, name_in_) ++func (m ResizeContainerTty_methods) Call(c *varlink.Connection) (notimplemented_out_ NotImplemented, err_ error) { ++ receive, err_ := m.Send(c, 0) + if err_ != nil { + return + } +- container_out_, _, err_ = receive() ++ notimplemented_out_, _, err_ = receive() + return + } + +-func (m GetContainer_methods) Send(c *varlink.Connection, flags uint64, name_in_ string) (func() (ListContainerData, uint64, error), error) { +- var in struct { +- Name string `json:"name"` +- } +- in.Name = name_in_ +- receive, err := c.Send("io.projectatomic.podman.GetContainer", in, flags) ++func (m ResizeContainerTty_methods) Send(c *varlink.Connection, flags uint64) (func() (NotImplemented, uint64, error), error) { ++ receive, err := c.Send("io.projectatomic.podman.ResizeContainerTty", nil, flags) + if err != nil { + return nil, err + } +- return func() (container_out_ ListContainerData, flags uint64, err error) { ++ return func() (notimplemented_out_ NotImplemented, flags uint64, err error) { + var out struct { +- Container ListContainerData `json:"container"` ++ Notimplemented NotImplemented `json:"notimplemented"` + } + flags, err = receive(&out) + if err != nil { + return + } +- container_out_ = out.Container ++ notimplemented_out_ = out.Notimplemented + return + }, nil + } + +-type CreateContainer_methods struct{} ++type StartContainer_methods struct{} + +-func CreateContainer() CreateContainer_methods { return CreateContainer_methods{} } ++func StartContainer() StartContainer_methods { return StartContainer_methods{} } + +-func (m CreateContainer_methods) Call(c *varlink.Connection) (notimplemented_out_ NotImplemented, err_ error) { ++func (m StartContainer_methods) Call(c *varlink.Connection) (notimplemented_out_ NotImplemented, err_ error) { + receive, err_ := m.Send(c, 0) + if err_ != nil { + return +@@ -335,8 +300,8 @@ func (m CreateContainer_methods) Call(c *varlink.Connection) (notimplemented_out + return + } + +-func (m CreateContainer_methods) Send(c *varlink.Connection, flags uint64) (func() (NotImplemented, uint64, error), error) { +- receive, err := c.Send("io.projectatomic.podman.CreateContainer", nil, flags) ++func (m StartContainer_methods) Send(c *varlink.Connection, flags uint64) (func() (NotImplemented, uint64, error), error) { ++ receive, err := c.Send("io.projectatomic.podman.StartContainer", nil, flags) + if err != nil { + return nil, err + } +@@ -353,12 +318,12 @@ func (m CreateContainer_methods) Send(c *varlink.Connection, flags uint64) (func + }, nil + } + +-type ListContainerProcesses_methods struct{} ++type StopContainer_methods struct{} + +-func ListContainerProcesses() ListContainerProcesses_methods { return ListContainerProcesses_methods{} } ++func StopContainer() StopContainer_methods { return StopContainer_methods{} } + +-func (m ListContainerProcesses_methods) Call(c *varlink.Connection, name_in_ string, opts_in_ []string) (container_out_ []string, err_ error) { +- receive, err_ := m.Send(c, 0, name_in_, opts_in_) ++func (m StopContainer_methods) Call(c *varlink.Connection, name_in_ string, timeout_in_ int64) (container_out_ string, err_ error) { ++ receive, err_ := m.Send(c, 0, name_in_, timeout_in_) + if err_ != nil { + return + } +@@ -366,277 +331,240 @@ func (m ListContainerProcesses_methods) Call(c *varlink.Connection, name_in_ str + return + } + +-func (m ListContainerProcesses_methods) Send(c *varlink.Connection, flags uint64, name_in_ string, opts_in_ []string) (func() ([]string, uint64, error), error) { ++func (m StopContainer_methods) Send(c *varlink.Connection, flags uint64, name_in_ string, timeout_in_ int64) (func() (string, uint64, error), error) { + var in struct { +- Name string `json:"name"` +- Opts []string `json:"opts"` ++ Name string `json:"name"` ++ Timeout int64 `json:"timeout"` + } + in.Name = name_in_ +- in.Opts = []string(opts_in_) +- receive, err := c.Send("io.projectatomic.podman.ListContainerProcesses", in, flags) ++ in.Timeout = timeout_in_ ++ receive, err := c.Send("io.projectatomic.podman.StopContainer", in, flags) + if err != nil { + return nil, err + } +- return func() (container_out_ []string, flags uint64, err error) { ++ return func() (container_out_ string, flags uint64, err error) { + var out struct { +- Container []string `json:"container"` ++ Container string `json:"container"` + } + flags, err = receive(&out) + if err != nil { + return + } +- container_out_ = []string(out.Container) ++ container_out_ = out.Container + return + }, nil + } + +-type ListImages_methods struct{} ++type AttachToContainer_methods struct{} + +-func ListImages() ListImages_methods { return ListImages_methods{} } ++func AttachToContainer() AttachToContainer_methods { return AttachToContainer_methods{} } + +-func (m ListImages_methods) Call(c *varlink.Connection) (images_out_ []ImageInList, err_ error) { ++func (m AttachToContainer_methods) Call(c *varlink.Connection) (notimplemented_out_ NotImplemented, err_ error) { + receive, err_ := m.Send(c, 0) + if err_ != nil { + return + } +- images_out_, _, err_ = receive() ++ notimplemented_out_, _, err_ = receive() + return + } + +-func (m ListImages_methods) Send(c *varlink.Connection, flags uint64) (func() ([]ImageInList, uint64, error), error) { +- receive, err := c.Send("io.projectatomic.podman.ListImages", nil, flags) ++func (m AttachToContainer_methods) Send(c *varlink.Connection, flags uint64) (func() (NotImplemented, uint64, error), error) { ++ receive, err := c.Send("io.projectatomic.podman.AttachToContainer", nil, flags) + if err != nil { + return nil, err + } +- return func() (images_out_ []ImageInList, flags uint64, err error) { ++ return func() (notimplemented_out_ NotImplemented, flags uint64, err error) { + var out struct { +- Images []ImageInList `json:"images"` ++ Notimplemented NotImplemented `json:"notimplemented"` + } + flags, err = receive(&out) + if err != nil { + return + } +- images_out_ = []ImageInList(out.Images) ++ notimplemented_out_ = out.Notimplemented + return + }, nil + } + +-type TagImage_methods struct{} ++type BuildImage_methods struct{} + +-func TagImage() TagImage_methods { return TagImage_methods{} } ++func BuildImage() BuildImage_methods { return BuildImage_methods{} } + +-func (m TagImage_methods) Call(c *varlink.Connection, name_in_ string, tagged_in_ string) (image_out_ string, err_ error) { +- receive, err_ := m.Send(c, 0, name_in_, tagged_in_) ++func (m BuildImage_methods) Call(c *varlink.Connection) (notimplemented_out_ NotImplemented, err_ error) { ++ receive, err_ := m.Send(c, 0) + if err_ != nil { + return + } +- image_out_, _, err_ = receive() ++ notimplemented_out_, _, err_ = receive() + return + } + +-func (m TagImage_methods) Send(c *varlink.Connection, flags uint64, name_in_ string, tagged_in_ string) (func() (string, uint64, error), error) { +- var in struct { +- Name string `json:"name"` +- Tagged string `json:"tagged"` +- } +- in.Name = name_in_ +- in.Tagged = tagged_in_ +- receive, err := c.Send("io.projectatomic.podman.TagImage", in, flags) ++func (m BuildImage_methods) Send(c *varlink.Connection, flags uint64) (func() (NotImplemented, uint64, error), error) { ++ receive, err := c.Send("io.projectatomic.podman.BuildImage", nil, flags) + if err != nil { + return nil, err + } +- return func() (image_out_ string, flags uint64, err error) { ++ return func() (notimplemented_out_ NotImplemented, flags uint64, err error) { + var out struct { +- Image string `json:"image"` ++ Notimplemented NotImplemented `json:"notimplemented"` + } + flags, err = receive(&out) + if err != nil { + return + } +- image_out_ = out.Image ++ notimplemented_out_ = out.Notimplemented + return + }, nil + } + +-type ListContainerChanges_methods struct{} ++type CreateImage_methods struct{} + +-func ListContainerChanges() ListContainerChanges_methods { return ListContainerChanges_methods{} } ++func CreateImage() CreateImage_methods { return CreateImage_methods{} } + +-func (m ListContainerChanges_methods) Call(c *varlink.Connection, name_in_ string) (container_out_ ContainerChanges, err_ error) { +- receive, err_ := m.Send(c, 0, name_in_) ++func (m CreateImage_methods) Call(c *varlink.Connection) (notimplemented_out_ NotImplemented, err_ error) { ++ receive, err_ := m.Send(c, 0) + if err_ != nil { + return + } +- container_out_, _, err_ = receive() ++ notimplemented_out_, _, err_ = receive() + return + } + +-func (m ListContainerChanges_methods) Send(c *varlink.Connection, flags uint64, name_in_ string) (func() (ContainerChanges, uint64, error), error) { +- var in struct { +- Name string `json:"name"` +- } +- in.Name = name_in_ +- receive, err := c.Send("io.projectatomic.podman.ListContainerChanges", in, flags) ++func (m CreateImage_methods) Send(c *varlink.Connection, flags uint64) (func() (NotImplemented, uint64, error), error) { ++ receive, err := c.Send("io.projectatomic.podman.CreateImage", nil, flags) + if err != nil { + return nil, err + } +- return func() (container_out_ ContainerChanges, flags uint64, err error) { ++ return func() (notimplemented_out_ NotImplemented, flags uint64, err error) { + var out struct { +- Container ContainerChanges `json:"container"` ++ Notimplemented NotImplemented `json:"notimplemented"` + } + flags, err = receive(&out) + if err != nil { + return + } +- container_out_ = out.Container ++ notimplemented_out_ = out.Notimplemented + return + }, nil + } + +-type ExportContainer_methods struct{} ++type HistoryImage_methods struct{} + +-func ExportContainer() ExportContainer_methods { return ExportContainer_methods{} } ++func HistoryImage() HistoryImage_methods { return HistoryImage_methods{} } + +-func (m ExportContainer_methods) Call(c *varlink.Connection, name_in_ string, path_in_ string) (tarfile_out_ string, err_ error) { +- receive, err_ := m.Send(c, 0, name_in_, path_in_) ++func (m HistoryImage_methods) Call(c *varlink.Connection, name_in_ string) (history_out_ []ImageHistory, err_ error) { ++ receive, err_ := m.Send(c, 0, name_in_) + if err_ != nil { + return + } +- tarfile_out_, _, err_ = receive() ++ history_out_, _, err_ = receive() + return + } + +-func (m ExportContainer_methods) Send(c *varlink.Connection, flags uint64, name_in_ string, path_in_ string) (func() (string, uint64, error), error) { ++func (m HistoryImage_methods) Send(c *varlink.Connection, flags uint64, name_in_ string) (func() ([]ImageHistory, uint64, error), error) { + var in struct { + Name string `json:"name"` +- Path string `json:"path"` + } + in.Name = name_in_ +- in.Path = path_in_ +- receive, err := c.Send("io.projectatomic.podman.ExportContainer", in, flags) +- if err != nil { +- return nil, err +- } +- return func() (tarfile_out_ string, flags uint64, err error) { +- var out struct { +- Tarfile string `json:"tarfile"` +- } +- flags, err = receive(&out) +- if err != nil { +- return +- } +- tarfile_out_ = out.Tarfile +- return +- }, nil +-} +- +-type UpdateContainer_methods struct{} +- +-func UpdateContainer() UpdateContainer_methods { return UpdateContainer_methods{} } +- +-func (m UpdateContainer_methods) Call(c *varlink.Connection) (notimplemented_out_ NotImplemented, err_ error) { +- receive, err_ := m.Send(c, 0) +- if err_ != nil { +- return +- } +- notimplemented_out_, _, err_ = receive() +- return +-} +- +-func (m UpdateContainer_methods) Send(c *varlink.Connection, flags uint64) (func() (NotImplemented, uint64, error), error) { +- receive, err := c.Send("io.projectatomic.podman.UpdateContainer", nil, flags) ++ receive, err := c.Send("io.projectatomic.podman.HistoryImage", in, flags) + if err != nil { + return nil, err + } +- return func() (notimplemented_out_ NotImplemented, flags uint64, err error) { ++ return func() (history_out_ []ImageHistory, flags uint64, err error) { + var out struct { +- Notimplemented NotImplemented `json:"notimplemented"` ++ History []ImageHistory `json:"history"` + } + flags, err = receive(&out) + if err != nil { + return + } +- notimplemented_out_ = out.Notimplemented ++ history_out_ = []ImageHistory(out.History) + return + }, nil + } + +-type UnpauseContainer_methods struct{} ++type Commit_methods struct{} + +-func UnpauseContainer() UnpauseContainer_methods { return UnpauseContainer_methods{} } ++func Commit() Commit_methods { return Commit_methods{} } + +-func (m UnpauseContainer_methods) Call(c *varlink.Connection, name_in_ string) (container_out_ string, err_ error) { +- receive, err_ := m.Send(c, 0, name_in_) ++func (m Commit_methods) Call(c *varlink.Connection, name_in_ string, image_name_in_ string, changes_in_ []string, author_in_ string, message_in_ string, pause_in_ bool) (image_out_ string, err_ error) { ++ receive, err_ := m.Send(c, 0, name_in_, image_name_in_, changes_in_, author_in_, message_in_, pause_in_) + if err_ != nil { + return + } +- container_out_, _, err_ = receive() ++ image_out_, _, err_ = receive() + return + } + +-func (m UnpauseContainer_methods) Send(c *varlink.Connection, flags uint64, name_in_ string) (func() (string, uint64, error), error) { ++func (m Commit_methods) Send(c *varlink.Connection, flags uint64, name_in_ string, image_name_in_ string, changes_in_ []string, author_in_ string, message_in_ string, pause_in_ bool) (func() (string, uint64, error), error) { + var in struct { +- Name string `json:"name"` ++ Name string `json:"name"` ++ Image_name string `json:"image_name"` ++ Changes []string `json:"changes"` ++ Author string `json:"author"` ++ Message string `json:"message"` ++ Pause bool `json:"pause"` + } + in.Name = name_in_ +- receive, err := c.Send("io.projectatomic.podman.UnpauseContainer", in, flags) ++ in.Image_name = image_name_in_ ++ in.Changes = []string(changes_in_) ++ in.Author = author_in_ ++ in.Message = message_in_ ++ in.Pause = pause_in_ ++ receive, err := c.Send("io.projectatomic.podman.Commit", in, flags) + if err != nil { + return nil, err + } +- return func() (container_out_ string, flags uint64, err error) { ++ return func() (image_out_ string, flags uint64, err error) { + var out struct { +- Container string `json:"container"` ++ Image string `json:"image"` + } + flags, err = receive(&out) + if err != nil { + return + } +- container_out_ = out.Container ++ image_out_ = out.Image + return + }, nil + } + +-type GetContainerStats_methods struct{} ++type ListContainers_methods struct{} + +-func GetContainerStats() GetContainerStats_methods { return GetContainerStats_methods{} } ++func ListContainers() ListContainers_methods { return ListContainers_methods{} } + +-func (m GetContainerStats_methods) Call(c *varlink.Connection, name_in_ string) (container_out_ ContainerStats, err_ error) { +- receive, err_ := m.Send(c, 0, name_in_) ++func (m ListContainers_methods) Call(c *varlink.Connection) (containers_out_ []ListContainerData, err_ error) { ++ receive, err_ := m.Send(c, 0) + if err_ != nil { + return + } +- container_out_, _, err_ = receive() ++ containers_out_, _, err_ = receive() + return + } + +-func (m GetContainerStats_methods) Send(c *varlink.Connection, flags uint64, name_in_ string) (func() (ContainerStats, uint64, error), error) { +- var in struct { +- Name string `json:"name"` +- } +- in.Name = name_in_ +- receive, err := c.Send("io.projectatomic.podman.GetContainerStats", in, flags) ++func (m ListContainers_methods) Send(c *varlink.Connection, flags uint64) (func() ([]ListContainerData, uint64, error), error) { ++ receive, err := c.Send("io.projectatomic.podman.ListContainers", nil, flags) + if err != nil { + return nil, err + } +- return func() (container_out_ ContainerStats, flags uint64, err error) { ++ return func() (containers_out_ []ListContainerData, flags uint64, err error) { + var out struct { +- Container ContainerStats `json:"container"` ++ Containers []ListContainerData `json:"containers"` + } + flags, err = receive(&out) + if err != nil { + return + } +- container_out_ = out.Container ++ containers_out_ = []ListContainerData(out.Containers) + return + }, nil + } + +-type StopContainer_methods struct{} ++type GetContainer_methods struct{} + +-func StopContainer() StopContainer_methods { return StopContainer_methods{} } ++func GetContainer() GetContainer_methods { return GetContainer_methods{} } + +-func (m StopContainer_methods) Call(c *varlink.Connection, name_in_ string, timeout_in_ int64) (container_out_ string, err_ error) { +- receive, err_ := m.Send(c, 0, name_in_, timeout_in_) ++func (m GetContainer_methods) Call(c *varlink.Connection, name_in_ string) (container_out_ ListContainerData, err_ error) { ++ receive, err_ := m.Send(c, 0, name_in_) + if err_ != nil { + return + } +@@ -644,20 +572,18 @@ func (m StopContainer_methods) Call(c *varlink.Connection, name_in_ string, time + return + } + +-func (m StopContainer_methods) Send(c *varlink.Connection, flags uint64, name_in_ string, timeout_in_ int64) (func() (string, uint64, error), error) { ++func (m GetContainer_methods) Send(c *varlink.Connection, flags uint64, name_in_ string) (func() (ListContainerData, uint64, error), error) { + var in struct { +- Name string `json:"name"` +- Timeout int64 `json:"timeout"` ++ Name string `json:"name"` + } + in.Name = name_in_ +- in.Timeout = timeout_in_ +- receive, err := c.Send("io.projectatomic.podman.StopContainer", in, flags) ++ receive, err := c.Send("io.projectatomic.podman.GetContainer", in, flags) + if err != nil { + return nil, err + } +- return func() (container_out_ string, flags uint64, err error) { ++ return func() (container_out_ ListContainerData, flags uint64, err error) { + var out struct { +- Container string `json:"container"` ++ Container ListContainerData `json:"container"` + } + flags, err = receive(&out) + if err != nil { +@@ -668,152 +594,146 @@ func (m StopContainer_methods) Send(c *varlink.Connection, flags uint64, name_in + }, nil + } + +-type RestartContainer_methods struct{} ++type ExportContainer_methods struct{} + +-func RestartContainer() RestartContainer_methods { return RestartContainer_methods{} } ++func ExportContainer() ExportContainer_methods { return ExportContainer_methods{} } + +-func (m RestartContainer_methods) Call(c *varlink.Connection, name_in_ string, timeout_in_ int64) (container_out_ string, err_ error) { +- receive, err_ := m.Send(c, 0, name_in_, timeout_in_) ++func (m ExportContainer_methods) Call(c *varlink.Connection, name_in_ string, path_in_ string) (tarfile_out_ string, err_ error) { ++ receive, err_ := m.Send(c, 0, name_in_, path_in_) + if err_ != nil { + return + } +- container_out_, _, err_ = receive() ++ tarfile_out_, _, err_ = receive() + return + } + +-func (m RestartContainer_methods) Send(c *varlink.Connection, flags uint64, name_in_ string, timeout_in_ int64) (func() (string, uint64, error), error) { ++func (m ExportContainer_methods) Send(c *varlink.Connection, flags uint64, name_in_ string, path_in_ string) (func() (string, uint64, error), error) { + var in struct { +- Name string `json:"name"` +- Timeout int64 `json:"timeout"` ++ Name string `json:"name"` ++ Path string `json:"path"` + } + in.Name = name_in_ +- in.Timeout = timeout_in_ +- receive, err := c.Send("io.projectatomic.podman.RestartContainer", in, flags) ++ in.Path = path_in_ ++ receive, err := c.Send("io.projectatomic.podman.ExportContainer", in, flags) + if err != nil { + return nil, err + } +- return func() (container_out_ string, flags uint64, err error) { ++ return func() (tarfile_out_ string, flags uint64, err error) { + var out struct { +- Container string `json:"container"` ++ Tarfile string `json:"tarfile"` + } + flags, err = receive(&out) + if err != nil { + return + } +- container_out_ = out.Container ++ tarfile_out_ = out.Tarfile + return + }, nil + } + +-type ImportImage_methods struct{} ++type ListImages_methods struct{} + +-func ImportImage() ImportImage_methods { return ImportImage_methods{} } ++func ListImages() ListImages_methods { return ListImages_methods{} } + +-func (m ImportImage_methods) Call(c *varlink.Connection, source_in_ string, reference_in_ string, message_in_ string, changes_in_ []string) (image_out_ string, err_ error) { +- receive, err_ := m.Send(c, 0, source_in_, reference_in_, message_in_, changes_in_) ++func (m ListImages_methods) Call(c *varlink.Connection) (images_out_ []ImageInList, err_ error) { ++ receive, err_ := m.Send(c, 0) + if err_ != nil { + return + } +- image_out_, _, err_ = receive() ++ images_out_, _, err_ = receive() + return + } + +-func (m ImportImage_methods) Send(c *varlink.Connection, flags uint64, source_in_ string, reference_in_ string, message_in_ string, changes_in_ []string) (func() (string, uint64, error), error) { +- var in struct { +- Source string `json:"source"` +- Reference string `json:"reference"` +- Message string `json:"message"` +- Changes []string `json:"changes"` +- } +- in.Source = source_in_ +- in.Reference = reference_in_ +- in.Message = message_in_ +- in.Changes = []string(changes_in_) +- receive, err := c.Send("io.projectatomic.podman.ImportImage", in, flags) ++func (m ListImages_methods) Send(c *varlink.Connection, flags uint64) (func() ([]ImageInList, uint64, error), error) { ++ receive, err := c.Send("io.projectatomic.podman.ListImages", nil, flags) + if err != nil { + return nil, err + } +- return func() (image_out_ string, flags uint64, err error) { ++ return func() (images_out_ []ImageInList, flags uint64, err error) { + var out struct { +- Image string `json:"image"` ++ Images []ImageInList `json:"images"` + } + flags, err = receive(&out) + if err != nil { + return + } +- image_out_ = out.Image ++ images_out_ = []ImageInList(out.Images) + return + }, nil + } + +-type ListContainers_methods struct{} ++type DeleteUnusedImages_methods struct{} + +-func ListContainers() ListContainers_methods { return ListContainers_methods{} } ++func DeleteUnusedImages() DeleteUnusedImages_methods { return DeleteUnusedImages_methods{} } + +-func (m ListContainers_methods) Call(c *varlink.Connection) (containers_out_ []ListContainerData, err_ error) { ++func (m DeleteUnusedImages_methods) Call(c *varlink.Connection) (images_out_ []string, err_ error) { + receive, err_ := m.Send(c, 0) + if err_ != nil { + return + } +- containers_out_, _, err_ = receive() ++ images_out_, _, err_ = receive() + return + } + +-func (m ListContainers_methods) Send(c *varlink.Connection, flags uint64) (func() ([]ListContainerData, uint64, error), error) { +- receive, err := c.Send("io.projectatomic.podman.ListContainers", nil, flags) ++func (m DeleteUnusedImages_methods) Send(c *varlink.Connection, flags uint64) (func() ([]string, uint64, error), error) { ++ receive, err := c.Send("io.projectatomic.podman.DeleteUnusedImages", nil, flags) + if err != nil { + return nil, err + } +- return func() (containers_out_ []ListContainerData, flags uint64, err error) { ++ return func() (images_out_ []string, flags uint64, err error) { + var out struct { +- Containers []ListContainerData `json:"containers"` ++ Images []string `json:"images"` + } + flags, err = receive(&out) + if err != nil { + return + } +- containers_out_ = []ListContainerData(out.Containers) ++ images_out_ = []string(out.Images) + return + }, nil + } + +-type StartContainer_methods struct{} ++type GetContainerStats_methods struct{} + +-func StartContainer() StartContainer_methods { return StartContainer_methods{} } ++func GetContainerStats() GetContainerStats_methods { return GetContainerStats_methods{} } + +-func (m StartContainer_methods) Call(c *varlink.Connection) (notimplemented_out_ NotImplemented, err_ error) { +- receive, err_ := m.Send(c, 0) ++func (m GetContainerStats_methods) Call(c *varlink.Connection, name_in_ string) (container_out_ ContainerStats, err_ error) { ++ receive, err_ := m.Send(c, 0, name_in_) + if err_ != nil { + return + } +- notimplemented_out_, _, err_ = receive() ++ container_out_, _, err_ = receive() + return + } + +-func (m StartContainer_methods) Send(c *varlink.Connection, flags uint64) (func() (NotImplemented, uint64, error), error) { +- receive, err := c.Send("io.projectatomic.podman.StartContainer", nil, flags) ++func (m GetContainerStats_methods) Send(c *varlink.Connection, flags uint64, name_in_ string) (func() (ContainerStats, uint64, error), error) { ++ var in struct { ++ Name string `json:"name"` ++ } ++ in.Name = name_in_ ++ receive, err := c.Send("io.projectatomic.podman.GetContainerStats", in, flags) + if err != nil { + return nil, err + } +- return func() (notimplemented_out_ NotImplemented, flags uint64, err error) { ++ return func() (container_out_ ContainerStats, flags uint64, err error) { + var out struct { +- Notimplemented NotImplemented `json:"notimplemented"` ++ Container ContainerStats `json:"container"` + } + flags, err = receive(&out) + if err != nil { + return + } +- notimplemented_out_ = out.Notimplemented ++ container_out_ = out.Container + return + }, nil + } + +-type RemoveContainer_methods struct{} ++type UnpauseContainer_methods struct{} + +-func RemoveContainer() RemoveContainer_methods { return RemoveContainer_methods{} } ++func UnpauseContainer() UnpauseContainer_methods { return UnpauseContainer_methods{} } + +-func (m RemoveContainer_methods) Call(c *varlink.Connection, name_in_ string, force_in_ bool) (container_out_ string, err_ error) { +- receive, err_ := m.Send(c, 0, name_in_, force_in_) ++func (m UnpauseContainer_methods) Call(c *varlink.Connection, name_in_ string) (container_out_ string, err_ error) { ++ receive, err_ := m.Send(c, 0, name_in_) + if err_ != nil { + return + } +@@ -821,14 +741,12 @@ func (m RemoveContainer_methods) Call(c *varlink.Connection, name_in_ string, fo + return + } + +-func (m RemoveContainer_methods) Send(c *varlink.Connection, flags uint64, name_in_ string, force_in_ bool) (func() (string, uint64, error), error) { ++func (m UnpauseContainer_methods) Send(c *varlink.Connection, flags uint64, name_in_ string) (func() (string, uint64, error), error) { + var in struct { +- Name string `json:"name"` +- Force bool `json:"force"` ++ Name string `json:"name"` + } + in.Name = name_in_ +- in.Force = force_in_ +- receive, err := c.Send("io.projectatomic.podman.RemoveContainer", in, flags) ++ receive, err := c.Send("io.projectatomic.podman.UnpauseContainer", in, flags) + if err != nil { + return nil, err + } +@@ -845,110 +763,108 @@ func (m RemoveContainer_methods) Send(c *varlink.Connection, flags uint64, name_ + }, nil + } + +-type DeleteStoppedContainers_methods struct{} ++type PullImage_methods struct{} + +-func DeleteStoppedContainers() DeleteStoppedContainers_methods { +- return DeleteStoppedContainers_methods{} +-} ++func PullImage() PullImage_methods { return PullImage_methods{} } + +-func (m DeleteStoppedContainers_methods) Call(c *varlink.Connection) (containers_out_ []string, err_ error) { +- receive, err_ := m.Send(c, 0) ++func (m PullImage_methods) Call(c *varlink.Connection, name_in_ string) (id_out_ string, err_ error) { ++ receive, err_ := m.Send(c, 0, name_in_) + if err_ != nil { + return + } +- containers_out_, _, err_ = receive() ++ id_out_, _, err_ = receive() + return + } + +-func (m DeleteStoppedContainers_methods) Send(c *varlink.Connection, flags uint64) (func() ([]string, uint64, error), error) { +- receive, err := c.Send("io.projectatomic.podman.DeleteStoppedContainers", nil, flags) ++func (m PullImage_methods) Send(c *varlink.Connection, flags uint64, name_in_ string) (func() (string, uint64, error), error) { ++ var in struct { ++ Name string `json:"name"` ++ } ++ in.Name = name_in_ ++ receive, err := c.Send("io.projectatomic.podman.PullImage", in, flags) + if err != nil { + return nil, err + } +- return func() (containers_out_ []string, flags uint64, err error) { ++ return func() (id_out_ string, flags uint64, err error) { + var out struct { +- Containers []string `json:"containers"` ++ Id string `json:"id"` + } + flags, err = receive(&out) + if err != nil { + return + } +- containers_out_ = []string(out.Containers) ++ id_out_ = out.Id + return + }, nil + } + +-type InspectContainer_methods struct{} ++type Ping_methods struct{} + +-func InspectContainer() InspectContainer_methods { return InspectContainer_methods{} } ++func Ping() Ping_methods { return Ping_methods{} } + +-func (m InspectContainer_methods) Call(c *varlink.Connection, name_in_ string) (container_out_ string, err_ error) { +- receive, err_ := m.Send(c, 0, name_in_) ++func (m Ping_methods) Call(c *varlink.Connection) (ping_out_ StringResponse, err_ error) { ++ receive, err_ := m.Send(c, 0) + if err_ != nil { + return + } +- container_out_, _, err_ = receive() ++ ping_out_, _, err_ = receive() + return + } + +-func (m InspectContainer_methods) Send(c *varlink.Connection, flags uint64, name_in_ string) (func() (string, uint64, error), error) { +- var in struct { +- Name string `json:"name"` +- } +- in.Name = name_in_ +- receive, err := c.Send("io.projectatomic.podman.InspectContainer", in, flags) ++func (m Ping_methods) Send(c *varlink.Connection, flags uint64) (func() (StringResponse, uint64, error), error) { ++ receive, err := c.Send("io.projectatomic.podman.Ping", nil, flags) + if err != nil { + return nil, err + } +- return func() (container_out_ string, flags uint64, err error) { ++ return func() (ping_out_ StringResponse, flags uint64, err error) { + var out struct { +- Container string `json:"container"` ++ Ping StringResponse `json:"ping"` + } + flags, err = receive(&out) + if err != nil { + return + } +- container_out_ = out.Container ++ ping_out_ = out.Ping + return + }, nil + } + +-type RenameContainer_methods struct{} ++type GetVersion_methods struct{} + +-func RenameContainer() RenameContainer_methods { return RenameContainer_methods{} } ++func GetVersion() GetVersion_methods { return GetVersion_methods{} } + +-func (m RenameContainer_methods) Call(c *varlink.Connection) (notimplemented_out_ NotImplemented, err_ error) { ++func (m GetVersion_methods) Call(c *varlink.Connection) (version_out_ Version, err_ error) { + receive, err_ := m.Send(c, 0) + if err_ != nil { + return + } +- notimplemented_out_, _, err_ = receive() ++ version_out_, _, err_ = receive() + return + } + +-func (m RenameContainer_methods) Send(c *varlink.Connection, flags uint64) (func() (NotImplemented, uint64, error), error) { +- receive, err := c.Send("io.projectatomic.podman.RenameContainer", nil, flags) ++func (m GetVersion_methods) Send(c *varlink.Connection, flags uint64) (func() (Version, uint64, error), error) { ++ receive, err := c.Send("io.projectatomic.podman.GetVersion", nil, flags) + if err != nil { + return nil, err + } +- return func() (notimplemented_out_ NotImplemented, flags uint64, err error) { ++ return func() (version_out_ Version, flags uint64, err error) { + var out struct { +- Notimplemented NotImplemented `json:"notimplemented"` ++ Version Version `json:"version"` + } + flags, err = receive(&out) + if err != nil { + return + } +- notimplemented_out_ = out.Notimplemented ++ version_out_ = out.Version + return + }, nil + } + +-type BuildImage_methods struct{} ++type CreateContainer_methods struct{} + +-func BuildImage() BuildImage_methods { return BuildImage_methods{} } ++func CreateContainer() CreateContainer_methods { return CreateContainer_methods{} } + +-func (m BuildImage_methods) Call(c *varlink.Connection) (notimplemented_out_ NotImplemented, err_ error) { ++func (m CreateContainer_methods) Call(c *varlink.Connection) (notimplemented_out_ NotImplemented, err_ error) { + receive, err_ := m.Send(c, 0) + if err_ != nil { + return +@@ -957,8 +873,8 @@ func (m BuildImage_methods) Call(c *varlink.Connection) (notimplemented_out_ Not + return + } + +-func (m BuildImage_methods) Send(c *varlink.Connection, flags uint64) (func() (NotImplemented, uint64, error), error) { +- receive, err := c.Send("io.projectatomic.podman.BuildImage", nil, flags) ++func (m CreateContainer_methods) Send(c *varlink.Connection, flags uint64) (func() (NotImplemented, uint64, error), error) { ++ receive, err := c.Send("io.projectatomic.podman.CreateContainer", nil, flags) + if err != nil { + return nil, err + } +@@ -975,113 +891,123 @@ func (m BuildImage_methods) Send(c *varlink.Connection, flags uint64) (func() (N + }, nil + } + +-type PullImage_methods struct{} ++type KillContainer_methods struct{} + +-func PullImage() PullImage_methods { return PullImage_methods{} } ++func KillContainer() KillContainer_methods { return KillContainer_methods{} } + +-func (m PullImage_methods) Call(c *varlink.Connection, name_in_ string) (id_out_ string, err_ error) { +- receive, err_ := m.Send(c, 0, name_in_) ++func (m KillContainer_methods) Call(c *varlink.Connection, name_in_ string, signal_in_ int64) (container_out_ string, err_ error) { ++ receive, err_ := m.Send(c, 0, name_in_, signal_in_) + if err_ != nil { + return + } +- id_out_, _, err_ = receive() ++ container_out_, _, err_ = receive() + return + } + +-func (m PullImage_methods) Send(c *varlink.Connection, flags uint64, name_in_ string) (func() (string, uint64, error), error) { ++func (m KillContainer_methods) Send(c *varlink.Connection, flags uint64, name_in_ string, signal_in_ int64) (func() (string, uint64, error), error) { + var in struct { +- Name string `json:"name"` ++ Name string `json:"name"` ++ Signal int64 `json:"signal"` + } + in.Name = name_in_ +- receive, err := c.Send("io.projectatomic.podman.PullImage", in, flags) ++ in.Signal = signal_in_ ++ receive, err := c.Send("io.projectatomic.podman.KillContainer", in, flags) + if err != nil { + return nil, err + } +- return func() (id_out_ string, flags uint64, err error) { ++ return func() (container_out_ string, flags uint64, err error) { + var out struct { +- Id string `json:"id"` ++ Container string `json:"container"` + } + flags, err = receive(&out) + if err != nil { + return + } +- id_out_ = out.Id ++ container_out_ = out.Container + return + }, nil + } + +-type Ping_methods struct{} ++type RemoveContainer_methods struct{} + +-func Ping() Ping_methods { return Ping_methods{} } ++func RemoveContainer() RemoveContainer_methods { return RemoveContainer_methods{} } + +-func (m Ping_methods) Call(c *varlink.Connection) (ping_out_ StringResponse, err_ error) { +- receive, err_ := m.Send(c, 0) ++func (m RemoveContainer_methods) Call(c *varlink.Connection, name_in_ string, force_in_ bool) (container_out_ string, err_ error) { ++ receive, err_ := m.Send(c, 0, name_in_, force_in_) + if err_ != nil { + return + } +- ping_out_, _, err_ = receive() ++ container_out_, _, err_ = receive() + return + } + +-func (m Ping_methods) Send(c *varlink.Connection, flags uint64) (func() (StringResponse, uint64, error), error) { +- receive, err := c.Send("io.projectatomic.podman.Ping", nil, flags) ++func (m RemoveContainer_methods) Send(c *varlink.Connection, flags uint64, name_in_ string, force_in_ bool) (func() (string, uint64, error), error) { ++ var in struct { ++ Name string `json:"name"` ++ Force bool `json:"force"` ++ } ++ in.Name = name_in_ ++ in.Force = force_in_ ++ receive, err := c.Send("io.projectatomic.podman.RemoveContainer", in, flags) + if err != nil { + return nil, err + } +- return func() (ping_out_ StringResponse, flags uint64, err error) { ++ return func() (container_out_ string, flags uint64, err error) { + var out struct { +- Ping StringResponse `json:"ping"` ++ Container string `json:"container"` + } + flags, err = receive(&out) + if err != nil { + return + } +- ping_out_ = out.Ping ++ container_out_ = out.Container + return + }, nil + } + +-type PauseContainer_methods struct{} ++type RemoveImage_methods struct{} + +-func PauseContainer() PauseContainer_methods { return PauseContainer_methods{} } ++func RemoveImage() RemoveImage_methods { return RemoveImage_methods{} } + +-func (m PauseContainer_methods) Call(c *varlink.Connection, name_in_ string) (container_out_ string, err_ error) { +- receive, err_ := m.Send(c, 0, name_in_) ++func (m RemoveImage_methods) Call(c *varlink.Connection, name_in_ string, force_in_ bool) (image_out_ string, err_ error) { ++ receive, err_ := m.Send(c, 0, name_in_, force_in_) + if err_ != nil { + return + } +- container_out_, _, err_ = receive() ++ image_out_, _, err_ = receive() + return + } + +-func (m PauseContainer_methods) Send(c *varlink.Connection, flags uint64, name_in_ string) (func() (string, uint64, error), error) { ++func (m RemoveImage_methods) Send(c *varlink.Connection, flags uint64, name_in_ string, force_in_ bool) (func() (string, uint64, error), error) { + var in struct { +- Name string `json:"name"` ++ Name string `json:"name"` ++ Force bool `json:"force"` + } + in.Name = name_in_ +- receive, err := c.Send("io.projectatomic.podman.PauseContainer", in, flags) ++ in.Force = force_in_ ++ receive, err := c.Send("io.projectatomic.podman.RemoveImage", in, flags) + if err != nil { + return nil, err + } +- return func() (container_out_ string, flags uint64, err error) { ++ return func() (image_out_ string, flags uint64, err error) { + var out struct { +- Container string `json:"container"` ++ Image string `json:"image"` + } + flags, err = receive(&out) + if err != nil { + return + } +- container_out_ = out.Container ++ image_out_ = out.Image + return + }, nil + } + +-type PushImage_methods struct{} ++type ImportImage_methods struct{} + +-func PushImage() PushImage_methods { return PushImage_methods{} } ++func ImportImage() ImportImage_methods { return ImportImage_methods{} } + +-func (m PushImage_methods) Call(c *varlink.Connection, name_in_ string, tag_in_ string, tlsverify_in_ bool) (image_out_ string, err_ error) { +- receive, err_ := m.Send(c, 0, name_in_, tag_in_, tlsverify_in_) ++func (m ImportImage_methods) Call(c *varlink.Connection, source_in_ string, reference_in_ string, message_in_ string, changes_in_ []string) (image_out_ string, err_ error) { ++ receive, err_ := m.Send(c, 0, source_in_, reference_in_, message_in_, changes_in_) + if err_ != nil { + return + } +@@ -1089,16 +1015,18 @@ func (m PushImage_methods) Call(c *varlink.Connection, name_in_ string, tag_in_ + return + } + +-func (m PushImage_methods) Send(c *varlink.Connection, flags uint64, name_in_ string, tag_in_ string, tlsverify_in_ bool) (func() (string, uint64, error), error) { ++func (m ImportImage_methods) Send(c *varlink.Connection, flags uint64, source_in_ string, reference_in_ string, message_in_ string, changes_in_ []string) (func() (string, uint64, error), error) { + var in struct { +- Name string `json:"name"` +- Tag string `json:"tag"` +- Tlsverify bool `json:"tlsverify"` ++ Source string `json:"source"` ++ Reference string `json:"reference"` ++ Message string `json:"message"` ++ Changes []string `json:"changes"` + } +- in.Name = name_in_ +- in.Tag = tag_in_ +- in.Tlsverify = tlsverify_in_ +- receive, err := c.Send("io.projectatomic.podman.PushImage", in, flags) ++ in.Source = source_in_ ++ in.Reference = reference_in_ ++ in.Message = message_in_ ++ in.Changes = []string(changes_in_) ++ receive, err := c.Send("io.projectatomic.podman.ImportImage", in, flags) + if err != nil { + return nil, err + } +@@ -1154,114 +1082,153 @@ func (m ExportImage_methods) Send(c *varlink.Connection, flags uint64, name_in_ + }, nil + } + +-type InspectImage_methods struct{} ++type InspectContainer_methods struct{} + +-func InspectImage() InspectImage_methods { return InspectImage_methods{} } ++func InspectContainer() InspectContainer_methods { return InspectContainer_methods{} } + +-func (m InspectImage_methods) Call(c *varlink.Connection, name_in_ string) (image_out_ string, err_ error) { ++func (m InspectContainer_methods) Call(c *varlink.Connection, name_in_ string) (container_out_ string, err_ error) { + receive, err_ := m.Send(c, 0, name_in_) + if err_ != nil { + return + } +- image_out_, _, err_ = receive() ++ container_out_, _, err_ = receive() + return + } + +-func (m InspectImage_methods) Send(c *varlink.Connection, flags uint64, name_in_ string) (func() (string, uint64, error), error) { ++func (m InspectContainer_methods) Send(c *varlink.Connection, flags uint64, name_in_ string) (func() (string, uint64, error), error) { + var in struct { + Name string `json:"name"` + } + in.Name = name_in_ +- receive, err := c.Send("io.projectatomic.podman.InspectImage", in, flags) ++ receive, err := c.Send("io.projectatomic.podman.InspectContainer", in, flags) + if err != nil { + return nil, err + } +- return func() (image_out_ string, flags uint64, err error) { ++ return func() (container_out_ string, flags uint64, err error) { + var out struct { +- Image string `json:"image"` ++ Container string `json:"container"` + } + flags, err = receive(&out) + if err != nil { + return + } +- image_out_ = out.Image ++ container_out_ = out.Container + return + }, nil + } + +-type RemoveImage_methods struct{} ++type GetContainerLogs_methods struct{} + +-func RemoveImage() RemoveImage_methods { return RemoveImage_methods{} } ++func GetContainerLogs() GetContainerLogs_methods { return GetContainerLogs_methods{} } + +-func (m RemoveImage_methods) Call(c *varlink.Connection, name_in_ string, force_in_ bool) (image_out_ string, err_ error) { +- receive, err_ := m.Send(c, 0, name_in_, force_in_) ++func (m GetContainerLogs_methods) Call(c *varlink.Connection, name_in_ string) (container_out_ []string, err_ error) { ++ receive, err_ := m.Send(c, 0, name_in_) + if err_ != nil { + return + } +- image_out_, _, err_ = receive() ++ container_out_, _, err_ = receive() + return + } + +-func (m RemoveImage_methods) Send(c *varlink.Connection, flags uint64, name_in_ string, force_in_ bool) (func() (string, uint64, error), error) { ++func (m GetContainerLogs_methods) Send(c *varlink.Connection, flags uint64, name_in_ string) (func() ([]string, uint64, error), error) { + var in struct { +- Name string `json:"name"` +- Force bool `json:"force"` ++ Name string `json:"name"` + } + in.Name = name_in_ +- in.Force = force_in_ +- receive, err := c.Send("io.projectatomic.podman.RemoveImage", in, flags) ++ receive, err := c.Send("io.projectatomic.podman.GetContainerLogs", in, flags) + if err != nil { + return nil, err + } +- return func() (image_out_ string, flags uint64, err error) { ++ return func() (container_out_ []string, flags uint64, err error) { + var out struct { +- Image string `json:"image"` ++ Container []string `json:"container"` + } + flags, err = receive(&out) + if err != nil { + return + } +- image_out_ = out.Image ++ container_out_ = []string(out.Container) + return + }, nil + } + +-type GetVersion_methods struct{} ++type ListContainerChanges_methods struct{} + +-func GetVersion() GetVersion_methods { return GetVersion_methods{} } ++func ListContainerChanges() ListContainerChanges_methods { return ListContainerChanges_methods{} } + +-func (m GetVersion_methods) Call(c *varlink.Connection) (version_out_ Version, err_ error) { +- receive, err_ := m.Send(c, 0) ++func (m ListContainerChanges_methods) Call(c *varlink.Connection, name_in_ string) (container_out_ ContainerChanges, err_ error) { ++ receive, err_ := m.Send(c, 0, name_in_) + if err_ != nil { + return + } +- version_out_, _, err_ = receive() ++ container_out_, _, err_ = receive() + return + } + +-func (m GetVersion_methods) Send(c *varlink.Connection, flags uint64) (func() (Version, uint64, error), error) { +- receive, err := c.Send("io.projectatomic.podman.GetVersion", nil, flags) ++func (m ListContainerChanges_methods) Send(c *varlink.Connection, flags uint64, name_in_ string) (func() (ContainerChanges, uint64, error), error) { ++ var in struct { ++ Name string `json:"name"` ++ } ++ in.Name = name_in_ ++ receive, err := c.Send("io.projectatomic.podman.ListContainerChanges", in, flags) + if err != nil { + return nil, err + } +- return func() (version_out_ Version, flags uint64, err error) { ++ return func() (container_out_ ContainerChanges, flags uint64, err error) { + var out struct { +- Version Version `json:"version"` ++ Container ContainerChanges `json:"container"` + } + flags, err = receive(&out) + if err != nil { + return + } +- version_out_ = out.Version ++ container_out_ = out.Container + return + }, nil + } + +-type ResizeContainerTty_methods struct{} ++type RestartContainer_methods struct{} + +-func ResizeContainerTty() ResizeContainerTty_methods { return ResizeContainerTty_methods{} } ++func RestartContainer() RestartContainer_methods { return RestartContainer_methods{} } + +-func (m ResizeContainerTty_methods) Call(c *varlink.Connection) (notimplemented_out_ NotImplemented, err_ error) { ++func (m RestartContainer_methods) Call(c *varlink.Connection, name_in_ string, timeout_in_ int64) (container_out_ string, err_ error) { ++ receive, err_ := m.Send(c, 0, name_in_, timeout_in_) ++ if err_ != nil { ++ return ++ } ++ container_out_, _, err_ = receive() ++ return ++} ++ ++func (m RestartContainer_methods) Send(c *varlink.Connection, flags uint64, name_in_ string, timeout_in_ int64) (func() (string, uint64, error), error) { ++ var in struct { ++ Name string `json:"name"` ++ Timeout int64 `json:"timeout"` ++ } ++ in.Name = name_in_ ++ in.Timeout = timeout_in_ ++ receive, err := c.Send("io.projectatomic.podman.RestartContainer", in, flags) ++ if err != nil { ++ return nil, err ++ } ++ return func() (container_out_ string, flags uint64, err error) { ++ var out struct { ++ Container string `json:"container"` ++ } ++ flags, err = receive(&out) ++ if err != nil { ++ return ++ } ++ container_out_ = out.Container ++ return ++ }, nil ++} ++ ++type RenameContainer_methods struct{} ++ ++func RenameContainer() RenameContainer_methods { return RenameContainer_methods{} } ++ ++func (m RenameContainer_methods) Call(c *varlink.Connection) (notimplemented_out_ NotImplemented, err_ error) { + receive, err_ := m.Send(c, 0) + if err_ != nil { + return +@@ -1270,8 +1237,8 @@ func (m ResizeContainerTty_methods) Call(c *varlink.Connection) (notimplemented_ + return + } + +-func (m ResizeContainerTty_methods) Send(c *varlink.Connection, flags uint64) (func() (NotImplemented, uint64, error), error) { +- receive, err := c.Send("io.projectatomic.podman.ResizeContainerTty", nil, flags) ++func (m RenameContainer_methods) Send(c *varlink.Connection, flags uint64) (func() (NotImplemented, uint64, error), error) { ++ receive, err := c.Send("io.projectatomic.podman.RenameContainer", nil, flags) + if err != nil { + return nil, err + } +@@ -1288,12 +1255,12 @@ func (m ResizeContainerTty_methods) Send(c *varlink.Connection, flags uint64) (f + }, nil + } + +-type KillContainer_methods struct{} ++type PauseContainer_methods struct{} + +-func KillContainer() KillContainer_methods { return KillContainer_methods{} } ++func PauseContainer() PauseContainer_methods { return PauseContainer_methods{} } + +-func (m KillContainer_methods) Call(c *varlink.Connection, name_in_ string, signal_in_ int64) (container_out_ string, err_ error) { +- receive, err_ := m.Send(c, 0, name_in_, signal_in_) ++func (m PauseContainer_methods) Call(c *varlink.Connection, name_in_ string) (container_out_ string, err_ error) { ++ receive, err_ := m.Send(c, 0, name_in_) + if err_ != nil { + return + } +@@ -1301,14 +1268,12 @@ func (m KillContainer_methods) Call(c *varlink.Connection, name_in_ string, sign + return + } + +-func (m KillContainer_methods) Send(c *varlink.Connection, flags uint64, name_in_ string, signal_in_ int64) (func() (string, uint64, error), error) { ++func (m PauseContainer_methods) Send(c *varlink.Connection, flags uint64, name_in_ string) (func() (string, uint64, error), error) { + var in struct { +- Name string `json:"name"` +- Signal int64 `json:"signal"` ++ Name string `json:"name"` + } + in.Name = name_in_ +- in.Signal = signal_in_ +- receive, err := c.Send("io.projectatomic.podman.KillContainer", in, flags) ++ receive, err := c.Send("io.projectatomic.podman.PauseContainer", in, flags) + if err != nil { + return nil, err + } +@@ -1325,185 +1290,220 @@ func (m KillContainer_methods) Send(c *varlink.Connection, flags uint64, name_in + }, nil + } + +-type CreateImage_methods struct{} ++type PushImage_methods struct{} + +-func CreateImage() CreateImage_methods { return CreateImage_methods{} } ++func PushImage() PushImage_methods { return PushImage_methods{} } + +-func (m CreateImage_methods) Call(c *varlink.Connection) (notimplemented_out_ NotImplemented, err_ error) { +- receive, err_ := m.Send(c, 0) ++func (m PushImage_methods) Call(c *varlink.Connection, name_in_ string, tag_in_ string, tlsverify_in_ bool) (image_out_ string, err_ error) { ++ receive, err_ := m.Send(c, 0, name_in_, tag_in_, tlsverify_in_) + if err_ != nil { + return + } +- notimplemented_out_, _, err_ = receive() ++ image_out_, _, err_ = receive() + return + } + +-func (m CreateImage_methods) Send(c *varlink.Connection, flags uint64) (func() (NotImplemented, uint64, error), error) { +- receive, err := c.Send("io.projectatomic.podman.CreateImage", nil, flags) ++func (m PushImage_methods) Send(c *varlink.Connection, flags uint64, name_in_ string, tag_in_ string, tlsverify_in_ bool) (func() (string, uint64, error), error) { ++ var in struct { ++ Name string `json:"name"` ++ Tag string `json:"tag"` ++ Tlsverify bool `json:"tlsverify"` ++ } ++ in.Name = name_in_ ++ in.Tag = tag_in_ ++ in.Tlsverify = tlsverify_in_ ++ receive, err := c.Send("io.projectatomic.podman.PushImage", in, flags) ++ if err != nil { ++ return nil, err ++ } ++ return func() (image_out_ string, flags uint64, err error) { ++ var out struct { ++ Image string `json:"image"` ++ } ++ flags, err = receive(&out) ++ if err != nil { ++ return ++ } ++ image_out_ = out.Image ++ return ++ }, nil ++} ++ ++type ListContainerProcesses_methods struct{} ++ ++func ListContainerProcesses() ListContainerProcesses_methods { return ListContainerProcesses_methods{} } ++ ++func (m ListContainerProcesses_methods) Call(c *varlink.Connection, name_in_ string, opts_in_ []string) (container_out_ []string, err_ error) { ++ receive, err_ := m.Send(c, 0, name_in_, opts_in_) ++ if err_ != nil { ++ return ++ } ++ container_out_, _, err_ = receive() ++ return ++} ++ ++func (m ListContainerProcesses_methods) Send(c *varlink.Connection, flags uint64, name_in_ string, opts_in_ []string) (func() ([]string, uint64, error), error) { ++ var in struct { ++ Name string `json:"name"` ++ Opts []string `json:"opts"` ++ } ++ in.Name = name_in_ ++ in.Opts = []string(opts_in_) ++ receive, err := c.Send("io.projectatomic.podman.ListContainerProcesses", in, flags) + if err != nil { + return nil, err + } +- return func() (notimplemented_out_ NotImplemented, flags uint64, err error) { ++ return func() (container_out_ []string, flags uint64, err error) { + var out struct { +- Notimplemented NotImplemented `json:"notimplemented"` ++ Container []string `json:"container"` + } + flags, err = receive(&out) + if err != nil { + return + } +- notimplemented_out_ = out.Notimplemented ++ container_out_ = []string(out.Container) + return + }, nil + } + +-type GetContainerLogs_methods struct{} ++type WaitContainer_methods struct{} + +-func GetContainerLogs() GetContainerLogs_methods { return GetContainerLogs_methods{} } ++func WaitContainer() WaitContainer_methods { return WaitContainer_methods{} } + +-func (m GetContainerLogs_methods) Call(c *varlink.Connection, name_in_ string) (container_out_ []string, err_ error) { ++func (m WaitContainer_methods) Call(c *varlink.Connection, name_in_ string) (exitcode_out_ int64, err_ error) { + receive, err_ := m.Send(c, 0, name_in_) + if err_ != nil { + return + } +- container_out_, _, err_ = receive() ++ exitcode_out_, _, err_ = receive() + return + } + +-func (m GetContainerLogs_methods) Send(c *varlink.Connection, flags uint64, name_in_ string) (func() ([]string, uint64, error), error) { ++func (m WaitContainer_methods) Send(c *varlink.Connection, flags uint64, name_in_ string) (func() (int64, uint64, error), error) { + var in struct { + Name string `json:"name"` + } + in.Name = name_in_ +- receive, err := c.Send("io.projectatomic.podman.GetContainerLogs", in, flags) ++ receive, err := c.Send("io.projectatomic.podman.WaitContainer", in, flags) + if err != nil { + return nil, err + } +- return func() (container_out_ []string, flags uint64, err error) { ++ return func() (exitcode_out_ int64, flags uint64, err error) { + var out struct { +- Container []string `json:"container"` ++ Exitcode int64 `json:"exitcode"` + } + flags, err = receive(&out) + if err != nil { + return + } +- container_out_ = []string(out.Container) ++ exitcode_out_ = out.Exitcode + return + }, nil + } + +-type HistoryImage_methods struct{} ++type DeleteStoppedContainers_methods struct{} + +-func HistoryImage() HistoryImage_methods { return HistoryImage_methods{} } ++func DeleteStoppedContainers() DeleteStoppedContainers_methods { ++ return DeleteStoppedContainers_methods{} ++} + +-func (m HistoryImage_methods) Call(c *varlink.Connection, name_in_ string) (history_out_ []ImageHistory, err_ error) { +- receive, err_ := m.Send(c, 0, name_in_) ++func (m DeleteStoppedContainers_methods) Call(c *varlink.Connection) (containers_out_ []string, err_ error) { ++ receive, err_ := m.Send(c, 0) + if err_ != nil { + return + } +- history_out_, _, err_ = receive() ++ containers_out_, _, err_ = receive() + return + } + +-func (m HistoryImage_methods) Send(c *varlink.Connection, flags uint64, name_in_ string) (func() ([]ImageHistory, uint64, error), error) { +- var in struct { +- Name string `json:"name"` +- } +- in.Name = name_in_ +- receive, err := c.Send("io.projectatomic.podman.HistoryImage", in, flags) ++func (m DeleteStoppedContainers_methods) Send(c *varlink.Connection, flags uint64) (func() ([]string, uint64, error), error) { ++ receive, err := c.Send("io.projectatomic.podman.DeleteStoppedContainers", nil, flags) + if err != nil { + return nil, err + } +- return func() (history_out_ []ImageHistory, flags uint64, err error) { ++ return func() (containers_out_ []string, flags uint64, err error) { + var out struct { +- History []ImageHistory `json:"history"` ++ Containers []string `json:"containers"` + } + flags, err = receive(&out) + if err != nil { + return + } +- history_out_ = []ImageHistory(out.History) ++ containers_out_ = []string(out.Containers) + return + }, nil + } + +-type SearchImage_methods struct{} ++type TagImage_methods struct{} + +-func SearchImage() SearchImage_methods { return SearchImage_methods{} } ++func TagImage() TagImage_methods { return TagImage_methods{} } + +-func (m SearchImage_methods) Call(c *varlink.Connection, name_in_ string, limit_in_ int64) (images_out_ []ImageSearch, err_ error) { +- receive, err_ := m.Send(c, 0, name_in_, limit_in_) ++func (m TagImage_methods) Call(c *varlink.Connection, name_in_ string, tagged_in_ string) (image_out_ string, err_ error) { ++ receive, err_ := m.Send(c, 0, name_in_, tagged_in_) + if err_ != nil { + return + } +- images_out_, _, err_ = receive() ++ image_out_, _, err_ = receive() + return + } + +-func (m SearchImage_methods) Send(c *varlink.Connection, flags uint64, name_in_ string, limit_in_ int64) (func() ([]ImageSearch, uint64, error), error) { ++func (m TagImage_methods) Send(c *varlink.Connection, flags uint64, name_in_ string, tagged_in_ string) (func() (string, uint64, error), error) { + var in struct { +- Name string `json:"name"` +- Limit int64 `json:"limit"` ++ Name string `json:"name"` ++ Tagged string `json:"tagged"` + } + in.Name = name_in_ +- in.Limit = limit_in_ +- receive, err := c.Send("io.projectatomic.podman.SearchImage", in, flags) ++ in.Tagged = tagged_in_ ++ receive, err := c.Send("io.projectatomic.podman.TagImage", in, flags) + if err != nil { + return nil, err + } +- return func() (images_out_ []ImageSearch, flags uint64, err error) { ++ return func() (image_out_ string, flags uint64, err error) { + var out struct { +- Images []ImageSearch `json:"images"` ++ Image string `json:"image"` + } + flags, err = receive(&out) + if err != nil { + return + } +- images_out_ = []ImageSearch(out.Images) ++ image_out_ = out.Image + return + }, nil + } + +-type Commit_methods struct{} ++type SearchImage_methods struct{} + +-func Commit() Commit_methods { return Commit_methods{} } ++func SearchImage() SearchImage_methods { return SearchImage_methods{} } + +-func (m Commit_methods) Call(c *varlink.Connection, name_in_ string, image_name_in_ string, changes_in_ []string, author_in_ string, message_in_ string, pause_in_ bool) (image_out_ string, err_ error) { +- receive, err_ := m.Send(c, 0, name_in_, image_name_in_, changes_in_, author_in_, message_in_, pause_in_) ++func (m SearchImage_methods) Call(c *varlink.Connection, name_in_ string, limit_in_ int64) (images_out_ []ImageSearch, err_ error) { ++ receive, err_ := m.Send(c, 0, name_in_, limit_in_) + if err_ != nil { + return + } +- image_out_, _, err_ = receive() ++ images_out_, _, err_ = receive() + return + } + +-func (m Commit_methods) Send(c *varlink.Connection, flags uint64, name_in_ string, image_name_in_ string, changes_in_ []string, author_in_ string, message_in_ string, pause_in_ bool) (func() (string, uint64, error), error) { ++func (m SearchImage_methods) Send(c *varlink.Connection, flags uint64, name_in_ string, limit_in_ int64) (func() ([]ImageSearch, uint64, error), error) { + var in struct { +- Name string `json:"name"` +- Image_name string `json:"image_name"` +- Changes []string `json:"changes"` +- Author string `json:"author"` +- Message string `json:"message"` +- Pause bool `json:"pause"` ++ Name string `json:"name"` ++ Limit int64 `json:"limit"` + } + in.Name = name_in_ +- in.Image_name = image_name_in_ +- in.Changes = []string(changes_in_) +- in.Author = author_in_ +- in.Message = message_in_ +- in.Pause = pause_in_ +- receive, err := c.Send("io.projectatomic.podman.Commit", in, flags) ++ in.Limit = limit_in_ ++ receive, err := c.Send("io.projectatomic.podman.SearchImage", in, flags) + if err != nil { + return nil, err + } +- return func() (image_out_ string, flags uint64, err error) { ++ return func() (images_out_ []ImageSearch, flags uint64, err error) { + var out struct { +- Image string `json:"image"` ++ Images []ImageSearch `json:"images"` + } + flags, err = receive(&out) + if err != nil { + return + } +- image_out_ = out.Image ++ images_out_ = []ImageSearch(out.Images) + return + }, nil + } +@@ -1511,58 +1511,50 @@ func (m Commit_methods) Send(c *varlink.Connection, flags uint64, name_in_ strin + // Service interface with all methods + type ioprojectatomicpodmanInterface interface { + GetContainerStats(c VarlinkCall, name_ string) error +- StopContainer(c VarlinkCall, name_ string, timeout_ int64) error +- RestartContainer(c VarlinkCall, name_ string, timeout_ int64) error +- ImportImage(c VarlinkCall, source_ string, reference_ string, message_ string, changes_ []string) error +- ListContainers(c VarlinkCall) error +- StartContainer(c VarlinkCall) error ++ UnpauseContainer(c VarlinkCall, name_ string) error ++ PullImage(c VarlinkCall, name_ string) error ++ ExportImage(c VarlinkCall, name_ string, destination_ string, compress_ bool) error ++ Ping(c VarlinkCall) error ++ GetVersion(c VarlinkCall) error ++ CreateContainer(c VarlinkCall) error ++ KillContainer(c VarlinkCall, name_ string, signal_ int64) error + RemoveContainer(c VarlinkCall, name_ string, force_ bool) error +- DeleteStoppedContainers(c VarlinkCall) error ++ RemoveImage(c VarlinkCall, name_ string, force_ bool) error ++ ImportImage(c VarlinkCall, source_ string, reference_ string, message_ string, changes_ []string) error + InspectContainer(c VarlinkCall, name_ string) error ++ GetContainerLogs(c VarlinkCall, name_ string) error ++ ListContainerChanges(c VarlinkCall, name_ string) error ++ RestartContainer(c VarlinkCall, name_ string, timeout_ int64) error + RenameContainer(c VarlinkCall) error +- BuildImage(c VarlinkCall) error +- Ping(c VarlinkCall) error + PauseContainer(c VarlinkCall, name_ string) error + PushImage(c VarlinkCall, name_ string, tag_ string, tlsverify_ bool) error +- ExportImage(c VarlinkCall, name_ string, destination_ string, compress_ bool) error +- PullImage(c VarlinkCall, name_ string) error +- RemoveImage(c VarlinkCall, name_ string, force_ bool) error +- GetVersion(c VarlinkCall) error +- ResizeContainerTty(c VarlinkCall) error +- KillContainer(c VarlinkCall, name_ string, signal_ int64) error +- CreateImage(c VarlinkCall) error ++ ListContainerProcesses(c VarlinkCall, name_ string, opts_ []string) error ++ WaitContainer(c VarlinkCall, name_ string) error ++ DeleteStoppedContainers(c VarlinkCall) error ++ TagImage(c VarlinkCall, name_ string, tagged_ string) error ++ SearchImage(c VarlinkCall, name_ string, limit_ int64) error ++ UpdateContainer(c VarlinkCall) error + InspectImage(c VarlinkCall, name_ string) error +- GetContainerLogs(c VarlinkCall, name_ string) error + HistoryImage(c VarlinkCall, name_ string) error +- SearchImage(c VarlinkCall, name_ string, limit_ int64) error +- Commit(c VarlinkCall, name_ string, image_name_ string, changes_ []string, author_ string, message_ string, pause_ bool) error +- WaitContainer(c VarlinkCall, name_ string) error +- DeleteUnusedImages(c VarlinkCall) error + GetInfo(c VarlinkCall) error +- GetContainer(c VarlinkCall, name_ string) error +- CreateContainer(c VarlinkCall) error +- ListContainerProcesses(c VarlinkCall, name_ string, opts_ []string) error ++ ResizeContainerTty(c VarlinkCall) error ++ StartContainer(c VarlinkCall) error ++ StopContainer(c VarlinkCall, name_ string, timeout_ int64) error + AttachToContainer(c VarlinkCall) error +- TagImage(c VarlinkCall, name_ string, tagged_ string) error +- ListContainerChanges(c VarlinkCall, name_ string) error ++ BuildImage(c VarlinkCall) error ++ CreateImage(c VarlinkCall) error ++ Commit(c VarlinkCall, name_ string, image_name_ string, changes_ []string, author_ string, message_ string, pause_ bool) error ++ ListContainers(c VarlinkCall) error ++ GetContainer(c VarlinkCall, name_ string) error + ExportContainer(c VarlinkCall, name_ string, path_ string) error +- UpdateContainer(c VarlinkCall) error +- UnpauseContainer(c VarlinkCall, name_ string) error + ListImages(c VarlinkCall) error ++ DeleteUnusedImages(c VarlinkCall) error + } + + // Service object with all methods + type VarlinkCall struct{ varlink.Call } + + // Reply methods for all varlink errors +-func (c *VarlinkCall) ReplyImageNotFound(name_ string) error { +- var out struct { +- Name string `json:"name"` +- } +- out.Name = name_ +- return c.ReplyError("io.projectatomic.podman.ImageNotFound", &out) +-} +- + func (c *VarlinkCall) ReplyContainerNotFound(name_ string) error { + var out struct { + Name string `json:"name"` +@@ -1587,32 +1579,40 @@ func (c *VarlinkCall) ReplyRuntimeError(reason_ string) error { + return c.ReplyError("io.projectatomic.podman.RuntimeError", &out) + } + ++func (c *VarlinkCall) ReplyImageNotFound(name_ string) error { ++ var out struct { ++ Name string `json:"name"` ++ } ++ out.Name = name_ ++ return c.ReplyError("io.projectatomic.podman.ImageNotFound", &out) ++} ++ + // Reply methods for all varlink methods +-func (c *VarlinkCall) ReplyGetContainerStats(container_ ContainerStats) error { ++func (c *VarlinkCall) ReplyListContainerProcesses(container_ []string) error { + var out struct { +- Container ContainerStats `json:"container"` ++ Container []string `json:"container"` + } +- out.Container = container_ ++ out.Container = []string(container_) + return c.Reply(&out) + } + +-func (c *VarlinkCall) ReplyStopContainer(container_ string) error { ++func (c *VarlinkCall) ReplyWaitContainer(exitcode_ int64) error { + var out struct { +- Container string `json:"container"` ++ Exitcode int64 `json:"exitcode"` + } +- out.Container = container_ ++ out.Exitcode = exitcode_ + return c.Reply(&out) + } + +-func (c *VarlinkCall) ReplyRestartContainer(container_ string) error { ++func (c *VarlinkCall) ReplyDeleteStoppedContainers(containers_ []string) error { + var out struct { +- Container string `json:"container"` ++ Containers []string `json:"containers"` + } +- out.Container = container_ ++ out.Containers = []string(containers_) + return c.Reply(&out) + } + +-func (c *VarlinkCall) ReplyImportImage(image_ string) error { ++func (c *VarlinkCall) ReplyTagImage(image_ string) error { + var out struct { + Image string `json:"image"` + } +@@ -1620,15 +1620,15 @@ func (c *VarlinkCall) ReplyImportImage(image_ string) error { + return c.Reply(&out) + } + +-func (c *VarlinkCall) ReplyListContainers(containers_ []ListContainerData) error { ++func (c *VarlinkCall) ReplySearchImage(images_ []ImageSearch) error { + var out struct { +- Containers []ListContainerData `json:"containers"` ++ Images []ImageSearch `json:"images"` + } +- out.Containers = []ListContainerData(containers_) ++ out.Images = []ImageSearch(images_) + return c.Reply(&out) + } + +-func (c *VarlinkCall) ReplyStartContainer(notimplemented_ NotImplemented) error { ++func (c *VarlinkCall) ReplyUpdateContainer(notimplemented_ NotImplemented) error { + var out struct { + Notimplemented NotImplemented `json:"notimplemented"` + } +@@ -1636,31 +1636,31 @@ func (c *VarlinkCall) ReplyStartContainer(notimplemented_ NotImplemented) error + return c.Reply(&out) + } + +-func (c *VarlinkCall) ReplyRemoveContainer(container_ string) error { ++func (c *VarlinkCall) ReplyInspectImage(image_ string) error { + var out struct { +- Container string `json:"container"` ++ Image string `json:"image"` + } +- out.Container = container_ ++ out.Image = image_ + return c.Reply(&out) + } + +-func (c *VarlinkCall) ReplyDeleteStoppedContainers(containers_ []string) error { ++func (c *VarlinkCall) ReplyAttachToContainer(notimplemented_ NotImplemented) error { + var out struct { +- Containers []string `json:"containers"` ++ Notimplemented NotImplemented `json:"notimplemented"` + } +- out.Containers = []string(containers_) ++ out.Notimplemented = notimplemented_ + return c.Reply(&out) + } + +-func (c *VarlinkCall) ReplyInspectContainer(container_ string) error { ++func (c *VarlinkCall) ReplyBuildImage(notimplemented_ NotImplemented) error { + var out struct { +- Container string `json:"container"` ++ Notimplemented NotImplemented `json:"notimplemented"` + } +- out.Container = container_ ++ out.Notimplemented = notimplemented_ + return c.Reply(&out) + } + +-func (c *VarlinkCall) ReplyRenameContainer(notimplemented_ NotImplemented) error { ++func (c *VarlinkCall) ReplyCreateImage(notimplemented_ NotImplemented) error { + var out struct { + Notimplemented NotImplemented `json:"notimplemented"` + } +@@ -1668,7 +1668,23 @@ func (c *VarlinkCall) ReplyRenameContainer(notimplemented_ NotImplemented) error + return c.Reply(&out) + } + +-func (c *VarlinkCall) ReplyBuildImage(notimplemented_ NotImplemented) error { ++func (c *VarlinkCall) ReplyHistoryImage(history_ []ImageHistory) error { ++ var out struct { ++ History []ImageHistory `json:"history"` ++ } ++ out.History = []ImageHistory(history_) ++ return c.Reply(&out) ++} ++ ++func (c *VarlinkCall) ReplyGetInfo(info_ PodmanInfo) error { ++ var out struct { ++ Info PodmanInfo `json:"info"` ++ } ++ out.Info = info_ ++ return c.Reply(&out) ++} ++ ++func (c *VarlinkCall) ReplyResizeContainerTty(notimplemented_ NotImplemented) error { + var out struct { + Notimplemented NotImplemented `json:"notimplemented"` + } +@@ -1676,15 +1692,15 @@ func (c *VarlinkCall) ReplyBuildImage(notimplemented_ NotImplemented) error { + return c.Reply(&out) + } + +-func (c *VarlinkCall) ReplyPing(ping_ StringResponse) error { ++func (c *VarlinkCall) ReplyStartContainer(notimplemented_ NotImplemented) error { + var out struct { +- Ping StringResponse `json:"ping"` ++ Notimplemented NotImplemented `json:"notimplemented"` + } +- out.Ping = ping_ ++ out.Notimplemented = notimplemented_ + return c.Reply(&out) + } + +-func (c *VarlinkCall) ReplyPauseContainer(container_ string) error { ++func (c *VarlinkCall) ReplyStopContainer(container_ string) error { + var out struct { + Container string `json:"container"` + } +@@ -1692,7 +1708,7 @@ func (c *VarlinkCall) ReplyPauseContainer(container_ string) error { + return c.Reply(&out) + } + +-func (c *VarlinkCall) ReplyPushImage(image_ string) error { ++func (c *VarlinkCall) ReplyCommit(image_ string) error { + var out struct { + Image string `json:"image"` + } +@@ -1700,95 +1716,95 @@ func (c *VarlinkCall) ReplyPushImage(image_ string) error { + return c.Reply(&out) + } + +-func (c *VarlinkCall) ReplyExportImage(image_ string) error { ++func (c *VarlinkCall) ReplyDeleteUnusedImages(images_ []string) error { + var out struct { +- Image string `json:"image"` ++ Images []string `json:"images"` + } +- out.Image = image_ ++ out.Images = []string(images_) + return c.Reply(&out) + } + +-func (c *VarlinkCall) ReplyPullImage(id_ string) error { ++func (c *VarlinkCall) ReplyListContainers(containers_ []ListContainerData) error { + var out struct { +- Id string `json:"id"` ++ Containers []ListContainerData `json:"containers"` + } +- out.Id = id_ ++ out.Containers = []ListContainerData(containers_) + return c.Reply(&out) + } + +-func (c *VarlinkCall) ReplyGetVersion(version_ Version) error { ++func (c *VarlinkCall) ReplyGetContainer(container_ ListContainerData) error { + var out struct { +- Version Version `json:"version"` ++ Container ListContainerData `json:"container"` + } +- out.Version = version_ ++ out.Container = container_ + return c.Reply(&out) + } + +-func (c *VarlinkCall) ReplyResizeContainerTty(notimplemented_ NotImplemented) error { ++func (c *VarlinkCall) ReplyExportContainer(tarfile_ string) error { + var out struct { +- Notimplemented NotImplemented `json:"notimplemented"` ++ Tarfile string `json:"tarfile"` + } +- out.Notimplemented = notimplemented_ ++ out.Tarfile = tarfile_ + return c.Reply(&out) + } + +-func (c *VarlinkCall) ReplyKillContainer(container_ string) error { ++func (c *VarlinkCall) ReplyListImages(images_ []ImageInList) error { + var out struct { +- Container string `json:"container"` ++ Images []ImageInList `json:"images"` + } +- out.Container = container_ ++ out.Images = []ImageInList(images_) + return c.Reply(&out) + } + +-func (c *VarlinkCall) ReplyCreateImage(notimplemented_ NotImplemented) error { ++func (c *VarlinkCall) ReplyGetContainerStats(container_ ContainerStats) error { + var out struct { +- Notimplemented NotImplemented `json:"notimplemented"` ++ Container ContainerStats `json:"container"` + } +- out.Notimplemented = notimplemented_ ++ out.Container = container_ + return c.Reply(&out) + } + +-func (c *VarlinkCall) ReplyInspectImage(image_ string) error { ++func (c *VarlinkCall) ReplyUnpauseContainer(container_ string) error { + var out struct { +- Image string `json:"image"` ++ Container string `json:"container"` + } +- out.Image = image_ ++ out.Container = container_ + return c.Reply(&out) + } + +-func (c *VarlinkCall) ReplyRemoveImage(image_ string) error { ++func (c *VarlinkCall) ReplyPullImage(id_ string) error { + var out struct { +- Image string `json:"image"` ++ Id string `json:"id"` + } +- out.Image = image_ ++ out.Id = id_ + return c.Reply(&out) + } + +-func (c *VarlinkCall) ReplyGetContainerLogs(container_ []string) error { ++func (c *VarlinkCall) ReplyRemoveContainer(container_ string) error { + var out struct { +- Container []string `json:"container"` ++ Container string `json:"container"` + } +- out.Container = []string(container_) ++ out.Container = container_ + return c.Reply(&out) + } + +-func (c *VarlinkCall) ReplyHistoryImage(history_ []ImageHistory) error { ++func (c *VarlinkCall) ReplyRemoveImage(image_ string) error { + var out struct { +- History []ImageHistory `json:"history"` ++ Image string `json:"image"` + } +- out.History = []ImageHistory(history_) ++ out.Image = image_ + return c.Reply(&out) + } + +-func (c *VarlinkCall) ReplySearchImage(images_ []ImageSearch) error { ++func (c *VarlinkCall) ReplyImportImage(image_ string) error { + var out struct { +- Images []ImageSearch `json:"images"` ++ Image string `json:"image"` + } +- out.Images = []ImageSearch(images_) ++ out.Image = image_ + return c.Reply(&out) + } + +-func (c *VarlinkCall) ReplyCommit(image_ string) error { ++func (c *VarlinkCall) ReplyExportImage(image_ string) error { + var out struct { + Image string `json:"image"` + } +@@ -1796,19 +1812,19 @@ func (c *VarlinkCall) ReplyCommit(image_ string) error { + return c.Reply(&out) + } + +-func (c *VarlinkCall) ReplyGetInfo(info_ PodmanInfo) error { ++func (c *VarlinkCall) ReplyPing(ping_ StringResponse) error { + var out struct { +- Info PodmanInfo `json:"info"` ++ Ping StringResponse `json:"ping"` + } +- out.Info = info_ ++ out.Ping = ping_ + return c.Reply(&out) + } + +-func (c *VarlinkCall) ReplyGetContainer(container_ ListContainerData) error { ++func (c *VarlinkCall) ReplyGetVersion(version_ Version) error { + var out struct { +- Container ListContainerData `json:"container"` ++ Version Version `json:"version"` + } +- out.Container = container_ ++ out.Version = version_ + return c.Reply(&out) + } + +@@ -1820,15 +1836,15 @@ func (c *VarlinkCall) ReplyCreateContainer(notimplemented_ NotImplemented) error + return c.Reply(&out) + } + +-func (c *VarlinkCall) ReplyListContainerProcesses(container_ []string) error { ++func (c *VarlinkCall) ReplyKillContainer(container_ string) error { + var out struct { +- Container []string `json:"container"` ++ Container string `json:"container"` + } +- out.Container = []string(container_) ++ out.Container = container_ + return c.Reply(&out) + } + +-func (c *VarlinkCall) ReplyAttachToContainer(notimplemented_ NotImplemented) error { ++func (c *VarlinkCall) ReplyRenameContainer(notimplemented_ NotImplemented) error { + var out struct { + Notimplemented NotImplemented `json:"notimplemented"` + } +@@ -1836,47 +1852,47 @@ func (c *VarlinkCall) ReplyAttachToContainer(notimplemented_ NotImplemented) err + return c.Reply(&out) + } + +-func (c *VarlinkCall) ReplyWaitContainer(exitcode_ int64) error { ++func (c *VarlinkCall) ReplyPauseContainer(container_ string) error { + var out struct { +- Exitcode int64 `json:"exitcode"` ++ Container string `json:"container"` + } +- out.Exitcode = exitcode_ ++ out.Container = container_ + return c.Reply(&out) + } + +-func (c *VarlinkCall) ReplyDeleteUnusedImages(images_ []string) error { ++func (c *VarlinkCall) ReplyPushImage(image_ string) error { + var out struct { +- Images []string `json:"images"` ++ Image string `json:"image"` + } +- out.Images = []string(images_) ++ out.Image = image_ + return c.Reply(&out) + } + +-func (c *VarlinkCall) ReplyListContainerChanges(container_ ContainerChanges) error { ++func (c *VarlinkCall) ReplyInspectContainer(container_ string) error { + var out struct { +- Container ContainerChanges `json:"container"` ++ Container string `json:"container"` + } + out.Container = container_ + return c.Reply(&out) + } + +-func (c *VarlinkCall) ReplyExportContainer(tarfile_ string) error { ++func (c *VarlinkCall) ReplyGetContainerLogs(container_ []string) error { + var out struct { +- Tarfile string `json:"tarfile"` ++ Container []string `json:"container"` + } +- out.Tarfile = tarfile_ ++ out.Container = []string(container_) + return c.Reply(&out) + } + +-func (c *VarlinkCall) ReplyUpdateContainer(notimplemented_ NotImplemented) error { ++func (c *VarlinkCall) ReplyListContainerChanges(container_ ContainerChanges) error { + var out struct { +- Notimplemented NotImplemented `json:"notimplemented"` ++ Container ContainerChanges `json:"container"` + } +- out.Notimplemented = notimplemented_ ++ out.Container = container_ + return c.Reply(&out) + } + +-func (c *VarlinkCall) ReplyUnpauseContainer(container_ string) error { ++func (c *VarlinkCall) ReplyRestartContainer(container_ string) error { + var out struct { + Container string `json:"container"` + } +@@ -1884,213 +1900,204 @@ func (c *VarlinkCall) ReplyUnpauseContainer(container_ string) error { + return c.Reply(&out) + } + +-func (c *VarlinkCall) ReplyListImages(images_ []ImageInList) error { +- var out struct { +- Images []ImageInList `json:"images"` +- } +- out.Images = []ImageInList(images_) +- return c.Reply(&out) +-} +- +-func (c *VarlinkCall) ReplyTagImage(image_ string) error { +- var out struct { +- Image string `json:"image"` +- } +- out.Image = image_ +- return c.Reply(&out) +-} +- + // Dummy implementations for all varlink methods +-func (s *VarlinkInterface) Ping(c VarlinkCall) error { +- return c.ReplyMethodNotImplemented("io.projectatomic.podman.Ping") ++func (s *VarlinkInterface) UpdateContainer(c VarlinkCall) error { ++ return c.ReplyMethodNotImplemented("io.projectatomic.podman.UpdateContainer") + } + +-func (s *VarlinkInterface) PauseContainer(c VarlinkCall, name_ string) error { +- return c.ReplyMethodNotImplemented("io.projectatomic.podman.PauseContainer") ++func (s *VarlinkInterface) InspectImage(c VarlinkCall, name_ string) error { ++ return c.ReplyMethodNotImplemented("io.projectatomic.podman.InspectImage") + } + +-func (s *VarlinkInterface) PushImage(c VarlinkCall, name_ string, tag_ string, tlsverify_ bool) error { +- return c.ReplyMethodNotImplemented("io.projectatomic.podman.PushImage") ++func (s *VarlinkInterface) GetInfo(c VarlinkCall) error { ++ return c.ReplyMethodNotImplemented("io.projectatomic.podman.GetInfo") + } + +-func (s *VarlinkInterface) ExportImage(c VarlinkCall, name_ string, destination_ string, compress_ bool) error { +- return c.ReplyMethodNotImplemented("io.projectatomic.podman.ExportImage") ++func (s *VarlinkInterface) ResizeContainerTty(c VarlinkCall) error { ++ return c.ReplyMethodNotImplemented("io.projectatomic.podman.ResizeContainerTty") + } + +-func (s *VarlinkInterface) PullImage(c VarlinkCall, name_ string) error { +- return c.ReplyMethodNotImplemented("io.projectatomic.podman.PullImage") ++func (s *VarlinkInterface) StartContainer(c VarlinkCall) error { ++ return c.ReplyMethodNotImplemented("io.projectatomic.podman.StartContainer") + } + +-func (s *VarlinkInterface) GetVersion(c VarlinkCall) error { +- return c.ReplyMethodNotImplemented("io.projectatomic.podman.GetVersion") ++func (s *VarlinkInterface) StopContainer(c VarlinkCall, name_ string, timeout_ int64) error { ++ return c.ReplyMethodNotImplemented("io.projectatomic.podman.StopContainer") + } + +-func (s *VarlinkInterface) ResizeContainerTty(c VarlinkCall) error { +- return c.ReplyMethodNotImplemented("io.projectatomic.podman.ResizeContainerTty") ++func (s *VarlinkInterface) AttachToContainer(c VarlinkCall) error { ++ return c.ReplyMethodNotImplemented("io.projectatomic.podman.AttachToContainer") + } + +-func (s *VarlinkInterface) KillContainer(c VarlinkCall, name_ string, signal_ int64) error { +- return c.ReplyMethodNotImplemented("io.projectatomic.podman.KillContainer") ++func (s *VarlinkInterface) BuildImage(c VarlinkCall) error { ++ return c.ReplyMethodNotImplemented("io.projectatomic.podman.BuildImage") + } + + func (s *VarlinkInterface) CreateImage(c VarlinkCall) error { + return c.ReplyMethodNotImplemented("io.projectatomic.podman.CreateImage") + } + +-func (s *VarlinkInterface) InspectImage(c VarlinkCall, name_ string) error { +- return c.ReplyMethodNotImplemented("io.projectatomic.podman.InspectImage") ++func (s *VarlinkInterface) HistoryImage(c VarlinkCall, name_ string) error { ++ return c.ReplyMethodNotImplemented("io.projectatomic.podman.HistoryImage") + } + +-func (s *VarlinkInterface) RemoveImage(c VarlinkCall, name_ string, force_ bool) error { +- return c.ReplyMethodNotImplemented("io.projectatomic.podman.RemoveImage") ++func (s *VarlinkInterface) Commit(c VarlinkCall, name_ string, image_name_ string, changes_ []string, author_ string, message_ string, pause_ bool) error { ++ return c.ReplyMethodNotImplemented("io.projectatomic.podman.Commit") + } + +-func (s *VarlinkInterface) GetContainerLogs(c VarlinkCall, name_ string) error { +- return c.ReplyMethodNotImplemented("io.projectatomic.podman.GetContainerLogs") ++func (s *VarlinkInterface) ListContainers(c VarlinkCall) error { ++ return c.ReplyMethodNotImplemented("io.projectatomic.podman.ListContainers") + } + +-func (s *VarlinkInterface) HistoryImage(c VarlinkCall, name_ string) error { +- return c.ReplyMethodNotImplemented("io.projectatomic.podman.HistoryImage") ++func (s *VarlinkInterface) GetContainer(c VarlinkCall, name_ string) error { ++ return c.ReplyMethodNotImplemented("io.projectatomic.podman.GetContainer") + } + +-func (s *VarlinkInterface) SearchImage(c VarlinkCall, name_ string, limit_ int64) error { +- return c.ReplyMethodNotImplemented("io.projectatomic.podman.SearchImage") ++func (s *VarlinkInterface) ExportContainer(c VarlinkCall, name_ string, path_ string) error { ++ return c.ReplyMethodNotImplemented("io.projectatomic.podman.ExportContainer") + } + +-func (s *VarlinkInterface) Commit(c VarlinkCall, name_ string, image_name_ string, changes_ []string, author_ string, message_ string, pause_ bool) error { +- return c.ReplyMethodNotImplemented("io.projectatomic.podman.Commit") ++func (s *VarlinkInterface) ListImages(c VarlinkCall) error { ++ return c.ReplyMethodNotImplemented("io.projectatomic.podman.ListImages") + } + +-func (s *VarlinkInterface) GetInfo(c VarlinkCall) error { +- return c.ReplyMethodNotImplemented("io.projectatomic.podman.GetInfo") ++func (s *VarlinkInterface) DeleteUnusedImages(c VarlinkCall) error { ++ return c.ReplyMethodNotImplemented("io.projectatomic.podman.DeleteUnusedImages") + } + +-func (s *VarlinkInterface) GetContainer(c VarlinkCall, name_ string) error { +- return c.ReplyMethodNotImplemented("io.projectatomic.podman.GetContainer") ++func (s *VarlinkInterface) GetContainerStats(c VarlinkCall, name_ string) error { ++ return c.ReplyMethodNotImplemented("io.projectatomic.podman.GetContainerStats") + } + +-func (s *VarlinkInterface) CreateContainer(c VarlinkCall) error { +- return c.ReplyMethodNotImplemented("io.projectatomic.podman.CreateContainer") ++func (s *VarlinkInterface) UnpauseContainer(c VarlinkCall, name_ string) error { ++ return c.ReplyMethodNotImplemented("io.projectatomic.podman.UnpauseContainer") + } + +-func (s *VarlinkInterface) ListContainerProcesses(c VarlinkCall, name_ string, opts_ []string) error { +- return c.ReplyMethodNotImplemented("io.projectatomic.podman.ListContainerProcesses") ++func (s *VarlinkInterface) PullImage(c VarlinkCall, name_ string) error { ++ return c.ReplyMethodNotImplemented("io.projectatomic.podman.PullImage") + } + +-func (s *VarlinkInterface) AttachToContainer(c VarlinkCall) error { +- return c.ReplyMethodNotImplemented("io.projectatomic.podman.AttachToContainer") ++func (s *VarlinkInterface) Ping(c VarlinkCall) error { ++ return c.ReplyMethodNotImplemented("io.projectatomic.podman.Ping") + } + +-func (s *VarlinkInterface) WaitContainer(c VarlinkCall, name_ string) error { +- return c.ReplyMethodNotImplemented("io.projectatomic.podman.WaitContainer") ++func (s *VarlinkInterface) GetVersion(c VarlinkCall) error { ++ return c.ReplyMethodNotImplemented("io.projectatomic.podman.GetVersion") + } + +-func (s *VarlinkInterface) DeleteUnusedImages(c VarlinkCall) error { +- return c.ReplyMethodNotImplemented("io.projectatomic.podman.DeleteUnusedImages") ++func (s *VarlinkInterface) CreateContainer(c VarlinkCall) error { ++ return c.ReplyMethodNotImplemented("io.projectatomic.podman.CreateContainer") + } + +-func (s *VarlinkInterface) ListContainerChanges(c VarlinkCall, name_ string) error { +- return c.ReplyMethodNotImplemented("io.projectatomic.podman.ListContainerChanges") ++func (s *VarlinkInterface) KillContainer(c VarlinkCall, name_ string, signal_ int64) error { ++ return c.ReplyMethodNotImplemented("io.projectatomic.podman.KillContainer") + } + +-func (s *VarlinkInterface) ExportContainer(c VarlinkCall, name_ string, path_ string) error { +- return c.ReplyMethodNotImplemented("io.projectatomic.podman.ExportContainer") ++func (s *VarlinkInterface) RemoveContainer(c VarlinkCall, name_ string, force_ bool) error { ++ return c.ReplyMethodNotImplemented("io.projectatomic.podman.RemoveContainer") + } + +-func (s *VarlinkInterface) UpdateContainer(c VarlinkCall) error { +- return c.ReplyMethodNotImplemented("io.projectatomic.podman.UpdateContainer") ++func (s *VarlinkInterface) RemoveImage(c VarlinkCall, name_ string, force_ bool) error { ++ return c.ReplyMethodNotImplemented("io.projectatomic.podman.RemoveImage") + } + +-func (s *VarlinkInterface) UnpauseContainer(c VarlinkCall, name_ string) error { +- return c.ReplyMethodNotImplemented("io.projectatomic.podman.UnpauseContainer") ++func (s *VarlinkInterface) ImportImage(c VarlinkCall, source_ string, reference_ string, message_ string, changes_ []string) error { ++ return c.ReplyMethodNotImplemented("io.projectatomic.podman.ImportImage") + } + +-func (s *VarlinkInterface) ListImages(c VarlinkCall) error { +- return c.ReplyMethodNotImplemented("io.projectatomic.podman.ListImages") ++func (s *VarlinkInterface) ExportImage(c VarlinkCall, name_ string, destination_ string, compress_ bool) error { ++ return c.ReplyMethodNotImplemented("io.projectatomic.podman.ExportImage") + } + +-func (s *VarlinkInterface) TagImage(c VarlinkCall, name_ string, tagged_ string) error { +- return c.ReplyMethodNotImplemented("io.projectatomic.podman.TagImage") ++func (s *VarlinkInterface) InspectContainer(c VarlinkCall, name_ string) error { ++ return c.ReplyMethodNotImplemented("io.projectatomic.podman.InspectContainer") + } + +-func (s *VarlinkInterface) GetContainerStats(c VarlinkCall, name_ string) error { +- return c.ReplyMethodNotImplemented("io.projectatomic.podman.GetContainerStats") ++func (s *VarlinkInterface) GetContainerLogs(c VarlinkCall, name_ string) error { ++ return c.ReplyMethodNotImplemented("io.projectatomic.podman.GetContainerLogs") + } + +-func (s *VarlinkInterface) StopContainer(c VarlinkCall, name_ string, timeout_ int64) error { +- return c.ReplyMethodNotImplemented("io.projectatomic.podman.StopContainer") ++func (s *VarlinkInterface) ListContainerChanges(c VarlinkCall, name_ string) error { ++ return c.ReplyMethodNotImplemented("io.projectatomic.podman.ListContainerChanges") + } + + func (s *VarlinkInterface) RestartContainer(c VarlinkCall, name_ string, timeout_ int64) error { + return c.ReplyMethodNotImplemented("io.projectatomic.podman.RestartContainer") + } + +-func (s *VarlinkInterface) ImportImage(c VarlinkCall, source_ string, reference_ string, message_ string, changes_ []string) error { +- return c.ReplyMethodNotImplemented("io.projectatomic.podman.ImportImage") ++func (s *VarlinkInterface) RenameContainer(c VarlinkCall) error { ++ return c.ReplyMethodNotImplemented("io.projectatomic.podman.RenameContainer") ++} ++ ++func (s *VarlinkInterface) PauseContainer(c VarlinkCall, name_ string) error { ++ return c.ReplyMethodNotImplemented("io.projectatomic.podman.PauseContainer") + } + +-func (s *VarlinkInterface) ListContainers(c VarlinkCall) error { +- return c.ReplyMethodNotImplemented("io.projectatomic.podman.ListContainers") ++func (s *VarlinkInterface) PushImage(c VarlinkCall, name_ string, tag_ string, tlsverify_ bool) error { ++ return c.ReplyMethodNotImplemented("io.projectatomic.podman.PushImage") + } + +-func (s *VarlinkInterface) StartContainer(c VarlinkCall) error { +- return c.ReplyMethodNotImplemented("io.projectatomic.podman.StartContainer") ++func (s *VarlinkInterface) ListContainerProcesses(c VarlinkCall, name_ string, opts_ []string) error { ++ return c.ReplyMethodNotImplemented("io.projectatomic.podman.ListContainerProcesses") + } + +-func (s *VarlinkInterface) RemoveContainer(c VarlinkCall, name_ string, force_ bool) error { +- return c.ReplyMethodNotImplemented("io.projectatomic.podman.RemoveContainer") ++func (s *VarlinkInterface) WaitContainer(c VarlinkCall, name_ string) error { ++ return c.ReplyMethodNotImplemented("io.projectatomic.podman.WaitContainer") + } + + func (s *VarlinkInterface) DeleteStoppedContainers(c VarlinkCall) error { + return c.ReplyMethodNotImplemented("io.projectatomic.podman.DeleteStoppedContainers") + } + +-func (s *VarlinkInterface) InspectContainer(c VarlinkCall, name_ string) error { +- return c.ReplyMethodNotImplemented("io.projectatomic.podman.InspectContainer") +-} +- +-func (s *VarlinkInterface) RenameContainer(c VarlinkCall) error { +- return c.ReplyMethodNotImplemented("io.projectatomic.podman.RenameContainer") ++func (s *VarlinkInterface) TagImage(c VarlinkCall, name_ string, tagged_ string) error { ++ return c.ReplyMethodNotImplemented("io.projectatomic.podman.TagImage") + } + +-func (s *VarlinkInterface) BuildImage(c VarlinkCall) error { +- return c.ReplyMethodNotImplemented("io.projectatomic.podman.BuildImage") ++func (s *VarlinkInterface) SearchImage(c VarlinkCall, name_ string, limit_ int64) error { ++ return c.ReplyMethodNotImplemented("io.projectatomic.podman.SearchImage") + } + + // Method call dispatcher + func (s *VarlinkInterface) VarlinkDispatch(call varlink.Call, methodname string) error { + switch methodname { +- case "GetContainerStats": ++ case "GetVersion": ++ return s.ioprojectatomicpodmanInterface.GetVersion(VarlinkCall{call}) ++ ++ case "CreateContainer": ++ return s.ioprojectatomicpodmanInterface.CreateContainer(VarlinkCall{call}) ++ ++ case "KillContainer": + var in struct { +- Name string `json:"name"` ++ Name string `json:"name"` ++ Signal int64 `json:"signal"` + } + err := call.GetParameters(&in) + if err != nil { + return call.ReplyInvalidParameter("parameters") + } +- return s.ioprojectatomicpodmanInterface.GetContainerStats(VarlinkCall{call}, in.Name) ++ return s.ioprojectatomicpodmanInterface.KillContainer(VarlinkCall{call}, in.Name, in.Signal) + +- case "StopContainer": ++ case "RemoveContainer": + var in struct { +- Name string `json:"name"` +- Timeout int64 `json:"timeout"` ++ Name string `json:"name"` ++ Force bool `json:"force"` + } + err := call.GetParameters(&in) + if err != nil { + return call.ReplyInvalidParameter("parameters") + } +- return s.ioprojectatomicpodmanInterface.StopContainer(VarlinkCall{call}, in.Name, in.Timeout) ++ return s.ioprojectatomicpodmanInterface.RemoveContainer(VarlinkCall{call}, in.Name, in.Force) + +- case "RestartContainer": ++ case "RemoveImage": + var in struct { +- Name string `json:"name"` +- Timeout int64 `json:"timeout"` ++ Name string `json:"name"` ++ Force bool `json:"force"` + } + err := call.GetParameters(&in) + if err != nil { + return call.ReplyInvalidParameter("parameters") + } +- return s.ioprojectatomicpodmanInterface.RestartContainer(VarlinkCall{call}, in.Name, in.Timeout) ++ return s.ioprojectatomicpodmanInterface.RemoveImage(VarlinkCall{call}, in.Name, in.Force) + + case "ImportImage": + var in struct { +@@ -2105,27 +2112,22 @@ func (s *VarlinkInterface) VarlinkDispatch(call varlink.Call, methodname string) + } + return s.ioprojectatomicpodmanInterface.ImportImage(VarlinkCall{call}, in.Source, in.Reference, in.Message, []string(in.Changes)) + +- case "ListContainers": +- return s.ioprojectatomicpodmanInterface.ListContainers(VarlinkCall{call}) +- +- case "StartContainer": +- return s.ioprojectatomicpodmanInterface.StartContainer(VarlinkCall{call}) +- +- case "RemoveContainer": ++ case "ExportImage": + var in struct { +- Name string `json:"name"` +- Force bool `json:"force"` ++ Name string `json:"name"` ++ Destination string `json:"destination"` ++ Compress bool `json:"compress"` + } + err := call.GetParameters(&in) + if err != nil { + return call.ReplyInvalidParameter("parameters") + } +- return s.ioprojectatomicpodmanInterface.RemoveContainer(VarlinkCall{call}, in.Name, in.Force) ++ return s.ioprojectatomicpodmanInterface.ExportImage(VarlinkCall{call}, in.Name, in.Destination, in.Compress) + +- case "DeleteStoppedContainers": +- return s.ioprojectatomicpodmanInterface.DeleteStoppedContainers(VarlinkCall{call}) ++ case "Ping": ++ return s.ioprojectatomicpodmanInterface.Ping(VarlinkCall{call}) + +- case "InspectContainer": ++ case "GetContainerLogs": + var in struct { + Name string `json:"name"` + } +@@ -2133,15 +2135,9 @@ func (s *VarlinkInterface) VarlinkDispatch(call varlink.Call, methodname string) + if err != nil { + return call.ReplyInvalidParameter("parameters") + } +- return s.ioprojectatomicpodmanInterface.InspectContainer(VarlinkCall{call}, in.Name) +- +- case "RenameContainer": +- return s.ioprojectatomicpodmanInterface.RenameContainer(VarlinkCall{call}) +- +- case "BuildImage": +- return s.ioprojectatomicpodmanInterface.BuildImage(VarlinkCall{call}) ++ return s.ioprojectatomicpodmanInterface.GetContainerLogs(VarlinkCall{call}, in.Name) + +- case "PullImage": ++ case "ListContainerChanges": + var in struct { + Name string `json:"name"` + } +@@ -2149,10 +2145,21 @@ func (s *VarlinkInterface) VarlinkDispatch(call varlink.Call, methodname string) + if err != nil { + return call.ReplyInvalidParameter("parameters") + } +- return s.ioprojectatomicpodmanInterface.PullImage(VarlinkCall{call}, in.Name) ++ return s.ioprojectatomicpodmanInterface.ListContainerChanges(VarlinkCall{call}, in.Name) + +- case "Ping": +- return s.ioprojectatomicpodmanInterface.Ping(VarlinkCall{call}) ++ case "RestartContainer": ++ var in struct { ++ Name string `json:"name"` ++ Timeout int64 `json:"timeout"` ++ } ++ err := call.GetParameters(&in) ++ if err != nil { ++ return call.ReplyInvalidParameter("parameters") ++ } ++ return s.ioprojectatomicpodmanInterface.RestartContainer(VarlinkCall{call}, in.Name, in.Timeout) ++ ++ case "RenameContainer": ++ return s.ioprojectatomicpodmanInterface.RenameContainer(VarlinkCall{call}) + + case "PauseContainer": + var in struct { +@@ -2176,19 +2183,17 @@ func (s *VarlinkInterface) VarlinkDispatch(call varlink.Call, methodname string) + } + return s.ioprojectatomicpodmanInterface.PushImage(VarlinkCall{call}, in.Name, in.Tag, in.Tlsverify) + +- case "ExportImage": ++ case "InspectContainer": + var in struct { +- Name string `json:"name"` +- Destination string `json:"destination"` +- Compress bool `json:"compress"` ++ Name string `json:"name"` + } + err := call.GetParameters(&in) + if err != nil { + return call.ReplyInvalidParameter("parameters") + } +- return s.ioprojectatomicpodmanInterface.ExportImage(VarlinkCall{call}, in.Name, in.Destination, in.Compress) ++ return s.ioprojectatomicpodmanInterface.InspectContainer(VarlinkCall{call}, in.Name) + +- case "InspectImage": ++ case "WaitContainer": + var in struct { + Name string `json:"name"` + } +@@ -2196,40 +2201,45 @@ func (s *VarlinkInterface) VarlinkDispatch(call varlink.Call, methodname string) + if err != nil { + return call.ReplyInvalidParameter("parameters") + } +- return s.ioprojectatomicpodmanInterface.InspectImage(VarlinkCall{call}, in.Name) ++ return s.ioprojectatomicpodmanInterface.WaitContainer(VarlinkCall{call}, in.Name) + +- case "RemoveImage": ++ case "DeleteStoppedContainers": ++ return s.ioprojectatomicpodmanInterface.DeleteStoppedContainers(VarlinkCall{call}) ++ ++ case "TagImage": + var in struct { +- Name string `json:"name"` +- Force bool `json:"force"` ++ Name string `json:"name"` ++ Tagged string `json:"tagged"` + } + err := call.GetParameters(&in) + if err != nil { + return call.ReplyInvalidParameter("parameters") + } +- return s.ioprojectatomicpodmanInterface.RemoveImage(VarlinkCall{call}, in.Name, in.Force) +- +- case "GetVersion": +- return s.ioprojectatomicpodmanInterface.GetVersion(VarlinkCall{call}) +- +- case "ResizeContainerTty": +- return s.ioprojectatomicpodmanInterface.ResizeContainerTty(VarlinkCall{call}) ++ return s.ioprojectatomicpodmanInterface.TagImage(VarlinkCall{call}, in.Name, in.Tagged) + +- case "KillContainer": ++ case "ListContainerProcesses": + var in struct { +- Name string `json:"name"` +- Signal int64 `json:"signal"` ++ Name string `json:"name"` ++ Opts []string `json:"opts"` + } + err := call.GetParameters(&in) + if err != nil { + return call.ReplyInvalidParameter("parameters") + } +- return s.ioprojectatomicpodmanInterface.KillContainer(VarlinkCall{call}, in.Name, in.Signal) ++ return s.ioprojectatomicpodmanInterface.ListContainerProcesses(VarlinkCall{call}, in.Name, []string(in.Opts)) + +- case "CreateImage": +- return s.ioprojectatomicpodmanInterface.CreateImage(VarlinkCall{call}) ++ case "SearchImage": ++ var in struct { ++ Name string `json:"name"` ++ Limit int64 `json:"limit"` ++ } ++ err := call.GetParameters(&in) ++ if err != nil { ++ return call.ReplyInvalidParameter("parameters") ++ } ++ return s.ioprojectatomicpodmanInterface.SearchImage(VarlinkCall{call}, in.Name, in.Limit) + +- case "GetContainerLogs": ++ case "InspectImage": + var in struct { + Name string `json:"name"` + } +@@ -2237,28 +2247,49 @@ func (s *VarlinkInterface) VarlinkDispatch(call varlink.Call, methodname string) + if err != nil { + return call.ReplyInvalidParameter("parameters") + } +- return s.ioprojectatomicpodmanInterface.GetContainerLogs(VarlinkCall{call}, in.Name) ++ return s.ioprojectatomicpodmanInterface.InspectImage(VarlinkCall{call}, in.Name) + +- case "HistoryImage": ++ case "UpdateContainer": ++ return s.ioprojectatomicpodmanInterface.UpdateContainer(VarlinkCall{call}) ++ ++ case "ResizeContainerTty": ++ return s.ioprojectatomicpodmanInterface.ResizeContainerTty(VarlinkCall{call}) ++ ++ case "StartContainer": ++ return s.ioprojectatomicpodmanInterface.StartContainer(VarlinkCall{call}) ++ ++ case "StopContainer": + var in struct { +- Name string `json:"name"` ++ Name string `json:"name"` ++ Timeout int64 `json:"timeout"` + } + err := call.GetParameters(&in) + if err != nil { + return call.ReplyInvalidParameter("parameters") + } +- return s.ioprojectatomicpodmanInterface.HistoryImage(VarlinkCall{call}, in.Name) ++ return s.ioprojectatomicpodmanInterface.StopContainer(VarlinkCall{call}, in.Name, in.Timeout) + +- case "SearchImage": ++ case "AttachToContainer": ++ return s.ioprojectatomicpodmanInterface.AttachToContainer(VarlinkCall{call}) ++ ++ case "BuildImage": ++ return s.ioprojectatomicpodmanInterface.BuildImage(VarlinkCall{call}) ++ ++ case "CreateImage": ++ return s.ioprojectatomicpodmanInterface.CreateImage(VarlinkCall{call}) ++ ++ case "HistoryImage": + var in struct { +- Name string `json:"name"` +- Limit int64 `json:"limit"` ++ Name string `json:"name"` + } + err := call.GetParameters(&in) + if err != nil { + return call.ReplyInvalidParameter("parameters") + } +- return s.ioprojectatomicpodmanInterface.SearchImage(VarlinkCall{call}, in.Name, in.Limit) ++ return s.ioprojectatomicpodmanInterface.HistoryImage(VarlinkCall{call}, in.Name) ++ ++ case "GetInfo": ++ return s.ioprojectatomicpodmanInterface.GetInfo(VarlinkCall{call}) + + case "Commit": + var in struct { +@@ -2275,25 +2306,6 @@ func (s *VarlinkInterface) VarlinkDispatch(call varlink.Call, methodname string) + } + return s.ioprojectatomicpodmanInterface.Commit(VarlinkCall{call}, in.Name, in.Image_name, []string(in.Changes), in.Author, in.Message, in.Pause) + +- case "AttachToContainer": +- return s.ioprojectatomicpodmanInterface.AttachToContainer(VarlinkCall{call}) +- +- case "WaitContainer": +- var in struct { +- Name string `json:"name"` +- } +- err := call.GetParameters(&in) +- if err != nil { +- return call.ReplyInvalidParameter("parameters") +- } +- return s.ioprojectatomicpodmanInterface.WaitContainer(VarlinkCall{call}, in.Name) +- +- case "DeleteUnusedImages": +- return s.ioprojectatomicpodmanInterface.DeleteUnusedImages(VarlinkCall{call}) +- +- case "GetInfo": +- return s.ioprojectatomicpodmanInterface.GetInfo(VarlinkCall{call}) +- + case "GetContainer": + var in struct { + Name string `json:"name"` +@@ -2304,35 +2316,27 @@ func (s *VarlinkInterface) VarlinkDispatch(call varlink.Call, methodname string) + } + return s.ioprojectatomicpodmanInterface.GetContainer(VarlinkCall{call}, in.Name) + +- case "CreateContainer": +- return s.ioprojectatomicpodmanInterface.CreateContainer(VarlinkCall{call}) +- +- case "ListContainerProcesses": ++ case "ExportContainer": + var in struct { +- Name string `json:"name"` +- Opts []string `json:"opts"` ++ Name string `json:"name"` ++ Path string `json:"path"` + } + err := call.GetParameters(&in) + if err != nil { + return call.ReplyInvalidParameter("parameters") + } +- return s.ioprojectatomicpodmanInterface.ListContainerProcesses(VarlinkCall{call}, in.Name, []string(in.Opts)) ++ return s.ioprojectatomicpodmanInterface.ExportContainer(VarlinkCall{call}, in.Name, in.Path) + + case "ListImages": + return s.ioprojectatomicpodmanInterface.ListImages(VarlinkCall{call}) + +- case "TagImage": +- var in struct { +- Name string `json:"name"` +- Tagged string `json:"tagged"` +- } +- err := call.GetParameters(&in) +- if err != nil { +- return call.ReplyInvalidParameter("parameters") +- } +- return s.ioprojectatomicpodmanInterface.TagImage(VarlinkCall{call}, in.Name, in.Tagged) ++ case "DeleteUnusedImages": ++ return s.ioprojectatomicpodmanInterface.DeleteUnusedImages(VarlinkCall{call}) + +- case "ListContainerChanges": ++ case "ListContainers": ++ return s.ioprojectatomicpodmanInterface.ListContainers(VarlinkCall{call}) ++ ++ case "UnpauseContainer": + var in struct { + Name string `json:"name"` + } +@@ -2340,23 +2344,19 @@ func (s *VarlinkInterface) VarlinkDispatch(call varlink.Call, methodname string) + if err != nil { + return call.ReplyInvalidParameter("parameters") + } +- return s.ioprojectatomicpodmanInterface.ListContainerChanges(VarlinkCall{call}, in.Name) ++ return s.ioprojectatomicpodmanInterface.UnpauseContainer(VarlinkCall{call}, in.Name) + +- case "ExportContainer": ++ case "PullImage": + var in struct { + Name string `json:"name"` +- Path string `json:"path"` + } + err := call.GetParameters(&in) + if err != nil { + return call.ReplyInvalidParameter("parameters") + } +- return s.ioprojectatomicpodmanInterface.ExportContainer(VarlinkCall{call}, in.Name, in.Path) +- +- case "UpdateContainer": +- return s.ioprojectatomicpodmanInterface.UpdateContainer(VarlinkCall{call}) ++ return s.ioprojectatomicpodmanInterface.PullImage(VarlinkCall{call}, in.Name) + +- case "UnpauseContainer": ++ case "GetContainerStats": + var in struct { + Name string `json:"name"` + } +@@ -2364,7 +2364,7 @@ func (s *VarlinkInterface) VarlinkDispatch(call varlink.Call, methodname string) + if err != nil { + return call.ReplyInvalidParameter("parameters") + } +- return s.ioprojectatomicpodmanInterface.UnpauseContainer(VarlinkCall{call}, in.Name) ++ return s.ioprojectatomicpodmanInterface.GetContainerStats(VarlinkCall{call}, in.Name) + + default: + return call.ReplyMethodNotFound(methodname) +@@ -2556,7 +2556,7 @@ type PodmanInfo ( + # Ping provides a response for developers to ensure their varlink setup is working. + # #### Example + # ~~~ +-# $ varlink call -m unix:/run/io.projectatomic.podman/io.projectatomic.podman.Ping ++# $ varlink call -m unix:/run/podman/io.projectatomic.podman/io.projectatomic.podman.Ping + # { + # "ping": { + # "message": "OK" +@@ -2596,7 +2596,7 @@ method InspectContainer(name: string) -> (container: string) + # error will be returned. + # #### Example + # ~~~ +-# $ varlink call -m unix:/run/io.projectatomic.podman/io.projectatomic.podman.ListContainerProcesses '{"name": "135d71b9495f", "opts": []}' ++# $ varlink call -m unix:/run/podman/io.projectatomic.podman/io.projectatomic.podman.ListContainerProcesses '{"name": "135d71b9495f", "opts": []}' + # { + # "container": [ + # " UID PID PPID C STIME TTY TIME CMD", +@@ -2630,7 +2630,7 @@ method ExportContainer(name: string, path: string) -> (tarfile: string) + # [ContainerNotFound](#ContainerNotFound) error will be returned. + # #### Example + # ~~~ +-# $ varlink call -m unix:/run/io.projectatomic.podman/io.projectatomic.podman.GetContainerStats '{"name": "c33e4164f384"}' ++# $ varlink call -m unix:/run/podman/io.projectatomic.podman/io.projectatomic.podman.GetContainerStats '{"name": "c33e4164f384"}' + # { + # "container": { + # "block_input": 0, +@@ -2663,7 +2663,7 @@ method StartContainer() -> (notimplemented: NotImplemented) + # error will be returned instead. See also [KillContainer](KillContainer). + # #### Error + # ~~~ +-# $ varlink call -m unix:/run/io.projectatomic.podman/io.projectatomic.podman.StopContainer '{"name": "135d71b9495f", "timeout": 5}' ++# $ varlink call -m unix:/run/podman/io.projectatomic.podman/io.projectatomic.podman.StopContainer '{"name": "135d71b9495f", "timeout": 5}' + # { + # "container": "135d71b9495f7c3967f536edad57750bfdb569336cd107d8aabab45565ffcfb6" + # } +@@ -2710,7 +2710,7 @@ method WaitContainer(name: string) -> (exitcode: int) + # container cannot be found by name or ID, an [ContainerNotFound](#ContainerNotFound) error will be returned. + # #### Error + # ~~~ +-# $ varlink call -m unix:/run/io.projectatomic.podman/io.projectatomic.podman.RemoveContainer '{"name": "62f4fd98cb57"}' ++# $ varlink call -m unix:/run/podman/io.projectatomic.podman/io.projectatomic.podman.RemoveContainer '{"name": "62f4fd98cb57"}' + # { + # "container": "62f4fd98cb57f529831e8f90610e54bba74bd6f02920ffb485e15376ed365c20" + # } +@@ -2755,7 +2755,7 @@ method TagImage(name: string, tagged: string) -> (image: string) + # ID of the removed image is returned when complete. See also [DeleteUnusedImages](DeleteUnusedImages). + # #### Example + # ~~~ +-# varlink call -m unix:/run/io.projectatomic.podman/io.projectatomic.podman.RemoveImage '{"name": "registry.fedoraproject.org/fedora", "force": true}' ++# varlink call -m unix:/run/podman/io.projectatomic.podman/io.projectatomic.podman.RemoveImage '{"name": "registry.fedoraproject.org/fedora", "force": true}' + # { + # "image": "426866d6fa419873f97e5cbd320eeb22778244c1dfffa01c944db3114f55772e" + # } +@@ -2793,7 +2793,7 @@ method ExportImage(name: string, destination: string, compress: bool) -> (image: + # is returned. + # #### Example + # ~~~ +-# $ varlink call -m unix:/run/io.projectatomic.podman/io.projectatomic.podman.PullImage '{"name": "registry.fedoraproject.org/fedora"}' ++# $ varlink call -m unix:/run/podman/io.projectatomic.podman/io.projectatomic.podman.PullImage '{"name": "registry.fedoraproject.org/fedora"}' + # { + # "id": "426866d6fa419873f97e5cbd320eeb22778244c1dfffa01c944db3114f55772e" + # } +diff --git a/docs/podman-varlink.1.md b/docs/podman-varlink.1.md +index 68a0f08..9d4e094 100644 +--- a/docs/podman-varlink.1.md ++++ b/docs/podman-varlink.1.md +@@ -25,7 +25,7 @@ More will go here as the docs and api firm up. + + ## EXAMPLES + +- podman varlink unix:/run/io.projectatomic.podman ++ podman varlink unix:/run/podman/io.projectatomic.podman + - -+## CONFIGURATION -+ -+Users of the podman varlink service should enable the io.projectatomic.podman.socket and io.projectatomic.podman.service. -+ -+You can do this via systemctl -+ -+systemctl enable --now io.projectatomic.podman.socket -+ - ## SEE ALSO --podman(1) -+podman(1), systemctl(1) - - ## HISTORY - April 2018, Originally compiled by Brent Baude --- -2.14.3 - diff --git a/0001-finish-changing-the-path-for-varlink.patch b/0001-finish-changing-the-path-for-varlink.patch deleted file mode 100644 index 107ada3..0000000 --- a/0001-finish-changing-the-path-for-varlink.patch +++ /dev/null @@ -1,3263 +0,0 @@ -From 3f6a739ede65196a0098acba520cd30b9b036126 Mon Sep 17 00:00:00 2001 -From: baude -Date: Sat, 19 May 2018 10:00:52 -0500 -Subject: [PATCH] finish changing the path for varlink - -cleanup the last references to /run/io.projectatomic... and make sure -/run/podman/projectatomic... is used. - -Signed-off-by: baude ---- - API.md | 14 +- - cmd/podman/varlink/io.projectatomic.podman.varlink | 14 +- - cmd/podman/varlink/ioprojectatomicpodman.go | 1780 ++++++++++---------- - docs/podman-varlink.1.md | 2 +- - 4 files changed, 905 insertions(+), 905 deletions(-) - -diff --git a/API.md b/API.md -index af48c10..ba569d5 100755 ---- a/API.md -+++ b/API.md -@@ -206,7 +206,7 @@ contains attributes like memory and cpu usage. If the container cannot be found - [ContainerNotFound](#ContainerNotFound) error will be returned. - #### Example - ~~~ --$ varlink call -m unix:/run/io.projectatomic.podman/io.projectatomic.podman.GetContainerStats '{"name": "c33e4164f384"}' -+$ varlink call -m unix:/run/podman/io.projectatomic.podman/io.projectatomic.podman.GetContainerStats '{"name": "c33e4164f384"}' - { - "container": { - "block_input": 0, -@@ -288,7 +288,7 @@ arguements that represent ps options. If the container cannot be found, a [Cont - error will be returned. - #### Example - ~~~ --$ varlink call -m unix:/run/io.projectatomic.podman/io.projectatomic.podman.ListContainerProcesses '{"name": "135d71b9495f", "opts": []}' -+$ varlink call -m unix:/run/podman/io.projectatomic.podman/io.projectatomic.podman.ListContainerProcesses '{"name": "135d71b9495f", "opts": []}' - { - "container": [ - " UID PID PPID C STIME TTY TIME CMD", -@@ -324,7 +324,7 @@ method Ping() [StringResponse](#StringResponse) - Ping provides a response for developers to ensure their varlink setup is working. - #### Example - ~~~ --$ varlink call -m unix:/run/io.projectatomic.podman/io.projectatomic.podman.Ping -+$ varlink call -m unix:/run/podman/io.projectatomic.podman/io.projectatomic.podman.Ping - { - "ping": { - "message": "OK" -@@ -339,7 +339,7 @@ PullImage pulls an image from a repository to local storage. After the pull is - is returned. - #### Example - ~~~ --$ varlink call -m unix:/run/io.projectatomic.podman/io.projectatomic.podman.PullImage '{"name": "registry.fedoraproject.org/fedora"}' -+$ varlink call -m unix:/run/podman/io.projectatomic.podman/io.projectatomic.podman.PullImage '{"name": "registry.fedoraproject.org/fedora"}' - { - "id": "426866d6fa419873f97e5cbd320eeb22778244c1dfffa01c944db3114f55772e" - } -@@ -360,7 +360,7 @@ container can be stopped and removed. Upon sucessful removal of the container, - container cannot be found by name or ID, an [ContainerNotFound](#ContainerNotFound) error will be returned. - #### Error - ~~~ --$ varlink call -m unix:/run/io.projectatomic.podman/io.projectatomic.podman.RemoveContainer '{"name": "62f4fd98cb57"}' -+$ varlink call -m unix:/run/podman/io.projectatomic.podman/io.projectatomic.podman.RemoveContainer '{"name": "62f4fd98cb57"}' - { - "container": "62f4fd98cb57f529831e8f90610e54bba74bd6f02920ffb485e15376ed365c20" - } -@@ -374,7 +374,7 @@ should be deleted. If the image cannot be found, an [ImageNotFound](#ImageNotFo - ID of the removed image is returned when complete. See also [DeleteUnusedImages](DeleteUnusedImages). - #### Example - ~~~ --varlink call -m unix:/run/io.projectatomic.podman/io.projectatomic.podman.RemoveImage '{"name": "registry.fedoraproject.org/fedora", "force": true}' -+varlink call -m unix:/run/podman/io.projectatomic.podman/io.projectatomic.podman.RemoveImage '{"name": "registry.fedoraproject.org/fedora", "force": true}' - { - "image": "426866d6fa419873f97e5cbd320eeb22778244c1dfffa01c944db3114f55772e" - } -@@ -419,7 +419,7 @@ returns the container ID once stopped. If the container cannot be found, a [Cont - error will be returned instead. See also [KillContainer](KillContainer). - #### Error - ~~~ --$ varlink call -m unix:/run/io.projectatomic.podman/io.projectatomic.podman.StopContainer '{"name": "135d71b9495f", "timeout": 5}' -+$ varlink call -m unix:/run/podman/io.projectatomic.podman/io.projectatomic.podman.StopContainer '{"name": "135d71b9495f", "timeout": 5}' - { - "container": "135d71b9495f7c3967f536edad57750bfdb569336cd107d8aabab45565ffcfb6" - } -diff --git a/cmd/podman/varlink/io.projectatomic.podman.varlink b/cmd/podman/varlink/io.projectatomic.podman.varlink -index 3de9ecd..70879b4 100644 ---- a/cmd/podman/varlink/io.projectatomic.podman.varlink -+++ b/cmd/podman/varlink/io.projectatomic.podman.varlink -@@ -176,7 +176,7 @@ type PodmanInfo ( - # Ping provides a response for developers to ensure their varlink setup is working. - # #### Example - # ~~~ --# $ varlink call -m unix:/run/io.projectatomic.podman/io.projectatomic.podman.Ping -+# $ varlink call -m unix:/run/podman/io.projectatomic.podman/io.projectatomic.podman.Ping - # { - # "ping": { - # "message": "OK" -@@ -216,7 +216,7 @@ method InspectContainer(name: string) -> (container: string) - # error will be returned. - # #### Example - # ~~~ --# $ varlink call -m unix:/run/io.projectatomic.podman/io.projectatomic.podman.ListContainerProcesses '{"name": "135d71b9495f", "opts": []}' -+# $ varlink call -m unix:/run/podman/io.projectatomic.podman/io.projectatomic.podman.ListContainerProcesses '{"name": "135d71b9495f", "opts": []}' - # { - # "container": [ - # " UID PID PPID C STIME TTY TIME CMD", -@@ -250,7 +250,7 @@ method ExportContainer(name: string, path: string) -> (tarfile: string) - # [ContainerNotFound](#ContainerNotFound) error will be returned. - # #### Example - # ~~~ --# $ varlink call -m unix:/run/io.projectatomic.podman/io.projectatomic.podman.GetContainerStats '{"name": "c33e4164f384"}' -+# $ varlink call -m unix:/run/podman/io.projectatomic.podman/io.projectatomic.podman.GetContainerStats '{"name": "c33e4164f384"}' - # { - # "container": { - # "block_input": 0, -@@ -283,7 +283,7 @@ method StartContainer() -> (notimplemented: NotImplemented) - # error will be returned instead. See also [KillContainer](KillContainer). - # #### Error - # ~~~ --# $ varlink call -m unix:/run/io.projectatomic.podman/io.projectatomic.podman.StopContainer '{"name": "135d71b9495f", "timeout": 5}' -+# $ varlink call -m unix:/run/podman/io.projectatomic.podman/io.projectatomic.podman.StopContainer '{"name": "135d71b9495f", "timeout": 5}' - # { - # "container": "135d71b9495f7c3967f536edad57750bfdb569336cd107d8aabab45565ffcfb6" - # } -@@ -330,7 +330,7 @@ method WaitContainer(name: string) -> (exitcode: int) - # container cannot be found by name or ID, an [ContainerNotFound](#ContainerNotFound) error will be returned. - # #### Error - # ~~~ --# $ varlink call -m unix:/run/io.projectatomic.podman/io.projectatomic.podman.RemoveContainer '{"name": "62f4fd98cb57"}' -+# $ varlink call -m unix:/run/podman/io.projectatomic.podman/io.projectatomic.podman.RemoveContainer '{"name": "62f4fd98cb57"}' - # { - # "container": "62f4fd98cb57f529831e8f90610e54bba74bd6f02920ffb485e15376ed365c20" - # } -@@ -375,7 +375,7 @@ method TagImage(name: string, tagged: string) -> (image: string) - # ID of the removed image is returned when complete. See also [DeleteUnusedImages](DeleteUnusedImages). - # #### Example - # ~~~ --# varlink call -m unix:/run/io.projectatomic.podman/io.projectatomic.podman.RemoveImage '{"name": "registry.fedoraproject.org/fedora", "force": true}' -+# varlink call -m unix:/run/podman/io.projectatomic.podman/io.projectatomic.podman.RemoveImage '{"name": "registry.fedoraproject.org/fedora", "force": true}' - # { - # "image": "426866d6fa419873f97e5cbd320eeb22778244c1dfffa01c944db3114f55772e" - # } -@@ -413,7 +413,7 @@ method ExportImage(name: string, destination: string, compress: bool) -> (image: - # is returned. - # #### Example - # ~~~ --# $ varlink call -m unix:/run/io.projectatomic.podman/io.projectatomic.podman.PullImage '{"name": "registry.fedoraproject.org/fedora"}' -+# $ varlink call -m unix:/run/podman/io.projectatomic.podman/io.projectatomic.podman.PullImage '{"name": "registry.fedoraproject.org/fedora"}' - # { - # "id": "426866d6fa419873f97e5cbd320eeb22778244c1dfffa01c944db3114f55772e" - # } -diff --git a/cmd/podman/varlink/ioprojectatomicpodman.go b/cmd/podman/varlink/ioprojectatomicpodman.go -index 1748195..51812f1 100644 ---- a/cmd/podman/varlink/ioprojectatomicpodman.go -+++ b/cmd/podman/varlink/ioprojectatomicpodman.go -@@ -4,6 +4,82 @@ package ioprojectatomicpodman - import "github.com/varlink/go/varlink" - - // Type declarations -+type ContainerMount struct { -+ Destination string `json:"destination"` -+ Type string `json:"type"` -+ Source string `json:"source"` -+ Options []string `json:"options"` -+} -+ -+type InfoStore struct { -+ Containers int64 `json:"containers"` -+ Images int64 `json:"images"` -+ Graph_driver_name string `json:"graph_driver_name"` -+ Graph_driver_options string `json:"graph_driver_options"` -+ Graph_root string `json:"graph_root"` -+ Graph_status InfoGraphStatus `json:"graph_status"` -+ Run_root string `json:"run_root"` -+} -+ -+type PodmanInfo struct { -+ Host InfoHost `json:"host"` -+ Registries []string `json:"registries"` -+ Insecure_registries []string `json:"insecure_registries"` -+ Store InfoStore `json:"store"` -+ Podman InfoPodmanBinary `json:"podman"` -+} -+ -+type Version struct { -+ Version string `json:"version"` -+ Go_version string `json:"go_version"` -+ Git_commit string `json:"git_commit"` -+ Built int64 `json:"built"` -+ Os_arch string `json:"os_arch"` -+} -+ -+type StringResponse struct { -+ Message string `json:"message"` -+} -+ -+type ContainerChanges struct { -+ Changed []string `json:"changed"` -+ Added []string `json:"added"` -+ Deleted []string `json:"deleted"` -+} -+ -+type ListContainerData struct { -+ Id string `json:"id"` -+ Image string `json:"image"` -+ Imageid string `json:"imageid"` -+ Command []string `json:"command"` -+ Createdat string `json:"createdat"` -+ Runningfor string `json:"runningfor"` -+ Status string `json:"status"` -+ Ports []ContainerPortMappings `json:"ports"` -+ Rootfssize int64 `json:"rootfssize"` -+ Rwsize int64 `json:"rwsize"` -+ Names string `json:"names"` -+ Labels map[string]string `json:"labels"` -+ Mounts []ContainerMount `json:"mounts"` -+ Containerrunning bool `json:"containerrunning"` -+ Namespaces ContainerNameSpace `json:"namespaces"` -+} -+ -+type InfoPodmanBinary struct { -+ Compiler string `json:"compiler"` -+ Go_version string `json:"go_version"` -+ Podman_version string `json:"podman_version"` -+ Git_commit string `json:"git_commit"` -+} -+ -+type ImageSearch struct { -+ Description string `json:"description"` -+ Is_official bool `json:"is_official"` -+ Is_automated bool `json:"is_automated"` -+ Name string `json:"name"` -+ Star_count int64 `json:"star_count"` -+} -+ - type ContainerStats struct { - Id string `json:"id"` - Name string `json:"name"` -@@ -20,22 +96,42 @@ type ContainerStats struct { - Pids int64 `json:"pids"` - } - -+type ContainerPortMappings struct { -+ Host_port string `json:"host_port"` -+ Host_ip string `json:"host_ip"` -+ Protocol string `json:"protocol"` -+ Container_port string `json:"container_port"` -+} -+ - type InfoGraphStatus struct { - Backing_filesystem string `json:"backing_filesystem"` - Native_overlay_diff string `json:"native_overlay_diff"` - Supports_d_type string `json:"supports_d_type"` - } - --type PodmanInfo struct { -- Host InfoHost `json:"host"` -- Registries []string `json:"registries"` -- Insecure_registries []string `json:"insecure_registries"` -- Store InfoStore `json:"store"` -- Podman InfoPodmanBinary `json:"podman"` -+type NotImplemented struct { -+ Comment string `json:"comment"` - } - --type StringResponse struct { -- Message string `json:"message"` -+type ImageInList struct { -+ Id string `json:"id"` -+ ParentId string `json:"parentId"` -+ RepoTags []string `json:"repoTags"` -+ RepoDigests []string `json:"repoDigests"` -+ Created string `json:"created"` -+ Size int64 `json:"size"` -+ VirtualSize int64 `json:"virtualSize"` -+ Containers int64 `json:"containers"` -+ Labels map[string]string `json:"labels"` -+} -+ -+type ImageHistory struct { -+ Id string `json:"id"` -+ Created string `json:"created"` -+ CreatedBy string `json:"createdBy"` -+ Tags []string `json:"tags"` -+ Size int64 `json:"size"` -+ Comment string `json:"comment"` - } - - type ContainerNameSpace struct { -@@ -62,108 +158,12 @@ type InfoHost struct { - Uptime string `json:"uptime"` - } - --type ContainerChanges struct { -- Changed []string `json:"changed"` -- Added []string `json:"added"` -- Deleted []string `json:"deleted"` --} -- --type ImageInList struct { -- Id string `json:"id"` -- ParentId string `json:"parentId"` -- RepoTags []string `json:"repoTags"` -- RepoDigests []string `json:"repoDigests"` -- Created string `json:"created"` -- Size int64 `json:"size"` -- VirtualSize int64 `json:"virtualSize"` -- Containers int64 `json:"containers"` -- Labels map[string]string `json:"labels"` --} -- --type ImageHistory struct { -- Id string `json:"id"` -- Created string `json:"created"` -- CreatedBy string `json:"createdBy"` -- Tags []string `json:"tags"` -- Size int64 `json:"size"` -- Comment string `json:"comment"` --} -- --type ContainerMount struct { -- Destination string `json:"destination"` -- Type string `json:"type"` -- Source string `json:"source"` -- Options []string `json:"options"` --} -- --type ContainerPortMappings struct { -- Host_port string `json:"host_port"` -- Host_ip string `json:"host_ip"` -- Protocol string `json:"protocol"` -- Container_port string `json:"container_port"` --} -- --type InfoPodmanBinary struct { -- Compiler string `json:"compiler"` -- Go_version string `json:"go_version"` -- Podman_version string `json:"podman_version"` -- Git_commit string `json:"git_commit"` --} -- --type Version struct { -- Version string `json:"version"` -- Go_version string `json:"go_version"` -- Git_commit string `json:"git_commit"` -- Built int64 `json:"built"` -- Os_arch string `json:"os_arch"` --} -- --type ImageSearch struct { -- Description string `json:"description"` -- Is_official bool `json:"is_official"` -- Is_automated bool `json:"is_automated"` -- Name string `json:"name"` -- Star_count int64 `json:"star_count"` --} -- --type ListContainerData struct { -- Id string `json:"id"` -- Image string `json:"image"` -- Imageid string `json:"imageid"` -- Command []string `json:"command"` -- Createdat string `json:"createdat"` -- Runningfor string `json:"runningfor"` -- Status string `json:"status"` -- Ports []ContainerPortMappings `json:"ports"` -- Rootfssize int64 `json:"rootfssize"` -- Rwsize int64 `json:"rwsize"` -- Names string `json:"names"` -- Labels map[string]string `json:"labels"` -- Mounts []ContainerMount `json:"mounts"` -- Containerrunning bool `json:"containerrunning"` -- Namespaces ContainerNameSpace `json:"namespaces"` --} -- --type InfoStore struct { -- Containers int64 `json:"containers"` -- Images int64 `json:"images"` -- Graph_driver_name string `json:"graph_driver_name"` -- Graph_driver_options string `json:"graph_driver_options"` -- Graph_root string `json:"graph_root"` -- Graph_status InfoGraphStatus `json:"graph_status"` -- Run_root string `json:"run_root"` --} -- --type NotImplemented struct { -- Comment string `json:"comment"` --} -- - // Client method calls --type AttachToContainer_methods struct{} -+type UpdateContainer_methods struct{} - --func AttachToContainer() AttachToContainer_methods { return AttachToContainer_methods{} } -+func UpdateContainer() UpdateContainer_methods { return UpdateContainer_methods{} } - --func (m AttachToContainer_methods) Call(c *varlink.Connection) (notimplemented_out_ NotImplemented, err_ error) { -+func (m UpdateContainer_methods) Call(c *varlink.Connection) (notimplemented_out_ NotImplemented, err_ error) { - receive, err_ := m.Send(c, 0) - if err_ != nil { - return -@@ -172,8 +172,8 @@ func (m AttachToContainer_methods) Call(c *varlink.Connection) (notimplemented_o - return - } - --func (m AttachToContainer_methods) Send(c *varlink.Connection, flags uint64) (func() (NotImplemented, uint64, error), error) { -- receive, err := c.Send("io.projectatomic.podman.AttachToContainer", nil, flags) -+func (m UpdateContainer_methods) Send(c *varlink.Connection, flags uint64) (func() (NotImplemented, uint64, error), error) { -+ receive, err := c.Send("io.projectatomic.podman.UpdateContainer", nil, flags) - if err != nil { - return nil, err - } -@@ -190,68 +190,37 @@ func (m AttachToContainer_methods) Send(c *varlink.Connection, flags uint64) (fu - }, nil - } - --type WaitContainer_methods struct{} -+type InspectImage_methods struct{} - --func WaitContainer() WaitContainer_methods { return WaitContainer_methods{} } -+func InspectImage() InspectImage_methods { return InspectImage_methods{} } - --func (m WaitContainer_methods) Call(c *varlink.Connection, name_in_ string) (exitcode_out_ int64, err_ error) { -+func (m InspectImage_methods) Call(c *varlink.Connection, name_in_ string) (image_out_ string, err_ error) { - receive, err_ := m.Send(c, 0, name_in_) - if err_ != nil { - return - } -- exitcode_out_, _, err_ = receive() -+ image_out_, _, err_ = receive() - return - } - --func (m WaitContainer_methods) Send(c *varlink.Connection, flags uint64, name_in_ string) (func() (int64, uint64, error), error) { -+func (m InspectImage_methods) Send(c *varlink.Connection, flags uint64, name_in_ string) (func() (string, uint64, error), error) { - var in struct { - Name string `json:"name"` - } - in.Name = name_in_ -- receive, err := c.Send("io.projectatomic.podman.WaitContainer", in, flags) -- if err != nil { -- return nil, err -- } -- return func() (exitcode_out_ int64, flags uint64, err error) { -- var out struct { -- Exitcode int64 `json:"exitcode"` -- } -- flags, err = receive(&out) -- if err != nil { -- return -- } -- exitcode_out_ = out.Exitcode -- return -- }, nil --} -- --type DeleteUnusedImages_methods struct{} -- --func DeleteUnusedImages() DeleteUnusedImages_methods { return DeleteUnusedImages_methods{} } -- --func (m DeleteUnusedImages_methods) Call(c *varlink.Connection) (images_out_ []string, err_ error) { -- receive, err_ := m.Send(c, 0) -- if err_ != nil { -- return -- } -- images_out_, _, err_ = receive() -- return --} -- --func (m DeleteUnusedImages_methods) Send(c *varlink.Connection, flags uint64) (func() ([]string, uint64, error), error) { -- receive, err := c.Send("io.projectatomic.podman.DeleteUnusedImages", nil, flags) -+ receive, err := c.Send("io.projectatomic.podman.InspectImage", in, flags) - if err != nil { - return nil, err - } -- return func() (images_out_ []string, flags uint64, err error) { -+ return func() (image_out_ string, flags uint64, err error) { - var out struct { -- Images []string `json:"images"` -+ Image string `json:"image"` - } - flags, err = receive(&out) - if err != nil { - return - } -- images_out_ = []string(out.Images) -+ image_out_ = out.Image - return - }, nil - } -@@ -287,46 +256,42 @@ func (m GetInfo_methods) Send(c *varlink.Connection, flags uint64) (func() (Podm - }, nil - } - --type GetContainer_methods struct{} -+type ResizeContainerTty_methods struct{} - --func GetContainer() GetContainer_methods { return GetContainer_methods{} } -+func ResizeContainerTty() ResizeContainerTty_methods { return ResizeContainerTty_methods{} } - --func (m GetContainer_methods) Call(c *varlink.Connection, name_in_ string) (container_out_ ListContainerData, err_ error) { -- receive, err_ := m.Send(c, 0, name_in_) -+func (m ResizeContainerTty_methods) Call(c *varlink.Connection) (notimplemented_out_ NotImplemented, err_ error) { -+ receive, err_ := m.Send(c, 0) - if err_ != nil { - return - } -- container_out_, _, err_ = receive() -+ notimplemented_out_, _, err_ = receive() - return - } - --func (m GetContainer_methods) Send(c *varlink.Connection, flags uint64, name_in_ string) (func() (ListContainerData, uint64, error), error) { -- var in struct { -- Name string `json:"name"` -- } -- in.Name = name_in_ -- receive, err := c.Send("io.projectatomic.podman.GetContainer", in, flags) -+func (m ResizeContainerTty_methods) Send(c *varlink.Connection, flags uint64) (func() (NotImplemented, uint64, error), error) { -+ receive, err := c.Send("io.projectatomic.podman.ResizeContainerTty", nil, flags) - if err != nil { - return nil, err - } -- return func() (container_out_ ListContainerData, flags uint64, err error) { -+ return func() (notimplemented_out_ NotImplemented, flags uint64, err error) { - var out struct { -- Container ListContainerData `json:"container"` -+ Notimplemented NotImplemented `json:"notimplemented"` - } - flags, err = receive(&out) - if err != nil { - return - } -- container_out_ = out.Container -+ notimplemented_out_ = out.Notimplemented - return - }, nil - } - --type CreateContainer_methods struct{} -+type StartContainer_methods struct{} - --func CreateContainer() CreateContainer_methods { return CreateContainer_methods{} } -+func StartContainer() StartContainer_methods { return StartContainer_methods{} } - --func (m CreateContainer_methods) Call(c *varlink.Connection) (notimplemented_out_ NotImplemented, err_ error) { -+func (m StartContainer_methods) Call(c *varlink.Connection) (notimplemented_out_ NotImplemented, err_ error) { - receive, err_ := m.Send(c, 0) - if err_ != nil { - return -@@ -335,8 +300,8 @@ func (m CreateContainer_methods) Call(c *varlink.Connection) (notimplemented_out - return - } - --func (m CreateContainer_methods) Send(c *varlink.Connection, flags uint64) (func() (NotImplemented, uint64, error), error) { -- receive, err := c.Send("io.projectatomic.podman.CreateContainer", nil, flags) -+func (m StartContainer_methods) Send(c *varlink.Connection, flags uint64) (func() (NotImplemented, uint64, error), error) { -+ receive, err := c.Send("io.projectatomic.podman.StartContainer", nil, flags) - if err != nil { - return nil, err - } -@@ -353,12 +318,12 @@ func (m CreateContainer_methods) Send(c *varlink.Connection, flags uint64) (func - }, nil - } - --type ListContainerProcesses_methods struct{} -+type StopContainer_methods struct{} - --func ListContainerProcesses() ListContainerProcesses_methods { return ListContainerProcesses_methods{} } -+func StopContainer() StopContainer_methods { return StopContainer_methods{} } - --func (m ListContainerProcesses_methods) Call(c *varlink.Connection, name_in_ string, opts_in_ []string) (container_out_ []string, err_ error) { -- receive, err_ := m.Send(c, 0, name_in_, opts_in_) -+func (m StopContainer_methods) Call(c *varlink.Connection, name_in_ string, timeout_in_ int64) (container_out_ string, err_ error) { -+ receive, err_ := m.Send(c, 0, name_in_, timeout_in_) - if err_ != nil { - return - } -@@ -366,277 +331,240 @@ func (m ListContainerProcesses_methods) Call(c *varlink.Connection, name_in_ str - return - } - --func (m ListContainerProcesses_methods) Send(c *varlink.Connection, flags uint64, name_in_ string, opts_in_ []string) (func() ([]string, uint64, error), error) { -+func (m StopContainer_methods) Send(c *varlink.Connection, flags uint64, name_in_ string, timeout_in_ int64) (func() (string, uint64, error), error) { - var in struct { -- Name string `json:"name"` -- Opts []string `json:"opts"` -+ Name string `json:"name"` -+ Timeout int64 `json:"timeout"` - } - in.Name = name_in_ -- in.Opts = []string(opts_in_) -- receive, err := c.Send("io.projectatomic.podman.ListContainerProcesses", in, flags) -+ in.Timeout = timeout_in_ -+ receive, err := c.Send("io.projectatomic.podman.StopContainer", in, flags) - if err != nil { - return nil, err - } -- return func() (container_out_ []string, flags uint64, err error) { -+ return func() (container_out_ string, flags uint64, err error) { - var out struct { -- Container []string `json:"container"` -+ Container string `json:"container"` - } - flags, err = receive(&out) - if err != nil { - return - } -- container_out_ = []string(out.Container) -+ container_out_ = out.Container - return - }, nil - } - --type ListImages_methods struct{} -+type AttachToContainer_methods struct{} - --func ListImages() ListImages_methods { return ListImages_methods{} } -+func AttachToContainer() AttachToContainer_methods { return AttachToContainer_methods{} } - --func (m ListImages_methods) Call(c *varlink.Connection) (images_out_ []ImageInList, err_ error) { -+func (m AttachToContainer_methods) Call(c *varlink.Connection) (notimplemented_out_ NotImplemented, err_ error) { - receive, err_ := m.Send(c, 0) - if err_ != nil { - return - } -- images_out_, _, err_ = receive() -+ notimplemented_out_, _, err_ = receive() - return - } - --func (m ListImages_methods) Send(c *varlink.Connection, flags uint64) (func() ([]ImageInList, uint64, error), error) { -- receive, err := c.Send("io.projectatomic.podman.ListImages", nil, flags) -+func (m AttachToContainer_methods) Send(c *varlink.Connection, flags uint64) (func() (NotImplemented, uint64, error), error) { -+ receive, err := c.Send("io.projectatomic.podman.AttachToContainer", nil, flags) - if err != nil { - return nil, err - } -- return func() (images_out_ []ImageInList, flags uint64, err error) { -+ return func() (notimplemented_out_ NotImplemented, flags uint64, err error) { - var out struct { -- Images []ImageInList `json:"images"` -+ Notimplemented NotImplemented `json:"notimplemented"` - } - flags, err = receive(&out) - if err != nil { - return - } -- images_out_ = []ImageInList(out.Images) -+ notimplemented_out_ = out.Notimplemented - return - }, nil - } - --type TagImage_methods struct{} -+type BuildImage_methods struct{} - --func TagImage() TagImage_methods { return TagImage_methods{} } -+func BuildImage() BuildImage_methods { return BuildImage_methods{} } - --func (m TagImage_methods) Call(c *varlink.Connection, name_in_ string, tagged_in_ string) (image_out_ string, err_ error) { -- receive, err_ := m.Send(c, 0, name_in_, tagged_in_) -+func (m BuildImage_methods) Call(c *varlink.Connection) (notimplemented_out_ NotImplemented, err_ error) { -+ receive, err_ := m.Send(c, 0) - if err_ != nil { - return - } -- image_out_, _, err_ = receive() -+ notimplemented_out_, _, err_ = receive() - return - } - --func (m TagImage_methods) Send(c *varlink.Connection, flags uint64, name_in_ string, tagged_in_ string) (func() (string, uint64, error), error) { -- var in struct { -- Name string `json:"name"` -- Tagged string `json:"tagged"` -- } -- in.Name = name_in_ -- in.Tagged = tagged_in_ -- receive, err := c.Send("io.projectatomic.podman.TagImage", in, flags) -+func (m BuildImage_methods) Send(c *varlink.Connection, flags uint64) (func() (NotImplemented, uint64, error), error) { -+ receive, err := c.Send("io.projectatomic.podman.BuildImage", nil, flags) - if err != nil { - return nil, err - } -- return func() (image_out_ string, flags uint64, err error) { -+ return func() (notimplemented_out_ NotImplemented, flags uint64, err error) { - var out struct { -- Image string `json:"image"` -+ Notimplemented NotImplemented `json:"notimplemented"` - } - flags, err = receive(&out) - if err != nil { - return - } -- image_out_ = out.Image -+ notimplemented_out_ = out.Notimplemented - return - }, nil - } - --type ListContainerChanges_methods struct{} -+type CreateImage_methods struct{} - --func ListContainerChanges() ListContainerChanges_methods { return ListContainerChanges_methods{} } -+func CreateImage() CreateImage_methods { return CreateImage_methods{} } - --func (m ListContainerChanges_methods) Call(c *varlink.Connection, name_in_ string) (container_out_ ContainerChanges, err_ error) { -- receive, err_ := m.Send(c, 0, name_in_) -+func (m CreateImage_methods) Call(c *varlink.Connection) (notimplemented_out_ NotImplemented, err_ error) { -+ receive, err_ := m.Send(c, 0) - if err_ != nil { - return - } -- container_out_, _, err_ = receive() -+ notimplemented_out_, _, err_ = receive() - return - } - --func (m ListContainerChanges_methods) Send(c *varlink.Connection, flags uint64, name_in_ string) (func() (ContainerChanges, uint64, error), error) { -- var in struct { -- Name string `json:"name"` -- } -- in.Name = name_in_ -- receive, err := c.Send("io.projectatomic.podman.ListContainerChanges", in, flags) -+func (m CreateImage_methods) Send(c *varlink.Connection, flags uint64) (func() (NotImplemented, uint64, error), error) { -+ receive, err := c.Send("io.projectatomic.podman.CreateImage", nil, flags) - if err != nil { - return nil, err - } -- return func() (container_out_ ContainerChanges, flags uint64, err error) { -+ return func() (notimplemented_out_ NotImplemented, flags uint64, err error) { - var out struct { -- Container ContainerChanges `json:"container"` -+ Notimplemented NotImplemented `json:"notimplemented"` - } - flags, err = receive(&out) - if err != nil { - return - } -- container_out_ = out.Container -+ notimplemented_out_ = out.Notimplemented - return - }, nil - } - --type ExportContainer_methods struct{} -+type HistoryImage_methods struct{} - --func ExportContainer() ExportContainer_methods { return ExportContainer_methods{} } -+func HistoryImage() HistoryImage_methods { return HistoryImage_methods{} } - --func (m ExportContainer_methods) Call(c *varlink.Connection, name_in_ string, path_in_ string) (tarfile_out_ string, err_ error) { -- receive, err_ := m.Send(c, 0, name_in_, path_in_) -+func (m HistoryImage_methods) Call(c *varlink.Connection, name_in_ string) (history_out_ []ImageHistory, err_ error) { -+ receive, err_ := m.Send(c, 0, name_in_) - if err_ != nil { - return - } -- tarfile_out_, _, err_ = receive() -+ history_out_, _, err_ = receive() - return - } - --func (m ExportContainer_methods) Send(c *varlink.Connection, flags uint64, name_in_ string, path_in_ string) (func() (string, uint64, error), error) { -+func (m HistoryImage_methods) Send(c *varlink.Connection, flags uint64, name_in_ string) (func() ([]ImageHistory, uint64, error), error) { - var in struct { - Name string `json:"name"` -- Path string `json:"path"` - } - in.Name = name_in_ -- in.Path = path_in_ -- receive, err := c.Send("io.projectatomic.podman.ExportContainer", in, flags) -- if err != nil { -- return nil, err -- } -- return func() (tarfile_out_ string, flags uint64, err error) { -- var out struct { -- Tarfile string `json:"tarfile"` -- } -- flags, err = receive(&out) -- if err != nil { -- return -- } -- tarfile_out_ = out.Tarfile -- return -- }, nil --} -- --type UpdateContainer_methods struct{} -- --func UpdateContainer() UpdateContainer_methods { return UpdateContainer_methods{} } -- --func (m UpdateContainer_methods) Call(c *varlink.Connection) (notimplemented_out_ NotImplemented, err_ error) { -- receive, err_ := m.Send(c, 0) -- if err_ != nil { -- return -- } -- notimplemented_out_, _, err_ = receive() -- return --} -- --func (m UpdateContainer_methods) Send(c *varlink.Connection, flags uint64) (func() (NotImplemented, uint64, error), error) { -- receive, err := c.Send("io.projectatomic.podman.UpdateContainer", nil, flags) -+ receive, err := c.Send("io.projectatomic.podman.HistoryImage", in, flags) - if err != nil { - return nil, err - } -- return func() (notimplemented_out_ NotImplemented, flags uint64, err error) { -+ return func() (history_out_ []ImageHistory, flags uint64, err error) { - var out struct { -- Notimplemented NotImplemented `json:"notimplemented"` -+ History []ImageHistory `json:"history"` - } - flags, err = receive(&out) - if err != nil { - return - } -- notimplemented_out_ = out.Notimplemented -+ history_out_ = []ImageHistory(out.History) - return - }, nil - } - --type UnpauseContainer_methods struct{} -+type Commit_methods struct{} - --func UnpauseContainer() UnpauseContainer_methods { return UnpauseContainer_methods{} } -+func Commit() Commit_methods { return Commit_methods{} } - --func (m UnpauseContainer_methods) Call(c *varlink.Connection, name_in_ string) (container_out_ string, err_ error) { -- receive, err_ := m.Send(c, 0, name_in_) -+func (m Commit_methods) Call(c *varlink.Connection, name_in_ string, image_name_in_ string, changes_in_ []string, author_in_ string, message_in_ string, pause_in_ bool) (image_out_ string, err_ error) { -+ receive, err_ := m.Send(c, 0, name_in_, image_name_in_, changes_in_, author_in_, message_in_, pause_in_) - if err_ != nil { - return - } -- container_out_, _, err_ = receive() -+ image_out_, _, err_ = receive() - return - } - --func (m UnpauseContainer_methods) Send(c *varlink.Connection, flags uint64, name_in_ string) (func() (string, uint64, error), error) { -+func (m Commit_methods) Send(c *varlink.Connection, flags uint64, name_in_ string, image_name_in_ string, changes_in_ []string, author_in_ string, message_in_ string, pause_in_ bool) (func() (string, uint64, error), error) { - var in struct { -- Name string `json:"name"` -+ Name string `json:"name"` -+ Image_name string `json:"image_name"` -+ Changes []string `json:"changes"` -+ Author string `json:"author"` -+ Message string `json:"message"` -+ Pause bool `json:"pause"` - } - in.Name = name_in_ -- receive, err := c.Send("io.projectatomic.podman.UnpauseContainer", in, flags) -+ in.Image_name = image_name_in_ -+ in.Changes = []string(changes_in_) -+ in.Author = author_in_ -+ in.Message = message_in_ -+ in.Pause = pause_in_ -+ receive, err := c.Send("io.projectatomic.podman.Commit", in, flags) - if err != nil { - return nil, err - } -- return func() (container_out_ string, flags uint64, err error) { -+ return func() (image_out_ string, flags uint64, err error) { - var out struct { -- Container string `json:"container"` -+ Image string `json:"image"` - } - flags, err = receive(&out) - if err != nil { - return - } -- container_out_ = out.Container -+ image_out_ = out.Image - return - }, nil - } - --type GetContainerStats_methods struct{} -+type ListContainers_methods struct{} - --func GetContainerStats() GetContainerStats_methods { return GetContainerStats_methods{} } -+func ListContainers() ListContainers_methods { return ListContainers_methods{} } - --func (m GetContainerStats_methods) Call(c *varlink.Connection, name_in_ string) (container_out_ ContainerStats, err_ error) { -- receive, err_ := m.Send(c, 0, name_in_) -+func (m ListContainers_methods) Call(c *varlink.Connection) (containers_out_ []ListContainerData, err_ error) { -+ receive, err_ := m.Send(c, 0) - if err_ != nil { - return - } -- container_out_, _, err_ = receive() -+ containers_out_, _, err_ = receive() - return - } - --func (m GetContainerStats_methods) Send(c *varlink.Connection, flags uint64, name_in_ string) (func() (ContainerStats, uint64, error), error) { -- var in struct { -- Name string `json:"name"` -- } -- in.Name = name_in_ -- receive, err := c.Send("io.projectatomic.podman.GetContainerStats", in, flags) -+func (m ListContainers_methods) Send(c *varlink.Connection, flags uint64) (func() ([]ListContainerData, uint64, error), error) { -+ receive, err := c.Send("io.projectatomic.podman.ListContainers", nil, flags) - if err != nil { - return nil, err - } -- return func() (container_out_ ContainerStats, flags uint64, err error) { -+ return func() (containers_out_ []ListContainerData, flags uint64, err error) { - var out struct { -- Container ContainerStats `json:"container"` -+ Containers []ListContainerData `json:"containers"` - } - flags, err = receive(&out) - if err != nil { - return - } -- container_out_ = out.Container -+ containers_out_ = []ListContainerData(out.Containers) - return - }, nil - } - --type StopContainer_methods struct{} -+type GetContainer_methods struct{} - --func StopContainer() StopContainer_methods { return StopContainer_methods{} } -+func GetContainer() GetContainer_methods { return GetContainer_methods{} } - --func (m StopContainer_methods) Call(c *varlink.Connection, name_in_ string, timeout_in_ int64) (container_out_ string, err_ error) { -- receive, err_ := m.Send(c, 0, name_in_, timeout_in_) -+func (m GetContainer_methods) Call(c *varlink.Connection, name_in_ string) (container_out_ ListContainerData, err_ error) { -+ receive, err_ := m.Send(c, 0, name_in_) - if err_ != nil { - return - } -@@ -644,20 +572,18 @@ func (m StopContainer_methods) Call(c *varlink.Connection, name_in_ string, time - return - } - --func (m StopContainer_methods) Send(c *varlink.Connection, flags uint64, name_in_ string, timeout_in_ int64) (func() (string, uint64, error), error) { -+func (m GetContainer_methods) Send(c *varlink.Connection, flags uint64, name_in_ string) (func() (ListContainerData, uint64, error), error) { - var in struct { -- Name string `json:"name"` -- Timeout int64 `json:"timeout"` -+ Name string `json:"name"` - } - in.Name = name_in_ -- in.Timeout = timeout_in_ -- receive, err := c.Send("io.projectatomic.podman.StopContainer", in, flags) -+ receive, err := c.Send("io.projectatomic.podman.GetContainer", in, flags) - if err != nil { - return nil, err - } -- return func() (container_out_ string, flags uint64, err error) { -+ return func() (container_out_ ListContainerData, flags uint64, err error) { - var out struct { -- Container string `json:"container"` -+ Container ListContainerData `json:"container"` - } - flags, err = receive(&out) - if err != nil { -@@ -668,152 +594,146 @@ func (m StopContainer_methods) Send(c *varlink.Connection, flags uint64, name_in - }, nil - } - --type RestartContainer_methods struct{} -+type ExportContainer_methods struct{} - --func RestartContainer() RestartContainer_methods { return RestartContainer_methods{} } -+func ExportContainer() ExportContainer_methods { return ExportContainer_methods{} } - --func (m RestartContainer_methods) Call(c *varlink.Connection, name_in_ string, timeout_in_ int64) (container_out_ string, err_ error) { -- receive, err_ := m.Send(c, 0, name_in_, timeout_in_) -+func (m ExportContainer_methods) Call(c *varlink.Connection, name_in_ string, path_in_ string) (tarfile_out_ string, err_ error) { -+ receive, err_ := m.Send(c, 0, name_in_, path_in_) - if err_ != nil { - return - } -- container_out_, _, err_ = receive() -+ tarfile_out_, _, err_ = receive() - return - } - --func (m RestartContainer_methods) Send(c *varlink.Connection, flags uint64, name_in_ string, timeout_in_ int64) (func() (string, uint64, error), error) { -+func (m ExportContainer_methods) Send(c *varlink.Connection, flags uint64, name_in_ string, path_in_ string) (func() (string, uint64, error), error) { - var in struct { -- Name string `json:"name"` -- Timeout int64 `json:"timeout"` -+ Name string `json:"name"` -+ Path string `json:"path"` - } - in.Name = name_in_ -- in.Timeout = timeout_in_ -- receive, err := c.Send("io.projectatomic.podman.RestartContainer", in, flags) -+ in.Path = path_in_ -+ receive, err := c.Send("io.projectatomic.podman.ExportContainer", in, flags) - if err != nil { - return nil, err - } -- return func() (container_out_ string, flags uint64, err error) { -+ return func() (tarfile_out_ string, flags uint64, err error) { - var out struct { -- Container string `json:"container"` -+ Tarfile string `json:"tarfile"` - } - flags, err = receive(&out) - if err != nil { - return - } -- container_out_ = out.Container -+ tarfile_out_ = out.Tarfile - return - }, nil - } - --type ImportImage_methods struct{} -+type ListImages_methods struct{} - --func ImportImage() ImportImage_methods { return ImportImage_methods{} } -+func ListImages() ListImages_methods { return ListImages_methods{} } - --func (m ImportImage_methods) Call(c *varlink.Connection, source_in_ string, reference_in_ string, message_in_ string, changes_in_ []string) (image_out_ string, err_ error) { -- receive, err_ := m.Send(c, 0, source_in_, reference_in_, message_in_, changes_in_) -+func (m ListImages_methods) Call(c *varlink.Connection) (images_out_ []ImageInList, err_ error) { -+ receive, err_ := m.Send(c, 0) - if err_ != nil { - return - } -- image_out_, _, err_ = receive() -+ images_out_, _, err_ = receive() - return - } - --func (m ImportImage_methods) Send(c *varlink.Connection, flags uint64, source_in_ string, reference_in_ string, message_in_ string, changes_in_ []string) (func() (string, uint64, error), error) { -- var in struct { -- Source string `json:"source"` -- Reference string `json:"reference"` -- Message string `json:"message"` -- Changes []string `json:"changes"` -- } -- in.Source = source_in_ -- in.Reference = reference_in_ -- in.Message = message_in_ -- in.Changes = []string(changes_in_) -- receive, err := c.Send("io.projectatomic.podman.ImportImage", in, flags) -+func (m ListImages_methods) Send(c *varlink.Connection, flags uint64) (func() ([]ImageInList, uint64, error), error) { -+ receive, err := c.Send("io.projectatomic.podman.ListImages", nil, flags) - if err != nil { - return nil, err - } -- return func() (image_out_ string, flags uint64, err error) { -+ return func() (images_out_ []ImageInList, flags uint64, err error) { - var out struct { -- Image string `json:"image"` -+ Images []ImageInList `json:"images"` - } - flags, err = receive(&out) - if err != nil { - return - } -- image_out_ = out.Image -+ images_out_ = []ImageInList(out.Images) - return - }, nil - } - --type ListContainers_methods struct{} -+type DeleteUnusedImages_methods struct{} - --func ListContainers() ListContainers_methods { return ListContainers_methods{} } -+func DeleteUnusedImages() DeleteUnusedImages_methods { return DeleteUnusedImages_methods{} } - --func (m ListContainers_methods) Call(c *varlink.Connection) (containers_out_ []ListContainerData, err_ error) { -+func (m DeleteUnusedImages_methods) Call(c *varlink.Connection) (images_out_ []string, err_ error) { - receive, err_ := m.Send(c, 0) - if err_ != nil { - return - } -- containers_out_, _, err_ = receive() -+ images_out_, _, err_ = receive() - return - } - --func (m ListContainers_methods) Send(c *varlink.Connection, flags uint64) (func() ([]ListContainerData, uint64, error), error) { -- receive, err := c.Send("io.projectatomic.podman.ListContainers", nil, flags) -+func (m DeleteUnusedImages_methods) Send(c *varlink.Connection, flags uint64) (func() ([]string, uint64, error), error) { -+ receive, err := c.Send("io.projectatomic.podman.DeleteUnusedImages", nil, flags) - if err != nil { - return nil, err - } -- return func() (containers_out_ []ListContainerData, flags uint64, err error) { -+ return func() (images_out_ []string, flags uint64, err error) { - var out struct { -- Containers []ListContainerData `json:"containers"` -+ Images []string `json:"images"` - } - flags, err = receive(&out) - if err != nil { - return - } -- containers_out_ = []ListContainerData(out.Containers) -+ images_out_ = []string(out.Images) - return - }, nil - } - --type StartContainer_methods struct{} -+type GetContainerStats_methods struct{} - --func StartContainer() StartContainer_methods { return StartContainer_methods{} } -+func GetContainerStats() GetContainerStats_methods { return GetContainerStats_methods{} } - --func (m StartContainer_methods) Call(c *varlink.Connection) (notimplemented_out_ NotImplemented, err_ error) { -- receive, err_ := m.Send(c, 0) -+func (m GetContainerStats_methods) Call(c *varlink.Connection, name_in_ string) (container_out_ ContainerStats, err_ error) { -+ receive, err_ := m.Send(c, 0, name_in_) - if err_ != nil { - return - } -- notimplemented_out_, _, err_ = receive() -+ container_out_, _, err_ = receive() - return - } - --func (m StartContainer_methods) Send(c *varlink.Connection, flags uint64) (func() (NotImplemented, uint64, error), error) { -- receive, err := c.Send("io.projectatomic.podman.StartContainer", nil, flags) -+func (m GetContainerStats_methods) Send(c *varlink.Connection, flags uint64, name_in_ string) (func() (ContainerStats, uint64, error), error) { -+ var in struct { -+ Name string `json:"name"` -+ } -+ in.Name = name_in_ -+ receive, err := c.Send("io.projectatomic.podman.GetContainerStats", in, flags) - if err != nil { - return nil, err - } -- return func() (notimplemented_out_ NotImplemented, flags uint64, err error) { -+ return func() (container_out_ ContainerStats, flags uint64, err error) { - var out struct { -- Notimplemented NotImplemented `json:"notimplemented"` -+ Container ContainerStats `json:"container"` - } - flags, err = receive(&out) - if err != nil { - return - } -- notimplemented_out_ = out.Notimplemented -+ container_out_ = out.Container - return - }, nil - } - --type RemoveContainer_methods struct{} -+type UnpauseContainer_methods struct{} - --func RemoveContainer() RemoveContainer_methods { return RemoveContainer_methods{} } -+func UnpauseContainer() UnpauseContainer_methods { return UnpauseContainer_methods{} } - --func (m RemoveContainer_methods) Call(c *varlink.Connection, name_in_ string, force_in_ bool) (container_out_ string, err_ error) { -- receive, err_ := m.Send(c, 0, name_in_, force_in_) -+func (m UnpauseContainer_methods) Call(c *varlink.Connection, name_in_ string) (container_out_ string, err_ error) { -+ receive, err_ := m.Send(c, 0, name_in_) - if err_ != nil { - return - } -@@ -821,14 +741,12 @@ func (m RemoveContainer_methods) Call(c *varlink.Connection, name_in_ string, fo - return - } - --func (m RemoveContainer_methods) Send(c *varlink.Connection, flags uint64, name_in_ string, force_in_ bool) (func() (string, uint64, error), error) { -+func (m UnpauseContainer_methods) Send(c *varlink.Connection, flags uint64, name_in_ string) (func() (string, uint64, error), error) { - var in struct { -- Name string `json:"name"` -- Force bool `json:"force"` -+ Name string `json:"name"` - } - in.Name = name_in_ -- in.Force = force_in_ -- receive, err := c.Send("io.projectatomic.podman.RemoveContainer", in, flags) -+ receive, err := c.Send("io.projectatomic.podman.UnpauseContainer", in, flags) - if err != nil { - return nil, err - } -@@ -845,110 +763,108 @@ func (m RemoveContainer_methods) Send(c *varlink.Connection, flags uint64, name_ - }, nil - } - --type DeleteStoppedContainers_methods struct{} -+type PullImage_methods struct{} - --func DeleteStoppedContainers() DeleteStoppedContainers_methods { -- return DeleteStoppedContainers_methods{} --} -+func PullImage() PullImage_methods { return PullImage_methods{} } - --func (m DeleteStoppedContainers_methods) Call(c *varlink.Connection) (containers_out_ []string, err_ error) { -- receive, err_ := m.Send(c, 0) -+func (m PullImage_methods) Call(c *varlink.Connection, name_in_ string) (id_out_ string, err_ error) { -+ receive, err_ := m.Send(c, 0, name_in_) - if err_ != nil { - return - } -- containers_out_, _, err_ = receive() -+ id_out_, _, err_ = receive() - return - } - --func (m DeleteStoppedContainers_methods) Send(c *varlink.Connection, flags uint64) (func() ([]string, uint64, error), error) { -- receive, err := c.Send("io.projectatomic.podman.DeleteStoppedContainers", nil, flags) -+func (m PullImage_methods) Send(c *varlink.Connection, flags uint64, name_in_ string) (func() (string, uint64, error), error) { -+ var in struct { -+ Name string `json:"name"` -+ } -+ in.Name = name_in_ -+ receive, err := c.Send("io.projectatomic.podman.PullImage", in, flags) - if err != nil { - return nil, err - } -- return func() (containers_out_ []string, flags uint64, err error) { -+ return func() (id_out_ string, flags uint64, err error) { - var out struct { -- Containers []string `json:"containers"` -+ Id string `json:"id"` - } - flags, err = receive(&out) - if err != nil { - return - } -- containers_out_ = []string(out.Containers) -+ id_out_ = out.Id - return - }, nil - } - --type InspectContainer_methods struct{} -+type Ping_methods struct{} - --func InspectContainer() InspectContainer_methods { return InspectContainer_methods{} } -+func Ping() Ping_methods { return Ping_methods{} } - --func (m InspectContainer_methods) Call(c *varlink.Connection, name_in_ string) (container_out_ string, err_ error) { -- receive, err_ := m.Send(c, 0, name_in_) -+func (m Ping_methods) Call(c *varlink.Connection) (ping_out_ StringResponse, err_ error) { -+ receive, err_ := m.Send(c, 0) - if err_ != nil { - return - } -- container_out_, _, err_ = receive() -+ ping_out_, _, err_ = receive() - return - } - --func (m InspectContainer_methods) Send(c *varlink.Connection, flags uint64, name_in_ string) (func() (string, uint64, error), error) { -- var in struct { -- Name string `json:"name"` -- } -- in.Name = name_in_ -- receive, err := c.Send("io.projectatomic.podman.InspectContainer", in, flags) -+func (m Ping_methods) Send(c *varlink.Connection, flags uint64) (func() (StringResponse, uint64, error), error) { -+ receive, err := c.Send("io.projectatomic.podman.Ping", nil, flags) - if err != nil { - return nil, err - } -- return func() (container_out_ string, flags uint64, err error) { -+ return func() (ping_out_ StringResponse, flags uint64, err error) { - var out struct { -- Container string `json:"container"` -+ Ping StringResponse `json:"ping"` - } - flags, err = receive(&out) - if err != nil { - return - } -- container_out_ = out.Container -+ ping_out_ = out.Ping - return - }, nil - } - --type RenameContainer_methods struct{} -+type GetVersion_methods struct{} - --func RenameContainer() RenameContainer_methods { return RenameContainer_methods{} } -+func GetVersion() GetVersion_methods { return GetVersion_methods{} } - --func (m RenameContainer_methods) Call(c *varlink.Connection) (notimplemented_out_ NotImplemented, err_ error) { -+func (m GetVersion_methods) Call(c *varlink.Connection) (version_out_ Version, err_ error) { - receive, err_ := m.Send(c, 0) - if err_ != nil { - return - } -- notimplemented_out_, _, err_ = receive() -+ version_out_, _, err_ = receive() - return - } - --func (m RenameContainer_methods) Send(c *varlink.Connection, flags uint64) (func() (NotImplemented, uint64, error), error) { -- receive, err := c.Send("io.projectatomic.podman.RenameContainer", nil, flags) -+func (m GetVersion_methods) Send(c *varlink.Connection, flags uint64) (func() (Version, uint64, error), error) { -+ receive, err := c.Send("io.projectatomic.podman.GetVersion", nil, flags) - if err != nil { - return nil, err - } -- return func() (notimplemented_out_ NotImplemented, flags uint64, err error) { -+ return func() (version_out_ Version, flags uint64, err error) { - var out struct { -- Notimplemented NotImplemented `json:"notimplemented"` -+ Version Version `json:"version"` - } - flags, err = receive(&out) - if err != nil { - return - } -- notimplemented_out_ = out.Notimplemented -+ version_out_ = out.Version - return - }, nil - } - --type BuildImage_methods struct{} -+type CreateContainer_methods struct{} - --func BuildImage() BuildImage_methods { return BuildImage_methods{} } -+func CreateContainer() CreateContainer_methods { return CreateContainer_methods{} } - --func (m BuildImage_methods) Call(c *varlink.Connection) (notimplemented_out_ NotImplemented, err_ error) { -+func (m CreateContainer_methods) Call(c *varlink.Connection) (notimplemented_out_ NotImplemented, err_ error) { - receive, err_ := m.Send(c, 0) - if err_ != nil { - return -@@ -957,8 +873,8 @@ func (m BuildImage_methods) Call(c *varlink.Connection) (notimplemented_out_ Not - return - } - --func (m BuildImage_methods) Send(c *varlink.Connection, flags uint64) (func() (NotImplemented, uint64, error), error) { -- receive, err := c.Send("io.projectatomic.podman.BuildImage", nil, flags) -+func (m CreateContainer_methods) Send(c *varlink.Connection, flags uint64) (func() (NotImplemented, uint64, error), error) { -+ receive, err := c.Send("io.projectatomic.podman.CreateContainer", nil, flags) - if err != nil { - return nil, err - } -@@ -975,113 +891,123 @@ func (m BuildImage_methods) Send(c *varlink.Connection, flags uint64) (func() (N - }, nil - } - --type PullImage_methods struct{} -+type KillContainer_methods struct{} - --func PullImage() PullImage_methods { return PullImage_methods{} } -+func KillContainer() KillContainer_methods { return KillContainer_methods{} } - --func (m PullImage_methods) Call(c *varlink.Connection, name_in_ string) (id_out_ string, err_ error) { -- receive, err_ := m.Send(c, 0, name_in_) -+func (m KillContainer_methods) Call(c *varlink.Connection, name_in_ string, signal_in_ int64) (container_out_ string, err_ error) { -+ receive, err_ := m.Send(c, 0, name_in_, signal_in_) - if err_ != nil { - return - } -- id_out_, _, err_ = receive() -+ container_out_, _, err_ = receive() - return - } - --func (m PullImage_methods) Send(c *varlink.Connection, flags uint64, name_in_ string) (func() (string, uint64, error), error) { -+func (m KillContainer_methods) Send(c *varlink.Connection, flags uint64, name_in_ string, signal_in_ int64) (func() (string, uint64, error), error) { - var in struct { -- Name string `json:"name"` -+ Name string `json:"name"` -+ Signal int64 `json:"signal"` - } - in.Name = name_in_ -- receive, err := c.Send("io.projectatomic.podman.PullImage", in, flags) -+ in.Signal = signal_in_ -+ receive, err := c.Send("io.projectatomic.podman.KillContainer", in, flags) - if err != nil { - return nil, err - } -- return func() (id_out_ string, flags uint64, err error) { -+ return func() (container_out_ string, flags uint64, err error) { - var out struct { -- Id string `json:"id"` -+ Container string `json:"container"` - } - flags, err = receive(&out) - if err != nil { - return - } -- id_out_ = out.Id -+ container_out_ = out.Container - return - }, nil - } - --type Ping_methods struct{} -+type RemoveContainer_methods struct{} - --func Ping() Ping_methods { return Ping_methods{} } -+func RemoveContainer() RemoveContainer_methods { return RemoveContainer_methods{} } - --func (m Ping_methods) Call(c *varlink.Connection) (ping_out_ StringResponse, err_ error) { -- receive, err_ := m.Send(c, 0) -+func (m RemoveContainer_methods) Call(c *varlink.Connection, name_in_ string, force_in_ bool) (container_out_ string, err_ error) { -+ receive, err_ := m.Send(c, 0, name_in_, force_in_) - if err_ != nil { - return - } -- ping_out_, _, err_ = receive() -+ container_out_, _, err_ = receive() - return - } - --func (m Ping_methods) Send(c *varlink.Connection, flags uint64) (func() (StringResponse, uint64, error), error) { -- receive, err := c.Send("io.projectatomic.podman.Ping", nil, flags) -+func (m RemoveContainer_methods) Send(c *varlink.Connection, flags uint64, name_in_ string, force_in_ bool) (func() (string, uint64, error), error) { -+ var in struct { -+ Name string `json:"name"` -+ Force bool `json:"force"` -+ } -+ in.Name = name_in_ -+ in.Force = force_in_ -+ receive, err := c.Send("io.projectatomic.podman.RemoveContainer", in, flags) - if err != nil { - return nil, err - } -- return func() (ping_out_ StringResponse, flags uint64, err error) { -+ return func() (container_out_ string, flags uint64, err error) { - var out struct { -- Ping StringResponse `json:"ping"` -+ Container string `json:"container"` - } - flags, err = receive(&out) - if err != nil { - return - } -- ping_out_ = out.Ping -+ container_out_ = out.Container - return - }, nil - } - --type PauseContainer_methods struct{} -+type RemoveImage_methods struct{} - --func PauseContainer() PauseContainer_methods { return PauseContainer_methods{} } -+func RemoveImage() RemoveImage_methods { return RemoveImage_methods{} } - --func (m PauseContainer_methods) Call(c *varlink.Connection, name_in_ string) (container_out_ string, err_ error) { -- receive, err_ := m.Send(c, 0, name_in_) -+func (m RemoveImage_methods) Call(c *varlink.Connection, name_in_ string, force_in_ bool) (image_out_ string, err_ error) { -+ receive, err_ := m.Send(c, 0, name_in_, force_in_) - if err_ != nil { - return - } -- container_out_, _, err_ = receive() -+ image_out_, _, err_ = receive() - return - } - --func (m PauseContainer_methods) Send(c *varlink.Connection, flags uint64, name_in_ string) (func() (string, uint64, error), error) { -+func (m RemoveImage_methods) Send(c *varlink.Connection, flags uint64, name_in_ string, force_in_ bool) (func() (string, uint64, error), error) { - var in struct { -- Name string `json:"name"` -+ Name string `json:"name"` -+ Force bool `json:"force"` - } - in.Name = name_in_ -- receive, err := c.Send("io.projectatomic.podman.PauseContainer", in, flags) -+ in.Force = force_in_ -+ receive, err := c.Send("io.projectatomic.podman.RemoveImage", in, flags) - if err != nil { - return nil, err - } -- return func() (container_out_ string, flags uint64, err error) { -+ return func() (image_out_ string, flags uint64, err error) { - var out struct { -- Container string `json:"container"` -+ Image string `json:"image"` - } - flags, err = receive(&out) - if err != nil { - return - } -- container_out_ = out.Container -+ image_out_ = out.Image - return - }, nil - } - --type PushImage_methods struct{} -+type ImportImage_methods struct{} - --func PushImage() PushImage_methods { return PushImage_methods{} } -+func ImportImage() ImportImage_methods { return ImportImage_methods{} } - --func (m PushImage_methods) Call(c *varlink.Connection, name_in_ string, tag_in_ string, tlsverify_in_ bool) (image_out_ string, err_ error) { -- receive, err_ := m.Send(c, 0, name_in_, tag_in_, tlsverify_in_) -+func (m ImportImage_methods) Call(c *varlink.Connection, source_in_ string, reference_in_ string, message_in_ string, changes_in_ []string) (image_out_ string, err_ error) { -+ receive, err_ := m.Send(c, 0, source_in_, reference_in_, message_in_, changes_in_) - if err_ != nil { - return - } -@@ -1089,16 +1015,18 @@ func (m PushImage_methods) Call(c *varlink.Connection, name_in_ string, tag_in_ - return - } - --func (m PushImage_methods) Send(c *varlink.Connection, flags uint64, name_in_ string, tag_in_ string, tlsverify_in_ bool) (func() (string, uint64, error), error) { -+func (m ImportImage_methods) Send(c *varlink.Connection, flags uint64, source_in_ string, reference_in_ string, message_in_ string, changes_in_ []string) (func() (string, uint64, error), error) { - var in struct { -- Name string `json:"name"` -- Tag string `json:"tag"` -- Tlsverify bool `json:"tlsverify"` -+ Source string `json:"source"` -+ Reference string `json:"reference"` -+ Message string `json:"message"` -+ Changes []string `json:"changes"` - } -- in.Name = name_in_ -- in.Tag = tag_in_ -- in.Tlsverify = tlsverify_in_ -- receive, err := c.Send("io.projectatomic.podman.PushImage", in, flags) -+ in.Source = source_in_ -+ in.Reference = reference_in_ -+ in.Message = message_in_ -+ in.Changes = []string(changes_in_) -+ receive, err := c.Send("io.projectatomic.podman.ImportImage", in, flags) - if err != nil { - return nil, err - } -@@ -1154,114 +1082,153 @@ func (m ExportImage_methods) Send(c *varlink.Connection, flags uint64, name_in_ - }, nil - } - --type InspectImage_methods struct{} -+type InspectContainer_methods struct{} - --func InspectImage() InspectImage_methods { return InspectImage_methods{} } -+func InspectContainer() InspectContainer_methods { return InspectContainer_methods{} } - --func (m InspectImage_methods) Call(c *varlink.Connection, name_in_ string) (image_out_ string, err_ error) { -+func (m InspectContainer_methods) Call(c *varlink.Connection, name_in_ string) (container_out_ string, err_ error) { - receive, err_ := m.Send(c, 0, name_in_) - if err_ != nil { - return - } -- image_out_, _, err_ = receive() -+ container_out_, _, err_ = receive() - return - } - --func (m InspectImage_methods) Send(c *varlink.Connection, flags uint64, name_in_ string) (func() (string, uint64, error), error) { -+func (m InspectContainer_methods) Send(c *varlink.Connection, flags uint64, name_in_ string) (func() (string, uint64, error), error) { - var in struct { - Name string `json:"name"` - } - in.Name = name_in_ -- receive, err := c.Send("io.projectatomic.podman.InspectImage", in, flags) -+ receive, err := c.Send("io.projectatomic.podman.InspectContainer", in, flags) - if err != nil { - return nil, err - } -- return func() (image_out_ string, flags uint64, err error) { -+ return func() (container_out_ string, flags uint64, err error) { - var out struct { -- Image string `json:"image"` -+ Container string `json:"container"` - } - flags, err = receive(&out) - if err != nil { - return - } -- image_out_ = out.Image -+ container_out_ = out.Container - return - }, nil - } - --type RemoveImage_methods struct{} -+type GetContainerLogs_methods struct{} - --func RemoveImage() RemoveImage_methods { return RemoveImage_methods{} } -+func GetContainerLogs() GetContainerLogs_methods { return GetContainerLogs_methods{} } - --func (m RemoveImage_methods) Call(c *varlink.Connection, name_in_ string, force_in_ bool) (image_out_ string, err_ error) { -- receive, err_ := m.Send(c, 0, name_in_, force_in_) -+func (m GetContainerLogs_methods) Call(c *varlink.Connection, name_in_ string) (container_out_ []string, err_ error) { -+ receive, err_ := m.Send(c, 0, name_in_) - if err_ != nil { - return - } -- image_out_, _, err_ = receive() -+ container_out_, _, err_ = receive() - return - } - --func (m RemoveImage_methods) Send(c *varlink.Connection, flags uint64, name_in_ string, force_in_ bool) (func() (string, uint64, error), error) { -+func (m GetContainerLogs_methods) Send(c *varlink.Connection, flags uint64, name_in_ string) (func() ([]string, uint64, error), error) { - var in struct { -- Name string `json:"name"` -- Force bool `json:"force"` -+ Name string `json:"name"` - } - in.Name = name_in_ -- in.Force = force_in_ -- receive, err := c.Send("io.projectatomic.podman.RemoveImage", in, flags) -+ receive, err := c.Send("io.projectatomic.podman.GetContainerLogs", in, flags) - if err != nil { - return nil, err - } -- return func() (image_out_ string, flags uint64, err error) { -+ return func() (container_out_ []string, flags uint64, err error) { - var out struct { -- Image string `json:"image"` -+ Container []string `json:"container"` - } - flags, err = receive(&out) - if err != nil { - return - } -- image_out_ = out.Image -+ container_out_ = []string(out.Container) - return - }, nil - } - --type GetVersion_methods struct{} -+type ListContainerChanges_methods struct{} - --func GetVersion() GetVersion_methods { return GetVersion_methods{} } -+func ListContainerChanges() ListContainerChanges_methods { return ListContainerChanges_methods{} } - --func (m GetVersion_methods) Call(c *varlink.Connection) (version_out_ Version, err_ error) { -- receive, err_ := m.Send(c, 0) -+func (m ListContainerChanges_methods) Call(c *varlink.Connection, name_in_ string) (container_out_ ContainerChanges, err_ error) { -+ receive, err_ := m.Send(c, 0, name_in_) - if err_ != nil { - return - } -- version_out_, _, err_ = receive() -+ container_out_, _, err_ = receive() - return - } - --func (m GetVersion_methods) Send(c *varlink.Connection, flags uint64) (func() (Version, uint64, error), error) { -- receive, err := c.Send("io.projectatomic.podman.GetVersion", nil, flags) -+func (m ListContainerChanges_methods) Send(c *varlink.Connection, flags uint64, name_in_ string) (func() (ContainerChanges, uint64, error), error) { -+ var in struct { -+ Name string `json:"name"` -+ } -+ in.Name = name_in_ -+ receive, err := c.Send("io.projectatomic.podman.ListContainerChanges", in, flags) - if err != nil { - return nil, err - } -- return func() (version_out_ Version, flags uint64, err error) { -+ return func() (container_out_ ContainerChanges, flags uint64, err error) { - var out struct { -- Version Version `json:"version"` -+ Container ContainerChanges `json:"container"` - } - flags, err = receive(&out) - if err != nil { - return - } -- version_out_ = out.Version -+ container_out_ = out.Container - return - }, nil - } - --type ResizeContainerTty_methods struct{} -+type RestartContainer_methods struct{} - --func ResizeContainerTty() ResizeContainerTty_methods { return ResizeContainerTty_methods{} } -+func RestartContainer() RestartContainer_methods { return RestartContainer_methods{} } - --func (m ResizeContainerTty_methods) Call(c *varlink.Connection) (notimplemented_out_ NotImplemented, err_ error) { -+func (m RestartContainer_methods) Call(c *varlink.Connection, name_in_ string, timeout_in_ int64) (container_out_ string, err_ error) { -+ receive, err_ := m.Send(c, 0, name_in_, timeout_in_) -+ if err_ != nil { -+ return -+ } -+ container_out_, _, err_ = receive() -+ return -+} -+ -+func (m RestartContainer_methods) Send(c *varlink.Connection, flags uint64, name_in_ string, timeout_in_ int64) (func() (string, uint64, error), error) { -+ var in struct { -+ Name string `json:"name"` -+ Timeout int64 `json:"timeout"` -+ } -+ in.Name = name_in_ -+ in.Timeout = timeout_in_ -+ receive, err := c.Send("io.projectatomic.podman.RestartContainer", in, flags) -+ if err != nil { -+ return nil, err -+ } -+ return func() (container_out_ string, flags uint64, err error) { -+ var out struct { -+ Container string `json:"container"` -+ } -+ flags, err = receive(&out) -+ if err != nil { -+ return -+ } -+ container_out_ = out.Container -+ return -+ }, nil -+} -+ -+type RenameContainer_methods struct{} -+ -+func RenameContainer() RenameContainer_methods { return RenameContainer_methods{} } -+ -+func (m RenameContainer_methods) Call(c *varlink.Connection) (notimplemented_out_ NotImplemented, err_ error) { - receive, err_ := m.Send(c, 0) - if err_ != nil { - return -@@ -1270,8 +1237,8 @@ func (m ResizeContainerTty_methods) Call(c *varlink.Connection) (notimplemented_ - return - } - --func (m ResizeContainerTty_methods) Send(c *varlink.Connection, flags uint64) (func() (NotImplemented, uint64, error), error) { -- receive, err := c.Send("io.projectatomic.podman.ResizeContainerTty", nil, flags) -+func (m RenameContainer_methods) Send(c *varlink.Connection, flags uint64) (func() (NotImplemented, uint64, error), error) { -+ receive, err := c.Send("io.projectatomic.podman.RenameContainer", nil, flags) - if err != nil { - return nil, err - } -@@ -1288,12 +1255,12 @@ func (m ResizeContainerTty_methods) Send(c *varlink.Connection, flags uint64) (f - }, nil - } - --type KillContainer_methods struct{} -+type PauseContainer_methods struct{} - --func KillContainer() KillContainer_methods { return KillContainer_methods{} } -+func PauseContainer() PauseContainer_methods { return PauseContainer_methods{} } - --func (m KillContainer_methods) Call(c *varlink.Connection, name_in_ string, signal_in_ int64) (container_out_ string, err_ error) { -- receive, err_ := m.Send(c, 0, name_in_, signal_in_) -+func (m PauseContainer_methods) Call(c *varlink.Connection, name_in_ string) (container_out_ string, err_ error) { -+ receive, err_ := m.Send(c, 0, name_in_) - if err_ != nil { - return - } -@@ -1301,14 +1268,12 @@ func (m KillContainer_methods) Call(c *varlink.Connection, name_in_ string, sign - return - } - --func (m KillContainer_methods) Send(c *varlink.Connection, flags uint64, name_in_ string, signal_in_ int64) (func() (string, uint64, error), error) { -+func (m PauseContainer_methods) Send(c *varlink.Connection, flags uint64, name_in_ string) (func() (string, uint64, error), error) { - var in struct { -- Name string `json:"name"` -- Signal int64 `json:"signal"` -+ Name string `json:"name"` - } - in.Name = name_in_ -- in.Signal = signal_in_ -- receive, err := c.Send("io.projectatomic.podman.KillContainer", in, flags) -+ receive, err := c.Send("io.projectatomic.podman.PauseContainer", in, flags) - if err != nil { - return nil, err - } -@@ -1325,185 +1290,220 @@ func (m KillContainer_methods) Send(c *varlink.Connection, flags uint64, name_in - }, nil - } - --type CreateImage_methods struct{} -+type PushImage_methods struct{} - --func CreateImage() CreateImage_methods { return CreateImage_methods{} } -+func PushImage() PushImage_methods { return PushImage_methods{} } - --func (m CreateImage_methods) Call(c *varlink.Connection) (notimplemented_out_ NotImplemented, err_ error) { -- receive, err_ := m.Send(c, 0) -+func (m PushImage_methods) Call(c *varlink.Connection, name_in_ string, tag_in_ string, tlsverify_in_ bool) (image_out_ string, err_ error) { -+ receive, err_ := m.Send(c, 0, name_in_, tag_in_, tlsverify_in_) - if err_ != nil { - return - } -- notimplemented_out_, _, err_ = receive() -+ image_out_, _, err_ = receive() - return - } - --func (m CreateImage_methods) Send(c *varlink.Connection, flags uint64) (func() (NotImplemented, uint64, error), error) { -- receive, err := c.Send("io.projectatomic.podman.CreateImage", nil, flags) -+func (m PushImage_methods) Send(c *varlink.Connection, flags uint64, name_in_ string, tag_in_ string, tlsverify_in_ bool) (func() (string, uint64, error), error) { -+ var in struct { -+ Name string `json:"name"` -+ Tag string `json:"tag"` -+ Tlsverify bool `json:"tlsverify"` -+ } -+ in.Name = name_in_ -+ in.Tag = tag_in_ -+ in.Tlsverify = tlsverify_in_ -+ receive, err := c.Send("io.projectatomic.podman.PushImage", in, flags) -+ if err != nil { -+ return nil, err -+ } -+ return func() (image_out_ string, flags uint64, err error) { -+ var out struct { -+ Image string `json:"image"` -+ } -+ flags, err = receive(&out) -+ if err != nil { -+ return -+ } -+ image_out_ = out.Image -+ return -+ }, nil -+} -+ -+type ListContainerProcesses_methods struct{} -+ -+func ListContainerProcesses() ListContainerProcesses_methods { return ListContainerProcesses_methods{} } -+ -+func (m ListContainerProcesses_methods) Call(c *varlink.Connection, name_in_ string, opts_in_ []string) (container_out_ []string, err_ error) { -+ receive, err_ := m.Send(c, 0, name_in_, opts_in_) -+ if err_ != nil { -+ return -+ } -+ container_out_, _, err_ = receive() -+ return -+} -+ -+func (m ListContainerProcesses_methods) Send(c *varlink.Connection, flags uint64, name_in_ string, opts_in_ []string) (func() ([]string, uint64, error), error) { -+ var in struct { -+ Name string `json:"name"` -+ Opts []string `json:"opts"` -+ } -+ in.Name = name_in_ -+ in.Opts = []string(opts_in_) -+ receive, err := c.Send("io.projectatomic.podman.ListContainerProcesses", in, flags) - if err != nil { - return nil, err - } -- return func() (notimplemented_out_ NotImplemented, flags uint64, err error) { -+ return func() (container_out_ []string, flags uint64, err error) { - var out struct { -- Notimplemented NotImplemented `json:"notimplemented"` -+ Container []string `json:"container"` - } - flags, err = receive(&out) - if err != nil { - return - } -- notimplemented_out_ = out.Notimplemented -+ container_out_ = []string(out.Container) - return - }, nil - } - --type GetContainerLogs_methods struct{} -+type WaitContainer_methods struct{} - --func GetContainerLogs() GetContainerLogs_methods { return GetContainerLogs_methods{} } -+func WaitContainer() WaitContainer_methods { return WaitContainer_methods{} } - --func (m GetContainerLogs_methods) Call(c *varlink.Connection, name_in_ string) (container_out_ []string, err_ error) { -+func (m WaitContainer_methods) Call(c *varlink.Connection, name_in_ string) (exitcode_out_ int64, err_ error) { - receive, err_ := m.Send(c, 0, name_in_) - if err_ != nil { - return - } -- container_out_, _, err_ = receive() -+ exitcode_out_, _, err_ = receive() - return - } - --func (m GetContainerLogs_methods) Send(c *varlink.Connection, flags uint64, name_in_ string) (func() ([]string, uint64, error), error) { -+func (m WaitContainer_methods) Send(c *varlink.Connection, flags uint64, name_in_ string) (func() (int64, uint64, error), error) { - var in struct { - Name string `json:"name"` - } - in.Name = name_in_ -- receive, err := c.Send("io.projectatomic.podman.GetContainerLogs", in, flags) -+ receive, err := c.Send("io.projectatomic.podman.WaitContainer", in, flags) - if err != nil { - return nil, err - } -- return func() (container_out_ []string, flags uint64, err error) { -+ return func() (exitcode_out_ int64, flags uint64, err error) { - var out struct { -- Container []string `json:"container"` -+ Exitcode int64 `json:"exitcode"` - } - flags, err = receive(&out) - if err != nil { - return - } -- container_out_ = []string(out.Container) -+ exitcode_out_ = out.Exitcode - return - }, nil - } - --type HistoryImage_methods struct{} -+type DeleteStoppedContainers_methods struct{} - --func HistoryImage() HistoryImage_methods { return HistoryImage_methods{} } -+func DeleteStoppedContainers() DeleteStoppedContainers_methods { -+ return DeleteStoppedContainers_methods{} -+} - --func (m HistoryImage_methods) Call(c *varlink.Connection, name_in_ string) (history_out_ []ImageHistory, err_ error) { -- receive, err_ := m.Send(c, 0, name_in_) -+func (m DeleteStoppedContainers_methods) Call(c *varlink.Connection) (containers_out_ []string, err_ error) { -+ receive, err_ := m.Send(c, 0) - if err_ != nil { - return - } -- history_out_, _, err_ = receive() -+ containers_out_, _, err_ = receive() - return - } - --func (m HistoryImage_methods) Send(c *varlink.Connection, flags uint64, name_in_ string) (func() ([]ImageHistory, uint64, error), error) { -- var in struct { -- Name string `json:"name"` -- } -- in.Name = name_in_ -- receive, err := c.Send("io.projectatomic.podman.HistoryImage", in, flags) -+func (m DeleteStoppedContainers_methods) Send(c *varlink.Connection, flags uint64) (func() ([]string, uint64, error), error) { -+ receive, err := c.Send("io.projectatomic.podman.DeleteStoppedContainers", nil, flags) - if err != nil { - return nil, err - } -- return func() (history_out_ []ImageHistory, flags uint64, err error) { -+ return func() (containers_out_ []string, flags uint64, err error) { - var out struct { -- History []ImageHistory `json:"history"` -+ Containers []string `json:"containers"` - } - flags, err = receive(&out) - if err != nil { - return - } -- history_out_ = []ImageHistory(out.History) -+ containers_out_ = []string(out.Containers) - return - }, nil - } - --type SearchImage_methods struct{} -+type TagImage_methods struct{} - --func SearchImage() SearchImage_methods { return SearchImage_methods{} } -+func TagImage() TagImage_methods { return TagImage_methods{} } - --func (m SearchImage_methods) Call(c *varlink.Connection, name_in_ string, limit_in_ int64) (images_out_ []ImageSearch, err_ error) { -- receive, err_ := m.Send(c, 0, name_in_, limit_in_) -+func (m TagImage_methods) Call(c *varlink.Connection, name_in_ string, tagged_in_ string) (image_out_ string, err_ error) { -+ receive, err_ := m.Send(c, 0, name_in_, tagged_in_) - if err_ != nil { - return - } -- images_out_, _, err_ = receive() -+ image_out_, _, err_ = receive() - return - } - --func (m SearchImage_methods) Send(c *varlink.Connection, flags uint64, name_in_ string, limit_in_ int64) (func() ([]ImageSearch, uint64, error), error) { -+func (m TagImage_methods) Send(c *varlink.Connection, flags uint64, name_in_ string, tagged_in_ string) (func() (string, uint64, error), error) { - var in struct { -- Name string `json:"name"` -- Limit int64 `json:"limit"` -+ Name string `json:"name"` -+ Tagged string `json:"tagged"` - } - in.Name = name_in_ -- in.Limit = limit_in_ -- receive, err := c.Send("io.projectatomic.podman.SearchImage", in, flags) -+ in.Tagged = tagged_in_ -+ receive, err := c.Send("io.projectatomic.podman.TagImage", in, flags) - if err != nil { - return nil, err - } -- return func() (images_out_ []ImageSearch, flags uint64, err error) { -+ return func() (image_out_ string, flags uint64, err error) { - var out struct { -- Images []ImageSearch `json:"images"` -+ Image string `json:"image"` - } - flags, err = receive(&out) - if err != nil { - return - } -- images_out_ = []ImageSearch(out.Images) -+ image_out_ = out.Image - return - }, nil - } - --type Commit_methods struct{} -+type SearchImage_methods struct{} - --func Commit() Commit_methods { return Commit_methods{} } -+func SearchImage() SearchImage_methods { return SearchImage_methods{} } - --func (m Commit_methods) Call(c *varlink.Connection, name_in_ string, image_name_in_ string, changes_in_ []string, author_in_ string, message_in_ string, pause_in_ bool) (image_out_ string, err_ error) { -- receive, err_ := m.Send(c, 0, name_in_, image_name_in_, changes_in_, author_in_, message_in_, pause_in_) -+func (m SearchImage_methods) Call(c *varlink.Connection, name_in_ string, limit_in_ int64) (images_out_ []ImageSearch, err_ error) { -+ receive, err_ := m.Send(c, 0, name_in_, limit_in_) - if err_ != nil { - return - } -- image_out_, _, err_ = receive() -+ images_out_, _, err_ = receive() - return - } - --func (m Commit_methods) Send(c *varlink.Connection, flags uint64, name_in_ string, image_name_in_ string, changes_in_ []string, author_in_ string, message_in_ string, pause_in_ bool) (func() (string, uint64, error), error) { -+func (m SearchImage_methods) Send(c *varlink.Connection, flags uint64, name_in_ string, limit_in_ int64) (func() ([]ImageSearch, uint64, error), error) { - var in struct { -- Name string `json:"name"` -- Image_name string `json:"image_name"` -- Changes []string `json:"changes"` -- Author string `json:"author"` -- Message string `json:"message"` -- Pause bool `json:"pause"` -+ Name string `json:"name"` -+ Limit int64 `json:"limit"` - } - in.Name = name_in_ -- in.Image_name = image_name_in_ -- in.Changes = []string(changes_in_) -- in.Author = author_in_ -- in.Message = message_in_ -- in.Pause = pause_in_ -- receive, err := c.Send("io.projectatomic.podman.Commit", in, flags) -+ in.Limit = limit_in_ -+ receive, err := c.Send("io.projectatomic.podman.SearchImage", in, flags) - if err != nil { - return nil, err - } -- return func() (image_out_ string, flags uint64, err error) { -+ return func() (images_out_ []ImageSearch, flags uint64, err error) { - var out struct { -- Image string `json:"image"` -+ Images []ImageSearch `json:"images"` - } - flags, err = receive(&out) - if err != nil { - return - } -- image_out_ = out.Image -+ images_out_ = []ImageSearch(out.Images) - return - }, nil - } -@@ -1511,58 +1511,50 @@ func (m Commit_methods) Send(c *varlink.Connection, flags uint64, name_in_ strin - // Service interface with all methods - type ioprojectatomicpodmanInterface interface { - GetContainerStats(c VarlinkCall, name_ string) error -- StopContainer(c VarlinkCall, name_ string, timeout_ int64) error -- RestartContainer(c VarlinkCall, name_ string, timeout_ int64) error -- ImportImage(c VarlinkCall, source_ string, reference_ string, message_ string, changes_ []string) error -- ListContainers(c VarlinkCall) error -- StartContainer(c VarlinkCall) error -+ UnpauseContainer(c VarlinkCall, name_ string) error -+ PullImage(c VarlinkCall, name_ string) error -+ ExportImage(c VarlinkCall, name_ string, destination_ string, compress_ bool) error -+ Ping(c VarlinkCall) error -+ GetVersion(c VarlinkCall) error -+ CreateContainer(c VarlinkCall) error -+ KillContainer(c VarlinkCall, name_ string, signal_ int64) error - RemoveContainer(c VarlinkCall, name_ string, force_ bool) error -- DeleteStoppedContainers(c VarlinkCall) error -+ RemoveImage(c VarlinkCall, name_ string, force_ bool) error -+ ImportImage(c VarlinkCall, source_ string, reference_ string, message_ string, changes_ []string) error - InspectContainer(c VarlinkCall, name_ string) error -+ GetContainerLogs(c VarlinkCall, name_ string) error -+ ListContainerChanges(c VarlinkCall, name_ string) error -+ RestartContainer(c VarlinkCall, name_ string, timeout_ int64) error - RenameContainer(c VarlinkCall) error -- BuildImage(c VarlinkCall) error -- Ping(c VarlinkCall) error - PauseContainer(c VarlinkCall, name_ string) error - PushImage(c VarlinkCall, name_ string, tag_ string, tlsverify_ bool) error -- ExportImage(c VarlinkCall, name_ string, destination_ string, compress_ bool) error -- PullImage(c VarlinkCall, name_ string) error -- RemoveImage(c VarlinkCall, name_ string, force_ bool) error -- GetVersion(c VarlinkCall) error -- ResizeContainerTty(c VarlinkCall) error -- KillContainer(c VarlinkCall, name_ string, signal_ int64) error -- CreateImage(c VarlinkCall) error -+ ListContainerProcesses(c VarlinkCall, name_ string, opts_ []string) error -+ WaitContainer(c VarlinkCall, name_ string) error -+ DeleteStoppedContainers(c VarlinkCall) error -+ TagImage(c VarlinkCall, name_ string, tagged_ string) error -+ SearchImage(c VarlinkCall, name_ string, limit_ int64) error -+ UpdateContainer(c VarlinkCall) error - InspectImage(c VarlinkCall, name_ string) error -- GetContainerLogs(c VarlinkCall, name_ string) error - HistoryImage(c VarlinkCall, name_ string) error -- SearchImage(c VarlinkCall, name_ string, limit_ int64) error -- Commit(c VarlinkCall, name_ string, image_name_ string, changes_ []string, author_ string, message_ string, pause_ bool) error -- WaitContainer(c VarlinkCall, name_ string) error -- DeleteUnusedImages(c VarlinkCall) error - GetInfo(c VarlinkCall) error -- GetContainer(c VarlinkCall, name_ string) error -- CreateContainer(c VarlinkCall) error -- ListContainerProcesses(c VarlinkCall, name_ string, opts_ []string) error -+ ResizeContainerTty(c VarlinkCall) error -+ StartContainer(c VarlinkCall) error -+ StopContainer(c VarlinkCall, name_ string, timeout_ int64) error - AttachToContainer(c VarlinkCall) error -- TagImage(c VarlinkCall, name_ string, tagged_ string) error -- ListContainerChanges(c VarlinkCall, name_ string) error -+ BuildImage(c VarlinkCall) error -+ CreateImage(c VarlinkCall) error -+ Commit(c VarlinkCall, name_ string, image_name_ string, changes_ []string, author_ string, message_ string, pause_ bool) error -+ ListContainers(c VarlinkCall) error -+ GetContainer(c VarlinkCall, name_ string) error - ExportContainer(c VarlinkCall, name_ string, path_ string) error -- UpdateContainer(c VarlinkCall) error -- UnpauseContainer(c VarlinkCall, name_ string) error - ListImages(c VarlinkCall) error -+ DeleteUnusedImages(c VarlinkCall) error - } - - // Service object with all methods - type VarlinkCall struct{ varlink.Call } - - // Reply methods for all varlink errors --func (c *VarlinkCall) ReplyImageNotFound(name_ string) error { -- var out struct { -- Name string `json:"name"` -- } -- out.Name = name_ -- return c.ReplyError("io.projectatomic.podman.ImageNotFound", &out) --} -- - func (c *VarlinkCall) ReplyContainerNotFound(name_ string) error { - var out struct { - Name string `json:"name"` -@@ -1587,32 +1579,40 @@ func (c *VarlinkCall) ReplyRuntimeError(reason_ string) error { - return c.ReplyError("io.projectatomic.podman.RuntimeError", &out) - } - -+func (c *VarlinkCall) ReplyImageNotFound(name_ string) error { -+ var out struct { -+ Name string `json:"name"` -+ } -+ out.Name = name_ -+ return c.ReplyError("io.projectatomic.podman.ImageNotFound", &out) -+} -+ - // Reply methods for all varlink methods --func (c *VarlinkCall) ReplyGetContainerStats(container_ ContainerStats) error { -+func (c *VarlinkCall) ReplyListContainerProcesses(container_ []string) error { - var out struct { -- Container ContainerStats `json:"container"` -+ Container []string `json:"container"` - } -- out.Container = container_ -+ out.Container = []string(container_) - return c.Reply(&out) - } - --func (c *VarlinkCall) ReplyStopContainer(container_ string) error { -+func (c *VarlinkCall) ReplyWaitContainer(exitcode_ int64) error { - var out struct { -- Container string `json:"container"` -+ Exitcode int64 `json:"exitcode"` - } -- out.Container = container_ -+ out.Exitcode = exitcode_ - return c.Reply(&out) - } - --func (c *VarlinkCall) ReplyRestartContainer(container_ string) error { -+func (c *VarlinkCall) ReplyDeleteStoppedContainers(containers_ []string) error { - var out struct { -- Container string `json:"container"` -+ Containers []string `json:"containers"` - } -- out.Container = container_ -+ out.Containers = []string(containers_) - return c.Reply(&out) - } - --func (c *VarlinkCall) ReplyImportImage(image_ string) error { -+func (c *VarlinkCall) ReplyTagImage(image_ string) error { - var out struct { - Image string `json:"image"` - } -@@ -1620,15 +1620,15 @@ func (c *VarlinkCall) ReplyImportImage(image_ string) error { - return c.Reply(&out) - } - --func (c *VarlinkCall) ReplyListContainers(containers_ []ListContainerData) error { -+func (c *VarlinkCall) ReplySearchImage(images_ []ImageSearch) error { - var out struct { -- Containers []ListContainerData `json:"containers"` -+ Images []ImageSearch `json:"images"` - } -- out.Containers = []ListContainerData(containers_) -+ out.Images = []ImageSearch(images_) - return c.Reply(&out) - } - --func (c *VarlinkCall) ReplyStartContainer(notimplemented_ NotImplemented) error { -+func (c *VarlinkCall) ReplyUpdateContainer(notimplemented_ NotImplemented) error { - var out struct { - Notimplemented NotImplemented `json:"notimplemented"` - } -@@ -1636,31 +1636,31 @@ func (c *VarlinkCall) ReplyStartContainer(notimplemented_ NotImplemented) error - return c.Reply(&out) - } - --func (c *VarlinkCall) ReplyRemoveContainer(container_ string) error { -+func (c *VarlinkCall) ReplyInspectImage(image_ string) error { - var out struct { -- Container string `json:"container"` -+ Image string `json:"image"` - } -- out.Container = container_ -+ out.Image = image_ - return c.Reply(&out) - } - --func (c *VarlinkCall) ReplyDeleteStoppedContainers(containers_ []string) error { -+func (c *VarlinkCall) ReplyAttachToContainer(notimplemented_ NotImplemented) error { - var out struct { -- Containers []string `json:"containers"` -+ Notimplemented NotImplemented `json:"notimplemented"` - } -- out.Containers = []string(containers_) -+ out.Notimplemented = notimplemented_ - return c.Reply(&out) - } - --func (c *VarlinkCall) ReplyInspectContainer(container_ string) error { -+func (c *VarlinkCall) ReplyBuildImage(notimplemented_ NotImplemented) error { - var out struct { -- Container string `json:"container"` -+ Notimplemented NotImplemented `json:"notimplemented"` - } -- out.Container = container_ -+ out.Notimplemented = notimplemented_ - return c.Reply(&out) - } - --func (c *VarlinkCall) ReplyRenameContainer(notimplemented_ NotImplemented) error { -+func (c *VarlinkCall) ReplyCreateImage(notimplemented_ NotImplemented) error { - var out struct { - Notimplemented NotImplemented `json:"notimplemented"` - } -@@ -1668,7 +1668,23 @@ func (c *VarlinkCall) ReplyRenameContainer(notimplemented_ NotImplemented) error - return c.Reply(&out) - } - --func (c *VarlinkCall) ReplyBuildImage(notimplemented_ NotImplemented) error { -+func (c *VarlinkCall) ReplyHistoryImage(history_ []ImageHistory) error { -+ var out struct { -+ History []ImageHistory `json:"history"` -+ } -+ out.History = []ImageHistory(history_) -+ return c.Reply(&out) -+} -+ -+func (c *VarlinkCall) ReplyGetInfo(info_ PodmanInfo) error { -+ var out struct { -+ Info PodmanInfo `json:"info"` -+ } -+ out.Info = info_ -+ return c.Reply(&out) -+} -+ -+func (c *VarlinkCall) ReplyResizeContainerTty(notimplemented_ NotImplemented) error { - var out struct { - Notimplemented NotImplemented `json:"notimplemented"` - } -@@ -1676,15 +1692,15 @@ func (c *VarlinkCall) ReplyBuildImage(notimplemented_ NotImplemented) error { - return c.Reply(&out) - } - --func (c *VarlinkCall) ReplyPing(ping_ StringResponse) error { -+func (c *VarlinkCall) ReplyStartContainer(notimplemented_ NotImplemented) error { - var out struct { -- Ping StringResponse `json:"ping"` -+ Notimplemented NotImplemented `json:"notimplemented"` - } -- out.Ping = ping_ -+ out.Notimplemented = notimplemented_ - return c.Reply(&out) - } - --func (c *VarlinkCall) ReplyPauseContainer(container_ string) error { -+func (c *VarlinkCall) ReplyStopContainer(container_ string) error { - var out struct { - Container string `json:"container"` - } -@@ -1692,7 +1708,7 @@ func (c *VarlinkCall) ReplyPauseContainer(container_ string) error { - return c.Reply(&out) - } - --func (c *VarlinkCall) ReplyPushImage(image_ string) error { -+func (c *VarlinkCall) ReplyCommit(image_ string) error { - var out struct { - Image string `json:"image"` - } -@@ -1700,95 +1716,95 @@ func (c *VarlinkCall) ReplyPushImage(image_ string) error { - return c.Reply(&out) - } - --func (c *VarlinkCall) ReplyExportImage(image_ string) error { -+func (c *VarlinkCall) ReplyDeleteUnusedImages(images_ []string) error { - var out struct { -- Image string `json:"image"` -+ Images []string `json:"images"` - } -- out.Image = image_ -+ out.Images = []string(images_) - return c.Reply(&out) - } - --func (c *VarlinkCall) ReplyPullImage(id_ string) error { -+func (c *VarlinkCall) ReplyListContainers(containers_ []ListContainerData) error { - var out struct { -- Id string `json:"id"` -+ Containers []ListContainerData `json:"containers"` - } -- out.Id = id_ -+ out.Containers = []ListContainerData(containers_) - return c.Reply(&out) - } - --func (c *VarlinkCall) ReplyGetVersion(version_ Version) error { -+func (c *VarlinkCall) ReplyGetContainer(container_ ListContainerData) error { - var out struct { -- Version Version `json:"version"` -+ Container ListContainerData `json:"container"` - } -- out.Version = version_ -+ out.Container = container_ - return c.Reply(&out) - } - --func (c *VarlinkCall) ReplyResizeContainerTty(notimplemented_ NotImplemented) error { -+func (c *VarlinkCall) ReplyExportContainer(tarfile_ string) error { - var out struct { -- Notimplemented NotImplemented `json:"notimplemented"` -+ Tarfile string `json:"tarfile"` - } -- out.Notimplemented = notimplemented_ -+ out.Tarfile = tarfile_ - return c.Reply(&out) - } - --func (c *VarlinkCall) ReplyKillContainer(container_ string) error { -+func (c *VarlinkCall) ReplyListImages(images_ []ImageInList) error { - var out struct { -- Container string `json:"container"` -+ Images []ImageInList `json:"images"` - } -- out.Container = container_ -+ out.Images = []ImageInList(images_) - return c.Reply(&out) - } - --func (c *VarlinkCall) ReplyCreateImage(notimplemented_ NotImplemented) error { -+func (c *VarlinkCall) ReplyGetContainerStats(container_ ContainerStats) error { - var out struct { -- Notimplemented NotImplemented `json:"notimplemented"` -+ Container ContainerStats `json:"container"` - } -- out.Notimplemented = notimplemented_ -+ out.Container = container_ - return c.Reply(&out) - } - --func (c *VarlinkCall) ReplyInspectImage(image_ string) error { -+func (c *VarlinkCall) ReplyUnpauseContainer(container_ string) error { - var out struct { -- Image string `json:"image"` -+ Container string `json:"container"` - } -- out.Image = image_ -+ out.Container = container_ - return c.Reply(&out) - } - --func (c *VarlinkCall) ReplyRemoveImage(image_ string) error { -+func (c *VarlinkCall) ReplyPullImage(id_ string) error { - var out struct { -- Image string `json:"image"` -+ Id string `json:"id"` - } -- out.Image = image_ -+ out.Id = id_ - return c.Reply(&out) - } - --func (c *VarlinkCall) ReplyGetContainerLogs(container_ []string) error { -+func (c *VarlinkCall) ReplyRemoveContainer(container_ string) error { - var out struct { -- Container []string `json:"container"` -+ Container string `json:"container"` - } -- out.Container = []string(container_) -+ out.Container = container_ - return c.Reply(&out) - } - --func (c *VarlinkCall) ReplyHistoryImage(history_ []ImageHistory) error { -+func (c *VarlinkCall) ReplyRemoveImage(image_ string) error { - var out struct { -- History []ImageHistory `json:"history"` -+ Image string `json:"image"` - } -- out.History = []ImageHistory(history_) -+ out.Image = image_ - return c.Reply(&out) - } - --func (c *VarlinkCall) ReplySearchImage(images_ []ImageSearch) error { -+func (c *VarlinkCall) ReplyImportImage(image_ string) error { - var out struct { -- Images []ImageSearch `json:"images"` -+ Image string `json:"image"` - } -- out.Images = []ImageSearch(images_) -+ out.Image = image_ - return c.Reply(&out) - } - --func (c *VarlinkCall) ReplyCommit(image_ string) error { -+func (c *VarlinkCall) ReplyExportImage(image_ string) error { - var out struct { - Image string `json:"image"` - } -@@ -1796,19 +1812,19 @@ func (c *VarlinkCall) ReplyCommit(image_ string) error { - return c.Reply(&out) - } - --func (c *VarlinkCall) ReplyGetInfo(info_ PodmanInfo) error { -+func (c *VarlinkCall) ReplyPing(ping_ StringResponse) error { - var out struct { -- Info PodmanInfo `json:"info"` -+ Ping StringResponse `json:"ping"` - } -- out.Info = info_ -+ out.Ping = ping_ - return c.Reply(&out) - } - --func (c *VarlinkCall) ReplyGetContainer(container_ ListContainerData) error { -+func (c *VarlinkCall) ReplyGetVersion(version_ Version) error { - var out struct { -- Container ListContainerData `json:"container"` -+ Version Version `json:"version"` - } -- out.Container = container_ -+ out.Version = version_ - return c.Reply(&out) - } - -@@ -1820,15 +1836,15 @@ func (c *VarlinkCall) ReplyCreateContainer(notimplemented_ NotImplemented) error - return c.Reply(&out) - } - --func (c *VarlinkCall) ReplyListContainerProcesses(container_ []string) error { -+func (c *VarlinkCall) ReplyKillContainer(container_ string) error { - var out struct { -- Container []string `json:"container"` -+ Container string `json:"container"` - } -- out.Container = []string(container_) -+ out.Container = container_ - return c.Reply(&out) - } - --func (c *VarlinkCall) ReplyAttachToContainer(notimplemented_ NotImplemented) error { -+func (c *VarlinkCall) ReplyRenameContainer(notimplemented_ NotImplemented) error { - var out struct { - Notimplemented NotImplemented `json:"notimplemented"` - } -@@ -1836,47 +1852,47 @@ func (c *VarlinkCall) ReplyAttachToContainer(notimplemented_ NotImplemented) err - return c.Reply(&out) - } - --func (c *VarlinkCall) ReplyWaitContainer(exitcode_ int64) error { -+func (c *VarlinkCall) ReplyPauseContainer(container_ string) error { - var out struct { -- Exitcode int64 `json:"exitcode"` -+ Container string `json:"container"` - } -- out.Exitcode = exitcode_ -+ out.Container = container_ - return c.Reply(&out) - } - --func (c *VarlinkCall) ReplyDeleteUnusedImages(images_ []string) error { -+func (c *VarlinkCall) ReplyPushImage(image_ string) error { - var out struct { -- Images []string `json:"images"` -+ Image string `json:"image"` - } -- out.Images = []string(images_) -+ out.Image = image_ - return c.Reply(&out) - } - --func (c *VarlinkCall) ReplyListContainerChanges(container_ ContainerChanges) error { -+func (c *VarlinkCall) ReplyInspectContainer(container_ string) error { - var out struct { -- Container ContainerChanges `json:"container"` -+ Container string `json:"container"` - } - out.Container = container_ - return c.Reply(&out) - } - --func (c *VarlinkCall) ReplyExportContainer(tarfile_ string) error { -+func (c *VarlinkCall) ReplyGetContainerLogs(container_ []string) error { - var out struct { -- Tarfile string `json:"tarfile"` -+ Container []string `json:"container"` - } -- out.Tarfile = tarfile_ -+ out.Container = []string(container_) - return c.Reply(&out) - } - --func (c *VarlinkCall) ReplyUpdateContainer(notimplemented_ NotImplemented) error { -+func (c *VarlinkCall) ReplyListContainerChanges(container_ ContainerChanges) error { - var out struct { -- Notimplemented NotImplemented `json:"notimplemented"` -+ Container ContainerChanges `json:"container"` - } -- out.Notimplemented = notimplemented_ -+ out.Container = container_ - return c.Reply(&out) - } - --func (c *VarlinkCall) ReplyUnpauseContainer(container_ string) error { -+func (c *VarlinkCall) ReplyRestartContainer(container_ string) error { - var out struct { - Container string `json:"container"` - } -@@ -1884,213 +1900,204 @@ func (c *VarlinkCall) ReplyUnpauseContainer(container_ string) error { - return c.Reply(&out) - } - --func (c *VarlinkCall) ReplyListImages(images_ []ImageInList) error { -- var out struct { -- Images []ImageInList `json:"images"` -- } -- out.Images = []ImageInList(images_) -- return c.Reply(&out) --} -- --func (c *VarlinkCall) ReplyTagImage(image_ string) error { -- var out struct { -- Image string `json:"image"` -- } -- out.Image = image_ -- return c.Reply(&out) --} -- - // Dummy implementations for all varlink methods --func (s *VarlinkInterface) Ping(c VarlinkCall) error { -- return c.ReplyMethodNotImplemented("io.projectatomic.podman.Ping") -+func (s *VarlinkInterface) UpdateContainer(c VarlinkCall) error { -+ return c.ReplyMethodNotImplemented("io.projectatomic.podman.UpdateContainer") - } - --func (s *VarlinkInterface) PauseContainer(c VarlinkCall, name_ string) error { -- return c.ReplyMethodNotImplemented("io.projectatomic.podman.PauseContainer") -+func (s *VarlinkInterface) InspectImage(c VarlinkCall, name_ string) error { -+ return c.ReplyMethodNotImplemented("io.projectatomic.podman.InspectImage") - } - --func (s *VarlinkInterface) PushImage(c VarlinkCall, name_ string, tag_ string, tlsverify_ bool) error { -- return c.ReplyMethodNotImplemented("io.projectatomic.podman.PushImage") -+func (s *VarlinkInterface) GetInfo(c VarlinkCall) error { -+ return c.ReplyMethodNotImplemented("io.projectatomic.podman.GetInfo") - } - --func (s *VarlinkInterface) ExportImage(c VarlinkCall, name_ string, destination_ string, compress_ bool) error { -- return c.ReplyMethodNotImplemented("io.projectatomic.podman.ExportImage") -+func (s *VarlinkInterface) ResizeContainerTty(c VarlinkCall) error { -+ return c.ReplyMethodNotImplemented("io.projectatomic.podman.ResizeContainerTty") - } - --func (s *VarlinkInterface) PullImage(c VarlinkCall, name_ string) error { -- return c.ReplyMethodNotImplemented("io.projectatomic.podman.PullImage") -+func (s *VarlinkInterface) StartContainer(c VarlinkCall) error { -+ return c.ReplyMethodNotImplemented("io.projectatomic.podman.StartContainer") - } - --func (s *VarlinkInterface) GetVersion(c VarlinkCall) error { -- return c.ReplyMethodNotImplemented("io.projectatomic.podman.GetVersion") -+func (s *VarlinkInterface) StopContainer(c VarlinkCall, name_ string, timeout_ int64) error { -+ return c.ReplyMethodNotImplemented("io.projectatomic.podman.StopContainer") - } - --func (s *VarlinkInterface) ResizeContainerTty(c VarlinkCall) error { -- return c.ReplyMethodNotImplemented("io.projectatomic.podman.ResizeContainerTty") -+func (s *VarlinkInterface) AttachToContainer(c VarlinkCall) error { -+ return c.ReplyMethodNotImplemented("io.projectatomic.podman.AttachToContainer") - } - --func (s *VarlinkInterface) KillContainer(c VarlinkCall, name_ string, signal_ int64) error { -- return c.ReplyMethodNotImplemented("io.projectatomic.podman.KillContainer") -+func (s *VarlinkInterface) BuildImage(c VarlinkCall) error { -+ return c.ReplyMethodNotImplemented("io.projectatomic.podman.BuildImage") - } - - func (s *VarlinkInterface) CreateImage(c VarlinkCall) error { - return c.ReplyMethodNotImplemented("io.projectatomic.podman.CreateImage") - } - --func (s *VarlinkInterface) InspectImage(c VarlinkCall, name_ string) error { -- return c.ReplyMethodNotImplemented("io.projectatomic.podman.InspectImage") -+func (s *VarlinkInterface) HistoryImage(c VarlinkCall, name_ string) error { -+ return c.ReplyMethodNotImplemented("io.projectatomic.podman.HistoryImage") - } - --func (s *VarlinkInterface) RemoveImage(c VarlinkCall, name_ string, force_ bool) error { -- return c.ReplyMethodNotImplemented("io.projectatomic.podman.RemoveImage") -+func (s *VarlinkInterface) Commit(c VarlinkCall, name_ string, image_name_ string, changes_ []string, author_ string, message_ string, pause_ bool) error { -+ return c.ReplyMethodNotImplemented("io.projectatomic.podman.Commit") - } - --func (s *VarlinkInterface) GetContainerLogs(c VarlinkCall, name_ string) error { -- return c.ReplyMethodNotImplemented("io.projectatomic.podman.GetContainerLogs") -+func (s *VarlinkInterface) ListContainers(c VarlinkCall) error { -+ return c.ReplyMethodNotImplemented("io.projectatomic.podman.ListContainers") - } - --func (s *VarlinkInterface) HistoryImage(c VarlinkCall, name_ string) error { -- return c.ReplyMethodNotImplemented("io.projectatomic.podman.HistoryImage") -+func (s *VarlinkInterface) GetContainer(c VarlinkCall, name_ string) error { -+ return c.ReplyMethodNotImplemented("io.projectatomic.podman.GetContainer") - } - --func (s *VarlinkInterface) SearchImage(c VarlinkCall, name_ string, limit_ int64) error { -- return c.ReplyMethodNotImplemented("io.projectatomic.podman.SearchImage") -+func (s *VarlinkInterface) ExportContainer(c VarlinkCall, name_ string, path_ string) error { -+ return c.ReplyMethodNotImplemented("io.projectatomic.podman.ExportContainer") - } - --func (s *VarlinkInterface) Commit(c VarlinkCall, name_ string, image_name_ string, changes_ []string, author_ string, message_ string, pause_ bool) error { -- return c.ReplyMethodNotImplemented("io.projectatomic.podman.Commit") -+func (s *VarlinkInterface) ListImages(c VarlinkCall) error { -+ return c.ReplyMethodNotImplemented("io.projectatomic.podman.ListImages") - } - --func (s *VarlinkInterface) GetInfo(c VarlinkCall) error { -- return c.ReplyMethodNotImplemented("io.projectatomic.podman.GetInfo") -+func (s *VarlinkInterface) DeleteUnusedImages(c VarlinkCall) error { -+ return c.ReplyMethodNotImplemented("io.projectatomic.podman.DeleteUnusedImages") - } - --func (s *VarlinkInterface) GetContainer(c VarlinkCall, name_ string) error { -- return c.ReplyMethodNotImplemented("io.projectatomic.podman.GetContainer") -+func (s *VarlinkInterface) GetContainerStats(c VarlinkCall, name_ string) error { -+ return c.ReplyMethodNotImplemented("io.projectatomic.podman.GetContainerStats") - } - --func (s *VarlinkInterface) CreateContainer(c VarlinkCall) error { -- return c.ReplyMethodNotImplemented("io.projectatomic.podman.CreateContainer") -+func (s *VarlinkInterface) UnpauseContainer(c VarlinkCall, name_ string) error { -+ return c.ReplyMethodNotImplemented("io.projectatomic.podman.UnpauseContainer") - } - --func (s *VarlinkInterface) ListContainerProcesses(c VarlinkCall, name_ string, opts_ []string) error { -- return c.ReplyMethodNotImplemented("io.projectatomic.podman.ListContainerProcesses") -+func (s *VarlinkInterface) PullImage(c VarlinkCall, name_ string) error { -+ return c.ReplyMethodNotImplemented("io.projectatomic.podman.PullImage") - } - --func (s *VarlinkInterface) AttachToContainer(c VarlinkCall) error { -- return c.ReplyMethodNotImplemented("io.projectatomic.podman.AttachToContainer") -+func (s *VarlinkInterface) Ping(c VarlinkCall) error { -+ return c.ReplyMethodNotImplemented("io.projectatomic.podman.Ping") - } - --func (s *VarlinkInterface) WaitContainer(c VarlinkCall, name_ string) error { -- return c.ReplyMethodNotImplemented("io.projectatomic.podman.WaitContainer") -+func (s *VarlinkInterface) GetVersion(c VarlinkCall) error { -+ return c.ReplyMethodNotImplemented("io.projectatomic.podman.GetVersion") - } - --func (s *VarlinkInterface) DeleteUnusedImages(c VarlinkCall) error { -- return c.ReplyMethodNotImplemented("io.projectatomic.podman.DeleteUnusedImages") -+func (s *VarlinkInterface) CreateContainer(c VarlinkCall) error { -+ return c.ReplyMethodNotImplemented("io.projectatomic.podman.CreateContainer") - } - --func (s *VarlinkInterface) ListContainerChanges(c VarlinkCall, name_ string) error { -- return c.ReplyMethodNotImplemented("io.projectatomic.podman.ListContainerChanges") -+func (s *VarlinkInterface) KillContainer(c VarlinkCall, name_ string, signal_ int64) error { -+ return c.ReplyMethodNotImplemented("io.projectatomic.podman.KillContainer") - } - --func (s *VarlinkInterface) ExportContainer(c VarlinkCall, name_ string, path_ string) error { -- return c.ReplyMethodNotImplemented("io.projectatomic.podman.ExportContainer") -+func (s *VarlinkInterface) RemoveContainer(c VarlinkCall, name_ string, force_ bool) error { -+ return c.ReplyMethodNotImplemented("io.projectatomic.podman.RemoveContainer") - } - --func (s *VarlinkInterface) UpdateContainer(c VarlinkCall) error { -- return c.ReplyMethodNotImplemented("io.projectatomic.podman.UpdateContainer") -+func (s *VarlinkInterface) RemoveImage(c VarlinkCall, name_ string, force_ bool) error { -+ return c.ReplyMethodNotImplemented("io.projectatomic.podman.RemoveImage") - } - --func (s *VarlinkInterface) UnpauseContainer(c VarlinkCall, name_ string) error { -- return c.ReplyMethodNotImplemented("io.projectatomic.podman.UnpauseContainer") -+func (s *VarlinkInterface) ImportImage(c VarlinkCall, source_ string, reference_ string, message_ string, changes_ []string) error { -+ return c.ReplyMethodNotImplemented("io.projectatomic.podman.ImportImage") - } - --func (s *VarlinkInterface) ListImages(c VarlinkCall) error { -- return c.ReplyMethodNotImplemented("io.projectatomic.podman.ListImages") -+func (s *VarlinkInterface) ExportImage(c VarlinkCall, name_ string, destination_ string, compress_ bool) error { -+ return c.ReplyMethodNotImplemented("io.projectatomic.podman.ExportImage") - } - --func (s *VarlinkInterface) TagImage(c VarlinkCall, name_ string, tagged_ string) error { -- return c.ReplyMethodNotImplemented("io.projectatomic.podman.TagImage") -+func (s *VarlinkInterface) InspectContainer(c VarlinkCall, name_ string) error { -+ return c.ReplyMethodNotImplemented("io.projectatomic.podman.InspectContainer") - } - --func (s *VarlinkInterface) GetContainerStats(c VarlinkCall, name_ string) error { -- return c.ReplyMethodNotImplemented("io.projectatomic.podman.GetContainerStats") -+func (s *VarlinkInterface) GetContainerLogs(c VarlinkCall, name_ string) error { -+ return c.ReplyMethodNotImplemented("io.projectatomic.podman.GetContainerLogs") - } - --func (s *VarlinkInterface) StopContainer(c VarlinkCall, name_ string, timeout_ int64) error { -- return c.ReplyMethodNotImplemented("io.projectatomic.podman.StopContainer") -+func (s *VarlinkInterface) ListContainerChanges(c VarlinkCall, name_ string) error { -+ return c.ReplyMethodNotImplemented("io.projectatomic.podman.ListContainerChanges") - } - - func (s *VarlinkInterface) RestartContainer(c VarlinkCall, name_ string, timeout_ int64) error { - return c.ReplyMethodNotImplemented("io.projectatomic.podman.RestartContainer") - } - --func (s *VarlinkInterface) ImportImage(c VarlinkCall, source_ string, reference_ string, message_ string, changes_ []string) error { -- return c.ReplyMethodNotImplemented("io.projectatomic.podman.ImportImage") -+func (s *VarlinkInterface) RenameContainer(c VarlinkCall) error { -+ return c.ReplyMethodNotImplemented("io.projectatomic.podman.RenameContainer") -+} -+ -+func (s *VarlinkInterface) PauseContainer(c VarlinkCall, name_ string) error { -+ return c.ReplyMethodNotImplemented("io.projectatomic.podman.PauseContainer") - } - --func (s *VarlinkInterface) ListContainers(c VarlinkCall) error { -- return c.ReplyMethodNotImplemented("io.projectatomic.podman.ListContainers") -+func (s *VarlinkInterface) PushImage(c VarlinkCall, name_ string, tag_ string, tlsverify_ bool) error { -+ return c.ReplyMethodNotImplemented("io.projectatomic.podman.PushImage") - } - --func (s *VarlinkInterface) StartContainer(c VarlinkCall) error { -- return c.ReplyMethodNotImplemented("io.projectatomic.podman.StartContainer") -+func (s *VarlinkInterface) ListContainerProcesses(c VarlinkCall, name_ string, opts_ []string) error { -+ return c.ReplyMethodNotImplemented("io.projectatomic.podman.ListContainerProcesses") - } - --func (s *VarlinkInterface) RemoveContainer(c VarlinkCall, name_ string, force_ bool) error { -- return c.ReplyMethodNotImplemented("io.projectatomic.podman.RemoveContainer") -+func (s *VarlinkInterface) WaitContainer(c VarlinkCall, name_ string) error { -+ return c.ReplyMethodNotImplemented("io.projectatomic.podman.WaitContainer") - } - - func (s *VarlinkInterface) DeleteStoppedContainers(c VarlinkCall) error { - return c.ReplyMethodNotImplemented("io.projectatomic.podman.DeleteStoppedContainers") - } - --func (s *VarlinkInterface) InspectContainer(c VarlinkCall, name_ string) error { -- return c.ReplyMethodNotImplemented("io.projectatomic.podman.InspectContainer") --} -- --func (s *VarlinkInterface) RenameContainer(c VarlinkCall) error { -- return c.ReplyMethodNotImplemented("io.projectatomic.podman.RenameContainer") -+func (s *VarlinkInterface) TagImage(c VarlinkCall, name_ string, tagged_ string) error { -+ return c.ReplyMethodNotImplemented("io.projectatomic.podman.TagImage") - } - --func (s *VarlinkInterface) BuildImage(c VarlinkCall) error { -- return c.ReplyMethodNotImplemented("io.projectatomic.podman.BuildImage") -+func (s *VarlinkInterface) SearchImage(c VarlinkCall, name_ string, limit_ int64) error { -+ return c.ReplyMethodNotImplemented("io.projectatomic.podman.SearchImage") - } - - // Method call dispatcher - func (s *VarlinkInterface) VarlinkDispatch(call varlink.Call, methodname string) error { - switch methodname { -- case "GetContainerStats": -+ case "GetVersion": -+ return s.ioprojectatomicpodmanInterface.GetVersion(VarlinkCall{call}) -+ -+ case "CreateContainer": -+ return s.ioprojectatomicpodmanInterface.CreateContainer(VarlinkCall{call}) -+ -+ case "KillContainer": - var in struct { -- Name string `json:"name"` -+ Name string `json:"name"` -+ Signal int64 `json:"signal"` - } - err := call.GetParameters(&in) - if err != nil { - return call.ReplyInvalidParameter("parameters") - } -- return s.ioprojectatomicpodmanInterface.GetContainerStats(VarlinkCall{call}, in.Name) -+ return s.ioprojectatomicpodmanInterface.KillContainer(VarlinkCall{call}, in.Name, in.Signal) - -- case "StopContainer": -+ case "RemoveContainer": - var in struct { -- Name string `json:"name"` -- Timeout int64 `json:"timeout"` -+ Name string `json:"name"` -+ Force bool `json:"force"` - } - err := call.GetParameters(&in) - if err != nil { - return call.ReplyInvalidParameter("parameters") - } -- return s.ioprojectatomicpodmanInterface.StopContainer(VarlinkCall{call}, in.Name, in.Timeout) -+ return s.ioprojectatomicpodmanInterface.RemoveContainer(VarlinkCall{call}, in.Name, in.Force) - -- case "RestartContainer": -+ case "RemoveImage": - var in struct { -- Name string `json:"name"` -- Timeout int64 `json:"timeout"` -+ Name string `json:"name"` -+ Force bool `json:"force"` - } - err := call.GetParameters(&in) - if err != nil { - return call.ReplyInvalidParameter("parameters") - } -- return s.ioprojectatomicpodmanInterface.RestartContainer(VarlinkCall{call}, in.Name, in.Timeout) -+ return s.ioprojectatomicpodmanInterface.RemoveImage(VarlinkCall{call}, in.Name, in.Force) - - case "ImportImage": - var in struct { -@@ -2105,27 +2112,22 @@ func (s *VarlinkInterface) VarlinkDispatch(call varlink.Call, methodname string) - } - return s.ioprojectatomicpodmanInterface.ImportImage(VarlinkCall{call}, in.Source, in.Reference, in.Message, []string(in.Changes)) - -- case "ListContainers": -- return s.ioprojectatomicpodmanInterface.ListContainers(VarlinkCall{call}) -- -- case "StartContainer": -- return s.ioprojectatomicpodmanInterface.StartContainer(VarlinkCall{call}) -- -- case "RemoveContainer": -+ case "ExportImage": - var in struct { -- Name string `json:"name"` -- Force bool `json:"force"` -+ Name string `json:"name"` -+ Destination string `json:"destination"` -+ Compress bool `json:"compress"` - } - err := call.GetParameters(&in) - if err != nil { - return call.ReplyInvalidParameter("parameters") - } -- return s.ioprojectatomicpodmanInterface.RemoveContainer(VarlinkCall{call}, in.Name, in.Force) -+ return s.ioprojectatomicpodmanInterface.ExportImage(VarlinkCall{call}, in.Name, in.Destination, in.Compress) - -- case "DeleteStoppedContainers": -- return s.ioprojectatomicpodmanInterface.DeleteStoppedContainers(VarlinkCall{call}) -+ case "Ping": -+ return s.ioprojectatomicpodmanInterface.Ping(VarlinkCall{call}) - -- case "InspectContainer": -+ case "GetContainerLogs": - var in struct { - Name string `json:"name"` - } -@@ -2133,15 +2135,9 @@ func (s *VarlinkInterface) VarlinkDispatch(call varlink.Call, methodname string) - if err != nil { - return call.ReplyInvalidParameter("parameters") - } -- return s.ioprojectatomicpodmanInterface.InspectContainer(VarlinkCall{call}, in.Name) -- -- case "RenameContainer": -- return s.ioprojectatomicpodmanInterface.RenameContainer(VarlinkCall{call}) -- -- case "BuildImage": -- return s.ioprojectatomicpodmanInterface.BuildImage(VarlinkCall{call}) -+ return s.ioprojectatomicpodmanInterface.GetContainerLogs(VarlinkCall{call}, in.Name) - -- case "PullImage": -+ case "ListContainerChanges": - var in struct { - Name string `json:"name"` - } -@@ -2149,10 +2145,21 @@ func (s *VarlinkInterface) VarlinkDispatch(call varlink.Call, methodname string) - if err != nil { - return call.ReplyInvalidParameter("parameters") - } -- return s.ioprojectatomicpodmanInterface.PullImage(VarlinkCall{call}, in.Name) -+ return s.ioprojectatomicpodmanInterface.ListContainerChanges(VarlinkCall{call}, in.Name) - -- case "Ping": -- return s.ioprojectatomicpodmanInterface.Ping(VarlinkCall{call}) -+ case "RestartContainer": -+ var in struct { -+ Name string `json:"name"` -+ Timeout int64 `json:"timeout"` -+ } -+ err := call.GetParameters(&in) -+ if err != nil { -+ return call.ReplyInvalidParameter("parameters") -+ } -+ return s.ioprojectatomicpodmanInterface.RestartContainer(VarlinkCall{call}, in.Name, in.Timeout) -+ -+ case "RenameContainer": -+ return s.ioprojectatomicpodmanInterface.RenameContainer(VarlinkCall{call}) - - case "PauseContainer": - var in struct { -@@ -2176,19 +2183,17 @@ func (s *VarlinkInterface) VarlinkDispatch(call varlink.Call, methodname string) - } - return s.ioprojectatomicpodmanInterface.PushImage(VarlinkCall{call}, in.Name, in.Tag, in.Tlsverify) - -- case "ExportImage": -+ case "InspectContainer": - var in struct { -- Name string `json:"name"` -- Destination string `json:"destination"` -- Compress bool `json:"compress"` -+ Name string `json:"name"` - } - err := call.GetParameters(&in) - if err != nil { - return call.ReplyInvalidParameter("parameters") - } -- return s.ioprojectatomicpodmanInterface.ExportImage(VarlinkCall{call}, in.Name, in.Destination, in.Compress) -+ return s.ioprojectatomicpodmanInterface.InspectContainer(VarlinkCall{call}, in.Name) - -- case "InspectImage": -+ case "WaitContainer": - var in struct { - Name string `json:"name"` - } -@@ -2196,40 +2201,45 @@ func (s *VarlinkInterface) VarlinkDispatch(call varlink.Call, methodname string) - if err != nil { - return call.ReplyInvalidParameter("parameters") - } -- return s.ioprojectatomicpodmanInterface.InspectImage(VarlinkCall{call}, in.Name) -+ return s.ioprojectatomicpodmanInterface.WaitContainer(VarlinkCall{call}, in.Name) - -- case "RemoveImage": -+ case "DeleteStoppedContainers": -+ return s.ioprojectatomicpodmanInterface.DeleteStoppedContainers(VarlinkCall{call}) -+ -+ case "TagImage": - var in struct { -- Name string `json:"name"` -- Force bool `json:"force"` -+ Name string `json:"name"` -+ Tagged string `json:"tagged"` - } - err := call.GetParameters(&in) - if err != nil { - return call.ReplyInvalidParameter("parameters") - } -- return s.ioprojectatomicpodmanInterface.RemoveImage(VarlinkCall{call}, in.Name, in.Force) -- -- case "GetVersion": -- return s.ioprojectatomicpodmanInterface.GetVersion(VarlinkCall{call}) -- -- case "ResizeContainerTty": -- return s.ioprojectatomicpodmanInterface.ResizeContainerTty(VarlinkCall{call}) -+ return s.ioprojectatomicpodmanInterface.TagImage(VarlinkCall{call}, in.Name, in.Tagged) - -- case "KillContainer": -+ case "ListContainerProcesses": - var in struct { -- Name string `json:"name"` -- Signal int64 `json:"signal"` -+ Name string `json:"name"` -+ Opts []string `json:"opts"` - } - err := call.GetParameters(&in) - if err != nil { - return call.ReplyInvalidParameter("parameters") - } -- return s.ioprojectatomicpodmanInterface.KillContainer(VarlinkCall{call}, in.Name, in.Signal) -+ return s.ioprojectatomicpodmanInterface.ListContainerProcesses(VarlinkCall{call}, in.Name, []string(in.Opts)) - -- case "CreateImage": -- return s.ioprojectatomicpodmanInterface.CreateImage(VarlinkCall{call}) -+ case "SearchImage": -+ var in struct { -+ Name string `json:"name"` -+ Limit int64 `json:"limit"` -+ } -+ err := call.GetParameters(&in) -+ if err != nil { -+ return call.ReplyInvalidParameter("parameters") -+ } -+ return s.ioprojectatomicpodmanInterface.SearchImage(VarlinkCall{call}, in.Name, in.Limit) - -- case "GetContainerLogs": -+ case "InspectImage": - var in struct { - Name string `json:"name"` - } -@@ -2237,28 +2247,49 @@ func (s *VarlinkInterface) VarlinkDispatch(call varlink.Call, methodname string) - if err != nil { - return call.ReplyInvalidParameter("parameters") - } -- return s.ioprojectatomicpodmanInterface.GetContainerLogs(VarlinkCall{call}, in.Name) -+ return s.ioprojectatomicpodmanInterface.InspectImage(VarlinkCall{call}, in.Name) - -- case "HistoryImage": -+ case "UpdateContainer": -+ return s.ioprojectatomicpodmanInterface.UpdateContainer(VarlinkCall{call}) -+ -+ case "ResizeContainerTty": -+ return s.ioprojectatomicpodmanInterface.ResizeContainerTty(VarlinkCall{call}) -+ -+ case "StartContainer": -+ return s.ioprojectatomicpodmanInterface.StartContainer(VarlinkCall{call}) -+ -+ case "StopContainer": - var in struct { -- Name string `json:"name"` -+ Name string `json:"name"` -+ Timeout int64 `json:"timeout"` - } - err := call.GetParameters(&in) - if err != nil { - return call.ReplyInvalidParameter("parameters") - } -- return s.ioprojectatomicpodmanInterface.HistoryImage(VarlinkCall{call}, in.Name) -+ return s.ioprojectatomicpodmanInterface.StopContainer(VarlinkCall{call}, in.Name, in.Timeout) - -- case "SearchImage": -+ case "AttachToContainer": -+ return s.ioprojectatomicpodmanInterface.AttachToContainer(VarlinkCall{call}) -+ -+ case "BuildImage": -+ return s.ioprojectatomicpodmanInterface.BuildImage(VarlinkCall{call}) -+ -+ case "CreateImage": -+ return s.ioprojectatomicpodmanInterface.CreateImage(VarlinkCall{call}) -+ -+ case "HistoryImage": - var in struct { -- Name string `json:"name"` -- Limit int64 `json:"limit"` -+ Name string `json:"name"` - } - err := call.GetParameters(&in) - if err != nil { - return call.ReplyInvalidParameter("parameters") - } -- return s.ioprojectatomicpodmanInterface.SearchImage(VarlinkCall{call}, in.Name, in.Limit) -+ return s.ioprojectatomicpodmanInterface.HistoryImage(VarlinkCall{call}, in.Name) -+ -+ case "GetInfo": -+ return s.ioprojectatomicpodmanInterface.GetInfo(VarlinkCall{call}) - - case "Commit": - var in struct { -@@ -2275,25 +2306,6 @@ func (s *VarlinkInterface) VarlinkDispatch(call varlink.Call, methodname string) - } - return s.ioprojectatomicpodmanInterface.Commit(VarlinkCall{call}, in.Name, in.Image_name, []string(in.Changes), in.Author, in.Message, in.Pause) - -- case "AttachToContainer": -- return s.ioprojectatomicpodmanInterface.AttachToContainer(VarlinkCall{call}) -- -- case "WaitContainer": -- var in struct { -- Name string `json:"name"` -- } -- err := call.GetParameters(&in) -- if err != nil { -- return call.ReplyInvalidParameter("parameters") -- } -- return s.ioprojectatomicpodmanInterface.WaitContainer(VarlinkCall{call}, in.Name) -- -- case "DeleteUnusedImages": -- return s.ioprojectatomicpodmanInterface.DeleteUnusedImages(VarlinkCall{call}) -- -- case "GetInfo": -- return s.ioprojectatomicpodmanInterface.GetInfo(VarlinkCall{call}) -- - case "GetContainer": - var in struct { - Name string `json:"name"` -@@ -2304,35 +2316,27 @@ func (s *VarlinkInterface) VarlinkDispatch(call varlink.Call, methodname string) - } - return s.ioprojectatomicpodmanInterface.GetContainer(VarlinkCall{call}, in.Name) - -- case "CreateContainer": -- return s.ioprojectatomicpodmanInterface.CreateContainer(VarlinkCall{call}) -- -- case "ListContainerProcesses": -+ case "ExportContainer": - var in struct { -- Name string `json:"name"` -- Opts []string `json:"opts"` -+ Name string `json:"name"` -+ Path string `json:"path"` - } - err := call.GetParameters(&in) - if err != nil { - return call.ReplyInvalidParameter("parameters") - } -- return s.ioprojectatomicpodmanInterface.ListContainerProcesses(VarlinkCall{call}, in.Name, []string(in.Opts)) -+ return s.ioprojectatomicpodmanInterface.ExportContainer(VarlinkCall{call}, in.Name, in.Path) - - case "ListImages": - return s.ioprojectatomicpodmanInterface.ListImages(VarlinkCall{call}) - -- case "TagImage": -- var in struct { -- Name string `json:"name"` -- Tagged string `json:"tagged"` -- } -- err := call.GetParameters(&in) -- if err != nil { -- return call.ReplyInvalidParameter("parameters") -- } -- return s.ioprojectatomicpodmanInterface.TagImage(VarlinkCall{call}, in.Name, in.Tagged) -+ case "DeleteUnusedImages": -+ return s.ioprojectatomicpodmanInterface.DeleteUnusedImages(VarlinkCall{call}) - -- case "ListContainerChanges": -+ case "ListContainers": -+ return s.ioprojectatomicpodmanInterface.ListContainers(VarlinkCall{call}) -+ -+ case "UnpauseContainer": - var in struct { - Name string `json:"name"` - } -@@ -2340,23 +2344,19 @@ func (s *VarlinkInterface) VarlinkDispatch(call varlink.Call, methodname string) - if err != nil { - return call.ReplyInvalidParameter("parameters") - } -- return s.ioprojectatomicpodmanInterface.ListContainerChanges(VarlinkCall{call}, in.Name) -+ return s.ioprojectatomicpodmanInterface.UnpauseContainer(VarlinkCall{call}, in.Name) - -- case "ExportContainer": -+ case "PullImage": - var in struct { - Name string `json:"name"` -- Path string `json:"path"` - } - err := call.GetParameters(&in) - if err != nil { - return call.ReplyInvalidParameter("parameters") - } -- return s.ioprojectatomicpodmanInterface.ExportContainer(VarlinkCall{call}, in.Name, in.Path) -- -- case "UpdateContainer": -- return s.ioprojectatomicpodmanInterface.UpdateContainer(VarlinkCall{call}) -+ return s.ioprojectatomicpodmanInterface.PullImage(VarlinkCall{call}, in.Name) - -- case "UnpauseContainer": -+ case "GetContainerStats": - var in struct { - Name string `json:"name"` - } -@@ -2364,7 +2364,7 @@ func (s *VarlinkInterface) VarlinkDispatch(call varlink.Call, methodname string) - if err != nil { - return call.ReplyInvalidParameter("parameters") - } -- return s.ioprojectatomicpodmanInterface.UnpauseContainer(VarlinkCall{call}, in.Name) -+ return s.ioprojectatomicpodmanInterface.GetContainerStats(VarlinkCall{call}, in.Name) - - default: - return call.ReplyMethodNotFound(methodname) -@@ -2556,7 +2556,7 @@ type PodmanInfo ( - # Ping provides a response for developers to ensure their varlink setup is working. - # #### Example - # ~~~ --# $ varlink call -m unix:/run/io.projectatomic.podman/io.projectatomic.podman.Ping -+# $ varlink call -m unix:/run/podman/io.projectatomic.podman/io.projectatomic.podman.Ping - # { - # "ping": { - # "message": "OK" -@@ -2596,7 +2596,7 @@ method InspectContainer(name: string) -> (container: string) - # error will be returned. - # #### Example - # ~~~ --# $ varlink call -m unix:/run/io.projectatomic.podman/io.projectatomic.podman.ListContainerProcesses '{"name": "135d71b9495f", "opts": []}' -+# $ varlink call -m unix:/run/podman/io.projectatomic.podman/io.projectatomic.podman.ListContainerProcesses '{"name": "135d71b9495f", "opts": []}' - # { - # "container": [ - # " UID PID PPID C STIME TTY TIME CMD", -@@ -2630,7 +2630,7 @@ method ExportContainer(name: string, path: string) -> (tarfile: string) - # [ContainerNotFound](#ContainerNotFound) error will be returned. - # #### Example - # ~~~ --# $ varlink call -m unix:/run/io.projectatomic.podman/io.projectatomic.podman.GetContainerStats '{"name": "c33e4164f384"}' -+# $ varlink call -m unix:/run/podman/io.projectatomic.podman/io.projectatomic.podman.GetContainerStats '{"name": "c33e4164f384"}' - # { - # "container": { - # "block_input": 0, -@@ -2663,7 +2663,7 @@ method StartContainer() -> (notimplemented: NotImplemented) - # error will be returned instead. See also [KillContainer](KillContainer). - # #### Error - # ~~~ --# $ varlink call -m unix:/run/io.projectatomic.podman/io.projectatomic.podman.StopContainer '{"name": "135d71b9495f", "timeout": 5}' -+# $ varlink call -m unix:/run/podman/io.projectatomic.podman/io.projectatomic.podman.StopContainer '{"name": "135d71b9495f", "timeout": 5}' - # { - # "container": "135d71b9495f7c3967f536edad57750bfdb569336cd107d8aabab45565ffcfb6" - # } -@@ -2710,7 +2710,7 @@ method WaitContainer(name: string) -> (exitcode: int) - # container cannot be found by name or ID, an [ContainerNotFound](#ContainerNotFound) error will be returned. - # #### Error - # ~~~ --# $ varlink call -m unix:/run/io.projectatomic.podman/io.projectatomic.podman.RemoveContainer '{"name": "62f4fd98cb57"}' -+# $ varlink call -m unix:/run/podman/io.projectatomic.podman/io.projectatomic.podman.RemoveContainer '{"name": "62f4fd98cb57"}' - # { - # "container": "62f4fd98cb57f529831e8f90610e54bba74bd6f02920ffb485e15376ed365c20" - # } -@@ -2755,7 +2755,7 @@ method TagImage(name: string, tagged: string) -> (image: string) - # ID of the removed image is returned when complete. See also [DeleteUnusedImages](DeleteUnusedImages). - # #### Example - # ~~~ --# varlink call -m unix:/run/io.projectatomic.podman/io.projectatomic.podman.RemoveImage '{"name": "registry.fedoraproject.org/fedora", "force": true}' -+# varlink call -m unix:/run/podman/io.projectatomic.podman/io.projectatomic.podman.RemoveImage '{"name": "registry.fedoraproject.org/fedora", "force": true}' - # { - # "image": "426866d6fa419873f97e5cbd320eeb22778244c1dfffa01c944db3114f55772e" - # } -@@ -2793,7 +2793,7 @@ method ExportImage(name: string, destination: string, compress: bool) -> (image: - # is returned. - # #### Example - # ~~~ --# $ varlink call -m unix:/run/io.projectatomic.podman/io.projectatomic.podman.PullImage '{"name": "registry.fedoraproject.org/fedora"}' -+# $ varlink call -m unix:/run/podman/io.projectatomic.podman/io.projectatomic.podman.PullImage '{"name": "registry.fedoraproject.org/fedora"}' - # { - # "id": "426866d6fa419873f97e5cbd320eeb22778244c1dfffa01c944db3114f55772e" - # } -diff --git a/docs/podman-varlink.1.md b/docs/podman-varlink.1.md -index 68a0f08..9d4e094 100644 ---- a/docs/podman-varlink.1.md -+++ b/docs/podman-varlink.1.md -@@ -25,7 +25,7 @@ More will go here as the docs and api firm up. - - ## EXAMPLES - -- podman varlink unix:/run/io.projectatomic.podman -+ podman varlink unix:/run/podman/io.projectatomic.podman -