diff options
| author | OpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com> | 2022-08-24 08:54:01 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-08-24 08:54:01 -0400 |
| commit | 2195656d9ed9b5ae576e24ce377f52dae2a76fb0 (patch) | |
| tree | c74b6044a6c0d871e4ba7ea7564f408562ee4ee7 | |
| parent | e4cbbe786258c594c264013aa7b550489d5a9e77 (diff) | |
| parent | c3dc92a50ae25e6da6ce08ac21d3d3bbf84a8a7f (diff) | |
| download | podman-2195656d9ed9b5ae576e24ce377f52dae2a76fb0.tar.gz podman-2195656d9ed9b5ae576e24ce377f52dae2a76fb0.tar.bz2 podman-2195656d9ed9b5ae576e24ce377f52dae2a76fb0.zip | |
Merge pull request #15444 from foriequal0/podman-docker-rootless
Rootless Docker API socket alias can be exposed with user mode systemd-tmpfiles
| -rw-r--r-- | Makefile | 4 | ||||
| -rw-r--r-- | contrib/systemd/system/podman-docker.conf | 2 | ||||
| -rw-r--r-- | podman.spec.rpkg | 1 |
3 files changed, 5 insertions, 2 deletions
@@ -38,6 +38,7 @@ MANDIR ?= ${PREFIX}/share/man SHAREDIR_CONTAINERS ?= ${PREFIX}/share/containers ETCDIR ?= ${PREFIX}/etc TMPFILESDIR ?= ${PREFIX}/lib/tmpfiles.d +USERTMPFILESDIR ?= ${PREFIX}/share/user-tmpfiles.d MODULESLOADDIR ?= ${PREFIX}/lib/modules-load.d SYSTEMDDIR ?= ${PREFIX}/lib/systemd/system USERSYSTEMDDIR ?= ${PREFIX}/lib/systemd/user @@ -795,8 +796,9 @@ install.completions: install.docker: install ${SELINUXOPT} -d -m 755 $(DESTDIR)$(BINDIR) install ${SELINUXOPT} -m 755 docker $(DESTDIR)$(BINDIR)/docker - install ${SELINUXOPT} -m 755 -d ${DESTDIR}${SYSTEMDDIR} ${DESTDIR}${USERSYSTEMDDIR} ${DESTDIR}${TMPFILESDIR} + install ${SELINUXOPT} -m 755 -d ${DESTDIR}${SYSTEMDDIR} ${DESTDIR}${USERSYSTEMDDIR} ${DESTDIR}${TMPFILESDIR} ${DESTDIR}${USERTMPFILESDIR} install ${SELINUXOPT} -m 644 contrib/systemd/system/podman-docker.conf -t ${DESTDIR}${TMPFILESDIR} + install ${SELINUXOPT} -m 644 contrib/systemd/system/podman-docker.conf -t ${DESTDIR}${USERTMPFILESDIR} .PHONY: install.docker-docs install.docker-docs: diff --git a/contrib/systemd/system/podman-docker.conf b/contrib/systemd/system/podman-docker.conf index e12f19bce..9d5f43101 100644 --- a/contrib/systemd/system/podman-docker.conf +++ b/contrib/systemd/system/podman-docker.conf @@ -1 +1 @@ -L+ /run/docker.sock - - - - /run/podman/podman.sock +L+ %t/docker.sock - - - - %t/podman/podman.sock diff --git a/podman.spec.rpkg b/podman.spec.rpkg index f27b31108..2962fe91e 100644 --- a/podman.spec.rpkg +++ b/podman.spec.rpkg @@ -233,6 +233,7 @@ done %{_userunitdir}/%{name}-restart.service %{_userunitdir}/%{name}-kube@.service %{_tmpfilesdir}/%{name}.conf +%{_user_tmpfilesdir}/%{name}-docker.conf %if 0%{?fedora} >= 36 %{_modulesloaddir}/%{name}-iptables.conf %endif |