diff options
| author | OpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com> | 2020-03-23 11:42:22 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-03-23 11:42:22 +0100 |
| commit | 72a2011cb12a2fbf74abf7c32fba8505a5f4e8f6 (patch) | |
| tree | 9c378cf688839641b0e2d808db47ee17fcff3ad9 | |
| parent | d6c9f3e7bf83f870a5929c9d37d29f5993e73d08 (diff) | |
| parent | 8ab686f0e08d90f0353648446ae49cd4ba85cdfb (diff) | |
| download | podman-72a2011cb12a2fbf74abf7c32fba8505a5f4e8f6.tar.gz podman-72a2011cb12a2fbf74abf7c32fba8505a5f4e8f6.tar.bz2 podman-72a2011cb12a2fbf74abf7c32fba8505a5f4e8f6.zip | |
Merge pull request #5567 from rhatdan/service
Add APIV2 service files
| -rw-r--r-- | Makefile | 9 | ||||
| -rw-r--r-- | contrib/spec/podman.spec.in | 4 | ||||
| -rw-r--r-- | pkg/bindings/test/pods_test.go | 5 |
3 files changed, 17 insertions, 1 deletions
@@ -527,6 +527,11 @@ install.systemd: # For user units the default.target that's the default is fine. sed -e 's,^WantedBy=.*,WantedBy=default.target,' < contrib/varlink/io.podman.service > ${DESTDIR}${USERSYSTEMDDIR}/io.podman.service install ${SELINUXOPT} -m 644 contrib/varlink/podman.conf ${DESTDIR}${TMPFILESDIR}/podman.conf + # Install APIV2 services + install ${SELINUXOPT} -m 644 contrib/systemd/user/podman.socket ${DESTDIR}${USERSYSTEMDDIR}/podman.socket + install ${SELINUXOPT} -m 644 contrib/systemd/user/podman.service ${DESTDIR}${USERSYSTEMDDIR}/podman.service + install ${SELINUXOPT} -m 644 contrib/systemd/system/podman.socket ${DESTDIR}${SYSTEMDDIR}/podman.socket + install ${SELINUXOPT} -m 644 contrib/systemd/system/podman.service ${DESTDIR}${SYSTEMDDIR}/podman.service .PHONY: uninstall uninstall: @@ -545,6 +550,10 @@ uninstall: rm -f ${DESTDIR}${SYSTEMDDIR}/io.podman.socket rm -f ${DESTDIR}${USERSYSTEMDDIR}/io.podman.socket rm -f ${DESTDIR}${SYSTEMDDIR}/io.podman.service + rm -f ${DESTDIR}${SYSTEMDDIR}/podman.service + rm -f ${DESTDIR}${SYSTEMDDIR}/podman.socket + rm -f ${DESTDIR}${USERSYSTEMDDIR}/podman.socket + rm -f ${DESTDIR}${USERSYSTEMDDIR}/podman.service .PHONY: .gitvalidation .gitvalidation: .gopathok diff --git a/contrib/spec/podman.spec.in b/contrib/spec/podman.spec.in index 635de0c7e..817be31b7 100644 --- a/contrib/spec/podman.spec.in +++ b/contrib/spec/podman.spec.in @@ -524,6 +524,10 @@ export GOPATH=%{buildroot}/%{gopath}:$(pwd)/vendor:%{gopath} %{_unitdir}/io.podman.socket %{_usr}/lib/systemd/user/io.podman.service %{_usr}/lib/systemd/user/io.podman.socket +%{_unitdir}/podman.service +%{_unitdir}/podman.socket +%{_usr}/lib/systemd/user/podman.service +%{_usr}/lib/systemd/user/podman.socket %{_usr}/lib/tmpfiles.d/%{name}.conf %if 0%{?with_devel} diff --git a/pkg/bindings/test/pods_test.go b/pkg/bindings/test/pods_test.go index bcf8e69b8..29cfcdbbc 100644 --- a/pkg/bindings/test/pods_test.go +++ b/pkg/bindings/test/pods_test.go @@ -79,7 +79,10 @@ var _ = Describe("Podman pods", func() { // The test validates the list pod endpoint with passing filters as the params. It("List pods with filters", func() { - var newpod2 string = "newpod2" + var ( + newpod2 string = "newpod2" + trueFlag = true + ) bt.Podcreate(&newpod2) _, err = bt.RunTopContainer(nil, &bindings.PTrue, &newpod) Expect(err).To(BeNil()) |