Accepting request 593664 from Virtualization:containers

OBS-URL: https://build.opensuse.org/request/show/593664
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/docker?expand=0&rev=71

docker.changes

@@ -1,3 +1,15 @@
+-------------------------------------------------------------------
+Wed Apr  4 12:27:29 UTC 2018 - vrothberg@suse.com
+
+- Compile and install all manpages.
+  bsc#1085117
+
+-------------------------------------------------------------------
+Tue Mar 27 10:13:41 UTC 2018 - asarai@suse.com
+
+- Add requirement for catatonit, which provides a docker-init implementation.
+  fate#324652
+
 -------------------------------------------------------------------
 Tue Feb 13 10:45:58 UTC 2018 - asarai@suse.com
 

docker.spec

@@ -106,6 +106,9 @@ Requires:       fix_bsc_1057743
 # runC or containerd (which would be bad).
 Requires:       containerd-git  = %{required_containerd}
 Requires:       docker-runc-git = %{required_dockerrunc}
+# Needed for --init support. We don't use "tini", we use our own implementation
+# which handles edge-cases better.
+Requires:       catatonit
 # Provides mkfs.ext4 - used by Docker when devicemapper storage driver is used
 Requires:       e2fsprogs
 Requires:       git-core >= 1.7
@@ -246,6 +249,11 @@ cd ../..
 # DOCKER CLIENT
 cd components/cli
 ./scripts/build/dynbinary
+
+mkdir -p ./man/man1
+go build -o gen-manpages github.com/docker/cli/man
+./gen-manpages --root "$(pwd)" --target "$(pwd)/man/man1"
+rm gen-manpages
 ./man/md2man-all.sh
 cd ../..