diff --git a/Makefile b/Makefile index 7bb75a6747..9627545003 100644 --- a/Makefile +++ b/Makefile @@ -858,7 +858,10 @@ install.completions: .PHONY: install.docker install.docker: install ${SELINUXOPT} -d -m 755 $(DESTDIR)$(BINDIR) - install ${SELINUXOPT} -m 755 docker $(DESTDIR)$(BINDIR)/docker + $(eval INTERPOLATED_DOCKER_SCRIPT := $(shell mktemp)) + env BINDIR=${BINDIR} ETCDIR=${ETCDIR} envsubst < docker.in > ${INTERPOLATED_DOCKER_SCRIPT} + install ${SELINUXOPT} -m 755 ${INTERPOLATED_DOCKER_SCRIPT} $(DESTDIR)$(BINDIR)/docker + rm ${INTERPOLATED_DOCKER_SCRIPT} 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} diff --git a/docker b/docker deleted file mode 100755 index efc363f545..0000000000 --- a/docker +++ /dev/null @@ -1,4 +0,0 @@ -#!/bin/sh -[ -e /etc/containers/nodocker ] || \ -echo "Emulate Docker CLI using podman. Create /etc/containers/nodocker to quiet msg." >&2 -exec /usr/bin/podman "$@" diff --git a/docker.in b/docker.in new file mode 100755 index 0000000000..61e1b64c28 --- /dev/null +++ b/docker.in @@ -0,0 +1,4 @@ +#!/bin/sh +[ -e ${ETCDIR}/containers/nodocker ] || \ +echo "Emulate Docker CLI using podman. Create ${ETCDIR}/containers/nodocker to quiet msg." >&2 +exec ${BINDIR}/podman "$@" diff --git a/podman.spec.rpkg b/podman.spec.rpkg index 07d0a301b6..004cf4459e 100644 --- a/podman.spec.rpkg +++ b/podman.spec.rpkg @@ -164,7 +164,7 @@ export BUILDTAGS="$BASEBUILDTAGS $(hack/btrfs_installed_tag.sh) $(hack/btrfs_tag make docs docker-docs %install -PODMAN_VERSION=%{version} %{__make} DESTDIR=%{buildroot} PREFIX=%{_prefix} ETCDIR=%{buildroot}%{_sysconfdir} \ +PODMAN_VERSION=%{version} %{__make} DESTDIR=%{buildroot} PREFIX=%{_prefix} ETCDIR=%{_sysconfdir} \ install.bin \ install.man \ install.systemd \