diff options
| author | OpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com> | 2020-01-27 14:09:49 -0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-01-27 14:09:49 -0800 |
| commit | 33d41a35e5fbac4b674f66f3a2d537fc9e484514 (patch) | |
| tree | b0569f95f79f2931f45be3219cfa1fd572e9cc54 | |
| parent | 05ad507631953a46cad961daf8ebaf72b27e3c06 (diff) | |
| parent | 4ab6a10d0c21e64d109e00008f07e4b4aa041445 (diff) | |
| download | podman-33d41a35e5fbac4b674f66f3a2d537fc9e484514.tar.gz podman-33d41a35e5fbac4b674f66f3a2d537fc9e484514.tar.bz2 podman-33d41a35e5fbac4b674f66f3a2d537fc9e484514.zip | |
Merge pull request #4992 from rhatdan/docker
Add link from docker.sock to podman.sock
| -rw-r--r-- | Makefile | 2 | ||||
| -rw-r--r-- | contrib/systemd/system/podman-docker.conf | 1 |
2 files changed, 3 insertions, 0 deletions
@@ -452,6 +452,8 @@ install.docker: docker-docs install ${SELINUXOPT} -d -m 755 $(DESTDIR)$(BINDIR) $(DESTDIR)$(MANDIR)/man1 install ${SELINUXOPT} -m 755 docker $(DESTDIR)$(BINDIR)/docker install ${SELINUXOPT} -m 644 docs/build/man/docker*.1 -t $(DESTDIR)$(MANDIR)/man1 + install ${SELINUXOPT} -m 755 -d ${DESTDIR}${SYSTEMDDIR} ${DESTDIR}${USERSYSTEMDDIR} ${DESTDIR}${TMPFILESDIR} + install ${SELINUXOPT} -m 644 contrib/systemd/system/podman-docker.conf -t ${DESTDIR}${TMPFILESDIR} install.systemd: install ${SELINUXOPT} -m 755 -d ${DESTDIR}${SYSTEMDDIR} ${DESTDIR}${USERSYSTEMDDIR} ${DESTDIR}${TMPFILESDIR} diff --git a/contrib/systemd/system/podman-docker.conf b/contrib/systemd/system/podman-docker.conf new file mode 100644 index 000000000..e12f19bce --- /dev/null +++ b/contrib/systemd/system/podman-docker.conf @@ -0,0 +1 @@ +L+ /run/docker.sock - - - - /run/podman/podman.sock |