diff --git a/.gitignore b/.gitignore index 158f3f4..bb3e060 100644 --- a/.gitignore +++ b/.gitignore @@ -109,3 +109,7 @@ moby-v20.10.10.tar.gz /cli-27.5.1-vendor.tar.bz2 /moby-27.5.1.tar.gz /moby-27.5.1-vendor.tar.bz2 +/cli-28.0.0.tar.gz +/cli-28.0.0-vendor.tar.bz2 +/moby-28.0.0.tar.gz +/moby-28.0.0-vendor.tar.bz2 diff --git a/moby-engine.spec b/moby-engine.spec index 0dbf159..e5b02bc 100644 --- a/moby-engine.spec +++ b/moby-engine.spec @@ -13,7 +13,7 @@ # For rc, beta, alpha releases substitute tilde (~) for dash (-) # in version0. tag0 reverses the substitution # e.g. global version0 27.4.0~rc.4 -%global version0 27.5.1 +%global version0 28.0.0 %global tag0 v%{gsub %{version0} ~ -} # https://github.com/docker/cli @@ -216,6 +216,11 @@ VERSION=%{version} \ GOPATH=%{gobuilddir} \ bash -x ./hack/make.sh dynbinary +# build man pages using Makefile in man subdirectory +pushd man +GO_MD2MAN=go-md2man %make_build all +popd + # docker-cli cd %{cli_dir} %make_build dynbinary \ @@ -241,6 +246,7 @@ install -Dpm 0644 moby-engine-systemd-sysusers.conf %{buildroot}%{_sysusersdir}/ install -Dpm 0644 contrib/udev/80-docker.rules -t %{buildroot}%{_udevrulesdir} # Install nano syntax install -Dpm 644 contrib/syntax/nano/Dockerfile.nanorc -t %{buildroot}%{_datadir}/nano/ +install -Dpm 644 man/man8/*.8 -t %{buildroot}%{_mandir}/man8/ # docker-cli cd %{cli_dir} @@ -255,7 +261,6 @@ install -Dpm 644 contrib/completion/fish/docker.fish -t %{buildroot}%{fish_compl # Install manpages install -Dpm 644 man/man1/*.1 -t %{buildroot}%{_mandir}/man1/ install -Dpm 644 man/man5/*.5 -t %{buildroot}%{_mandir}/man5/ -install -Dpm 644 man/man8/*.8 -t %{buildroot}%{_mandir}/man8/ cd - # moby-filesystem @@ -289,6 +294,9 @@ cd %{engine_dir} skiptest \ "TestSCTP4Proxy" \ %dnl Failed to enter netns: operation not permitted + %dnl "TestSCTP4ProxyNoListener" + %dnl "TestSCTP6ProxyNoListener" + %dnl network_proxy_linux_test.go:73: protocol not supported; fails in COPR rawhide "TestIfaceAddrs" \ %dnl failed to mount resolved path: operation not permitted "TestJoinGoodSymlink" \ @@ -344,6 +352,7 @@ skiptest \ %{_udevrulesdir}/80-docker.rules %{_unitdir}/docker.service %{_unitdir}/docker.socket +%{_mandir}/man8/dockerd.8* %files nano @@ -359,7 +368,6 @@ skiptest \ %{_bindir}/docker %{_mandir}/man1/docker*.1* %{_mandir}/man5/{Dockerfile,docker-config-json}.5* -%{_mandir}/man8/dockerd.8* %{bash_completions_dir}/docker %{fish_completions_dir}/docker.fish %{zsh_completions_dir}/_docker diff --git a/sources b/sources index 04ddca1..b510c13 100644 --- a/sources +++ b/sources @@ -1,4 +1,4 @@ -SHA512 (cli-27.5.1.tar.gz) = 165bd5984786fe6fa6398d6e2b1757ce013a91434317339b360721327d4f74bd52fe0ec3936ae3a0665f0fbbf2cd2c49bd2c503783c25651f8d91a172e1c2d3e -SHA512 (cli-27.5.1-vendor.tar.bz2) = 398ba881d98473fbb69e321e9b2a1aba6bd3fb7d29efa8e2b8a0e0ee58fa2904f6f0b8b5aaa3190ac94d0a56586f9c76ef7909e3e15fe3a717ddab3e93573bce -SHA512 (moby-27.5.1.tar.gz) = 6080fa59efa5b35b23bbd363569df7261783ab2527cda9c391f0853b58b55e34824b4a6019e0366aaed5cfaba5ff70b253dcc90b1b77149a85eea0c282d05bdf -SHA512 (moby-27.5.1-vendor.tar.bz2) = 419eb5cc0c2d397ac2bc001d919890f22f6c90020d863afbfd86a338c267100d8e0d597ab0ddbf5da34814d242de09c116a55323ef742407aa76ed1c79445697 +SHA512 (cli-28.0.0.tar.gz) = a31a5e0068d81c28e1d8fd6ccac1d457d444f928b8974dda766e9dcfa9b6e2c53c03b1107c387fa062535eeb5843536c76b4428d4f313e084dcb2fc321f582a8 +SHA512 (cli-28.0.0-vendor.tar.bz2) = 23139ed66868552a1403b5d31c1d5858c37e2c062cc6aeb5b4b7e043f34a25a3e758e9146a286543b2ec4586a51c78280357dbb8fa2116f1ed8bd7c37788310c +SHA512 (moby-28.0.0.tar.gz) = 5f274393e2c3fcf9d5d31744d5e36252a8bd46b1d6bce2b0e5bf5a5c55b865a33494cc2d0ae461146ce353e80cbed5b336ef247dd4619b1f5d815b96ff58b27b +SHA512 (moby-28.0.0-vendor.tar.bz2) = 3bb9d505837ee810d51d6b874e430d62d23ace643a5f33ded0812144a91f273775a3087721a2301f68d229a4c4367c7f212afbe119743088f12f39e55cfee745