summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDaniel J Walsh <dwalsh@redhat.com>2018-01-18 14:51:46 -0500
committerGitHub <noreply@github.com>2018-01-18 14:51:46 -0500
commit858116f648a06a0f4df829bc1e78b46a5e609b57 (patch)
tree1ca98a15aa50c0df2bb238378b77832ebbbd8f83
parentdd2ba36ed3d02fafcce0d9ccd72ffc19f9fb263b (diff)
parent0207e629ee0c5640170e58d71efd0ce60e65a5a2 (diff)
downloadpodman-858116f648a06a0f4df829bc1e78b46a5e609b57.tar.gz
podman-858116f648a06a0f4df829bc1e78b46a5e609b57.tar.bz2
podman-858116f648a06a0f4df829bc1e78b46a5e609b57.zip
Merge pull request #216 from rhatdan/docker
Add support for mimicing docker CLI
-rw-r--r--Makefile10
-rwxr-xr-xdocker3
-rwxr-xr-xdocs/dckrman.sh5
3 files changed, 17 insertions, 1 deletions
diff --git a/Makefile b/Makefile
index c241751b9..c6e44a622 100644
--- a/Makefile
+++ b/Makefile
@@ -135,13 +135,16 @@ docs/%.1: docs/%.1.md .gopathok
docs: $(MANPAGES)
+docker-docs: docs
+ (cd docs; ./dckrman.sh *.1)
+
install: .gopathok install.bin install.man install.cni
install.bin:
install ${SELINUXOPT} -D -m 755 bin/podman $(BINDIR)/podman
install ${SELINUXOPT} -D -m 755 bin/conmon $(LIBEXECDIR)/crio/conmon
-install.man:
+install.man: docs
install ${SELINUXOPT} -d -m 755 $(MANDIR)/man1
install ${SELINUXOPT} -m 644 $(filter %.1,$(MANPAGES)) -t $(MANDIR)/man1
@@ -156,6 +159,11 @@ install.completions:
install.cni:
install ${SELINUXOPT} -D -m 644 cni/97-podman-bridge.conf ${ETCDIR}/cni/net.d/97-podman-bridge.conf
+install.docker: docker-docs
+ install ${SELINUXOPT} -D -m 755 docker $(BINDIR)/docker
+ install ${SELINUXOPT} -d -m 755 $(MANDIR)/man1
+ install ${SELINUXOPT} -m 644 docs/docker*.1 -t $(MANDIR)/man1
+
uninstall:
rm -f $(LIBEXECDIR)/crio/conmon
for i in $(filter %.1,$(MANPAGES)); do \
diff --git a/docker b/docker
new file mode 100755
index 000000000..c647da8e2
--- /dev/null
+++ b/docker
@@ -0,0 +1,3 @@
+#!/bin/sh
+echo "Using podman package to emulate the Docker CLI"
+exec /usr/bin/podman $@
diff --git a/docs/dckrman.sh b/docs/dckrman.sh
new file mode 100755
index 000000000..8ae7fd40d
--- /dev/null
+++ b/docs/dckrman.sh
@@ -0,0 +1,5 @@
+#!/bin/sh
+for i in $@; do
+ filename=$(echo $i | sed 's/podman/docker/g')
+ echo .so man1/$i > $filename
+done