Fix up docker compatibility messages

Signed-off-by: Daniel J Walsh <[email protected]> Closes: #1170 Approved by: mheon
containers · Jul 27, 2018 · 50fea69 · 50fea69
1 parent 02e7efc
commit 50fea69
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 3 deletions.
diff --git a/Makefile b/Makefile
@@ -232,9 +232,7 @@ install.cni:
 install.docker: docker-docs
 	install ${SELINUXOPT} -D -m 755 docker $(BINDIR)/docker
 	install ${SELINUXOPT} -d -m 755 $(MANDIR)/man1
-	install ${SELINUXOPT} -d -m 755 $(MANDIR)/man5
 	install ${SELINUXOPT} -m 644 docs/docker*.1 -t $(MANDIR)/man1
-	install ${SELINUXOPT} -m 644 docs/docker*.5 -t $(MANDIR)/man5
 
 install.systemd:
 	install ${SELINUXOPT} -m 644 -D contrib/varlink/io.projectatomic.podman.socket ${SYSTEMDDIR}/io.projectatomic.podman.socket

diff --git a/docker b/docker
@@ -1,3 +1,4 @@
 #!/bin/sh
-echo "Using podman package to emulate the Docker CLI"
+[ -f /etc/containers/nodocker ] || \
+echo "Emulate Docker CLI using podman. Create /etc/containers/nodocker to quiet msg." >&2
 exec /usr/bin/podman $@