summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDaniel J Walsh <dwalsh@redhat.com>2020-03-20 06:45:45 -0400
committerDaniel J Walsh <dwalsh@redhat.com>2020-03-20 09:09:42 -0400
commit8ab686f0e08d90f0353648446ae49cd4ba85cdfb (patch)
tree7be4d44b0a7a01d40a5ef370bf99b15a791a9f1b
parentccc30c606e843d5c98e2c62a3b393a61e60976b2 (diff)
downloadpodman-8ab686f0e08d90f0353648446ae49cd4ba85cdfb.tar.gz
podman-8ab686f0e08d90f0353648446ae49cd4ba85cdfb.tar.bz2
podman-8ab686f0e08d90f0353648446ae49cd4ba85cdfb.zip
Add APIV2 service files
Also fix issue in pods_test.go Signed-off-by: Daniel J Walsh <dwalsh@redhat.com>
-rw-r--r--Makefile9
-rw-r--r--contrib/spec/podman.spec.in4
-rw-r--r--pkg/bindings/test/pods_test.go5
3 files changed, 17 insertions, 1 deletions
diff --git a/Makefile b/Makefile
index d0f7d9382..7e5a564a0 100644
--- a/Makefile
+++ b/Makefile
@@ -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 fae1deca4..d7334e0e5 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, &trueFlag, &newpod)
Expect(err).To(BeNil())