From 37290ccb01de43c6bfecb87e93ccfbb9780fd6ab Mon Sep 17 00:00:00 2001 From: Olivier Lemasle Date: Sun, 14 Mar 2021 22:26:09 +0100 Subject: [PATCH] Update to latest upstream 20.10.5 - fixes #1903426 Upstream brings compatibility with cgroups v2 - fixes #1746355 Remove package moby-engine-vim (dockerfile.vim has been merged in upstream vim) Remove firewalld docker zone, since dockerd can now communicate with firewalld - fixes #1852680 Build dockerd and docker-proxy from unbundled source packages --- .gitignore | 3 + docker-zone.xml | 6 -- moby-engine.spec | 250 ++++++++++++++++++++++++++++++----------------- sources | 6 +- 4 files changed, 169 insertions(+), 96 deletions(-) delete mode 100644 docker-zone.xml diff --git a/.gitignore b/.gitignore index fd19f93..37c43dc 100644 --- a/.gitignore +++ b/.gitignore @@ -12,3 +12,6 @@ /42e35e61f352e527082521280d5ea3761f0dee50.tar.gz /4484c46d9d1a2d10b8fc662923ad586daeedb04f.tar.gz /026aabaa659832804b01754aaadd2c0f420c68b6.tar.gz +/de40ad007797e0dcd8b7126f27bb87401d224240.tar.gz +/moby-v20.10.5.tar.gz +/cli-v20.10.5.tar.gz diff --git a/docker-zone.xml b/docker-zone.xml deleted file mode 100644 index 34e123b..0000000 --- a/docker-zone.xml +++ /dev/null @@ -1,6 +0,0 @@ - - - docker - All network connections are accepted. - - diff --git a/moby-engine.spec b/moby-engine.spec index 43c0ea1..2565701 100644 --- a/moby-engine.spec +++ b/moby-engine.spec @@ -13,46 +13,46 @@ %global newname moby %global service_name %{origname} -# moby / docker-ce / cli -%global git_moby https://github.com/%{service_name}/%{service_name}-ce -%global commit_moby 4484c46d9d1a2d10b8fc662923ad586daeedb04f +# moby +%global git_moby https://github.com/%{newname}/%{newname} +%global commit_moby 363e9a88a11be517d9e8c65c998ff56f774eb4dc %global shortcommit_moby %(c=%{commit_moby}; echo ${c:0:7}) -# docker-proxy / libnetwork -%global git_libnetwork https://github.com/%{newname}/libnetwork -%global commit_libnetwork 026aabaa659832804b01754aaadd2c0f420c68b6 -%global shortcommit_libnetwork %(c=%{commit_libnetwork}; echo ${c:0:7}) +# cli +%global git_cli https://github.com/%{origname}/cli +%global commit_cli 55c4c88966a912ddb365e2d73a4969e700fc458f +%global shortcommit_cli %(c=%{commit_cli}; echo ${c:0:7}) # tini %global git_tini https://github.com/krallin/tini -%global commit_tini fec3683b971d9c3ef73f284f176672c44b448662 +%global commit_tini de40ad007797e0dcd8b7126f27bb87401d224240 %global shortcommit_tini %(c=%{commit_tini}; echo ${c:0:7}) Name: %{newname}-engine -Version: 19.03.13 -Release: 3.ce.git%{shortcommit_moby}%{?dist} +Version: 20.10.5 +Release: 1%{?dist} Summary: The open-source application container engine License: ASL 2.0 # no golang / go-md2man for ppc64 ExcludeArch: ppc64 -Source0: %{git_moby}/archive/%{commit_moby}.tar.gz -Source1: %{git_libnetwork}/archive/%{commit_libnetwork}.tar.gz +Source0: %{git_moby}/archive/v%{version}.tar.gz#/moby-v%{version}.tar.gz +Source1: %{git_cli}/archive/v%{version}.tar.gz#/cli-v%{version}.tar.gz Source2: %{git_tini}/archive/%{commit_tini}.tar.gz Source3: %{service_name}.service Source4: %{service_name}.sysconfig -Source5: %{service_name}-zone.xml URL: https://www.%{origname}.com -BuildRequires: btrfs-progs-devel -BuildRequires: device-mapper-devel -BuildRequires: git -BuildRequires: %{?go_compiler:compiler(go-compiler)}%{!?go_compiler:golang >= 1.6.2} +BuildRequires: golang-github-docker-devel +BuildRequires: golang-github-docker-libnetwork-devel +BuildRequires: pkgconfig(libbtrfsutil) +BuildRequires: pkgconfig(devmapper) +BuildRequires: golang +BuildRequires: go-rpm-macros BuildRequires: go-md2man -BuildRequires: libseccomp-devel >= 2.3.0 +BuildRequires: pkgconfig(libseccomp) >= 2.3.0 BuildRequires: make BuildRequires: pkgconfig(audit) BuildRequires: pkgconfig(systemd) -BuildRequires: sed BuildRequires: firewalld-filesystem # Build dependencies for tini @@ -70,7 +70,6 @@ Requires: runc Requires: containerd Requires(post): firewalld-filesystem -Requires(postun): firewalld-filesystem # Resolves: rhbz#1165615 Requires: device-mapper-libs >= 1.02.90-1 @@ -92,6 +91,110 @@ Conflicts: %{origname}-ce Conflicts: %{origname}-ce-cli Conflicts: %{origname}-ee +# Bundled dependencies (docker/cli is still bundled with vendored dependencies) +Provides: bundled(tini-static) +Provides: bundled(golang(github.com/docker/cli)) +# grep -v -e '^$' -e '^#' cli/vendor.conf | sort | awk '{print "Provides: bundled(golang("$1")) = "$2}' +Provides: bundled(golang(cloud.google.com/go)) = ceeb313ad77b789a7fa5287b36a1d127b69b7093 +Provides: bundled(golang(github.com/agl/ed25519)) = 5312a61534124124185d41f09206b9fef1d88403 +Provides: bundled(golang(github.com/Azure/go-ansiterm)) = d6e3b3328b783f23731bc4d058875b0371ff8109 +Provides: bundled(golang(github.com/beorn7/perks)) = 37c8de3658fcb183f997c4e13e8337516ab753e6 +Provides: bundled(golang(github.com/cespare/xxhash/v2)) = d7df74196a9e781ede915320c11c378c1b2f3a1f +Provides: bundled(golang(github.com/containerd/cgroups)) = 0b889c03f102012f1d93a97ddd3ef71cd6f4f510 +Provides: bundled(golang(github.com/containerd/console)) = 5d7e1412f07b502a01029ea20e20e0d2be31fa7c +Provides: bundled(golang(github.com/containerd/containerd)) = 0edc412565dcc6e3d6125ff9e4b009ad4b89c638 +Provides: bundled(golang(github.com/containerd/continuity)) = efbc4488d8fe1bdc16bde3b2d2990d9b3a899165 +Provides: bundled(golang(github.com/containerd/typeurl)) = cd3ce7159eae562a4f60ceff37dada11a939d247 +Provides: bundled(golang(github.com/coreos/etcd)) = d57e8b8d97adfc4a6c224fe116714bf1a1f3beb9 +Provides: bundled(golang(github.com/cpuguy83/go-md2man/v2)) = f79a8a8ca69da163eee19ab442bedad7a35bba5a +Provides: bundled(golang(github.com/creack/pty)) = 2a38352e8b4d7ab6c336eef107e42a55e72e7fbc +Provides: bundled(golang(github.com/davecgh/go-spew)) = 8991bc29aa16c548c550c7ff78260e27b9ab7c73 +Provides: bundled(golang(github.com/docker/compose-on-kubernetes)) = 78e6a00beda64ac8ccb9fec787e601fe2ce0d5bb +Provides: bundled(golang(github.com/docker/distribution)) = 0d3efadf0154c2b8a4e7b6621fff9809655cc580 +Provides: bundled(golang(github.com/docker/docker)) = 46229ca1d815cfd4b50eb377ac75ad8300e13a85 +Provides: bundled(golang(github.com/docker/docker-credential-helpers)) = 38bea2ce277ad0c9d2a6230692b0606ca5286526 +Provides: bundled(golang(github.com/docker/go-connections)) = 7395e3f8aa162843a74ed6d48e79627d9792ac55 +Provides: bundled(golang(github.com/docker/go)) = d30aec9fd63c35133f8f79c3412ad91a3b08be06 +Provides: bundled(golang(github.com/docker/go-events)) = e31b211e4f1cd09aa76fe4ac244571fab96ae47f +Provides: bundled(golang(github.com/docker/go-metrics)) = b619b3592b65de4f087d9f16863a7e6ff905973c +Provides: bundled(golang(github.com/docker/go-units)) = 519db1ee28dcc9fd2474ae59fca29a810482bfb1 +Provides: bundled(golang(github.com/docker/swarmkit)) = d6592ddefd8a5319aadff74c558b816b1a0b2590 +Provides: bundled(golang(github.com/evanphx/json-patch)) = 72bf35d0ff611848c1dc9df0f976c81192392fa5 +Provides: bundled(golang(github.com/fvbommel/sortorder)) = 26fad50c6b32a3064c09ed089865c16f2f3615f6 +Provides: bundled(golang(github.com/gofrs/flock)) = 6caa7350c26b838538005fae7dbee4e69d9398db +Provides: bundled(golang(github.com/gogo/googleapis)) = 01e0f9cca9b92166042241267ee2a5cdf5cff46c +Provides: bundled(golang(github.com/gogo/protobuf)) = 5628607bb4c51c3157aacc3a50f0ab707582b805 +Provides: bundled(golang(github.com/golang/glog)) = 23def4e6c14b4da8ac2ed8007337bc5eb5007998 +Provides: bundled(golang(github.com/golang/groupcache)) = 869f871628b6baa9cfbc11732cdf6546b17c1298 +Provides: bundled(golang(github.com/golang/protobuf)) = 84668698ea25b64748563aa20726db66a6b8d299 +Provides: bundled(golang(github.com/googleapis/gnostic)) = 7c663266750e7d82587642f65e60bc4083f1f84e +Provides: bundled(golang(github.com/google/go-cmp)) = 3af367b6b30c263d47e8895973edcca9a49cf029 +Provides: bundled(golang(github.com/google/gofuzz)) = 24818f796faf91cd76ec7bddd72458fbced7a6c1 +Provides: bundled(golang(github.com/google/shlex)) = e7afc7fbc51079733e9468cdfd1efcd7d196cd1d +Provides: bundled(golang(github.com/gorilla/mux)) = 98cb6bf42e086f6af920b965c38cacc07402d51b +Provides: bundled(golang(github.com/grpc-ecosystem/go-grpc-middleware)) = 3c51f7f332123e8be5a157c0802a228ac85bf9db +Provides: bundled(golang(github.com/grpc-ecosystem/grpc-gateway)) = 1a03ca3bad1e1ebadaedd3abb76bc58d4ac8143b +Provides: bundled(golang(github.com/grpc-ecosystem/grpc-opentracing)) = 8e809c8a86450a29b90dcc9efbf062d0fe6d9746 +Provides: bundled(golang(github.com/hashicorp/golang-lru)) = 7f827b33c0f158ec5dfbba01bb0b14a4541fd81d +Provides: bundled(golang(github.com/imdario/mergo)) = 1afb36080aec31e0d1528973ebe6721b191b0369 +Provides: bundled(golang(github.com/inconshreveable/mousetrap)) = 76626ae9c91c4f2a10f34cad8ce83ea42c93bb75 +Provides: bundled(golang(github.com/jaguilar/vt100)) = ad4c4a5743050fb7f88ce968dca9422f72a0e3f2 +Provides: bundled(golang(github.com/json-iterator/go)) = 0ff49de124c6f76f8494e194af75bde0f1a49a29 +Provides: bundled(golang(github.com/matttproud/golang_protobuf_extensions)) = c12348ce28de40eed0136aa2b644d0ee0650e56c +Provides: bundled(golang(github.com/Microsoft/go-winio)) = 5b44b70ab3ab4d291a7c1d28afe7b4afeced0ed4 +Provides: bundled(golang(github.com/Microsoft/hcsshim)) = 5bc557dd210ff2caf615e6e22d398123de77fc11 +Provides: bundled(golang(github.com/miekg/pkcs11)) = 210dc1e16747c5ba98a03bcbcf728c38086ea357 +Provides: bundled(golang(github.com/mitchellh/mapstructure)) = d16e9488127408e67948eb43b6d3fbb9f222da10 +Provides: bundled(golang(github.com/moby/buildkit)) = 8142d66b5ebde79846b869fba30d9d30633e74aa +Provides: bundled(golang(github.com/moby/sys)) = 1bc8673b57550ddf85262eb0fed0aac651a37dab +Provides: bundled(golang(github.com/moby/term)) = bea5bbe245bf407372d477f1361d2ff042d2f556 +Provides: bundled(golang(github.com/modern-go/concurrent)) = bacd9c7ef1dd9b15be4a9909b8ac7a4e313eec94 +Provides: bundled(golang(github.com/modern-go/reflect2)) = 4b7aa43c6742a2c18fdef89dd197aaae7dac7ccd +Provides: bundled(golang(github.com/morikuni/aec)) = 39771216ff4c63d11f5e604076f9c45e8be1067b +Provides: bundled(golang(github.com/opencontainers/go-digest)) = ea51bea511f75cfa3ef6098cc253c5c3609b037a +Provides: bundled(golang(github.com/opencontainers/image-spec)) = d60099175f88c47cd379c4738d158884749ed235 +Provides: bundled(golang(github.com/opencontainers/runc)) = ff819c7e9184c13b7c2607fe6c30ae19403a7aff +Provides: bundled(golang(github.com/opentracing/opentracing-go)) = d34af3eaa63c4d08ab54863a4bdd0daa45212e12 +Provides: bundled(golang(github.com/pkg/errors)) = 614d223910a179a466c1767a985424175c39b465 +Provides: bundled(golang(github.com/prometheus/client_golang)) = 6edbbd9e560190e318cdc5b4d3e630b442858380 +Provides: bundled(golang(github.com/prometheus/client_model)) = 7bc5445566f0fe75b15de23e6b93886e982d7bf9 +Provides: bundled(golang(github.com/prometheus/common)) = d978bcb1309602d68bb4ba69cf3f8ed900e07308 +Provides: bundled(golang(github.com/prometheus/procfs)) = 46159f73e74d1cb8dc223deef9b2d049286f46b1 +Provides: bundled(golang(github.com/russross/blackfriday/v2)) = d3b5b032dc8e8927d31a5071b56e14c89f045135 +Provides: bundled(golang(github.com/shurcooL/sanitized_anchor_name)) = 7bfe4c7ecddb3666a94b053b422cdd8f5aaa3615 +Provides: bundled(golang(github.com/sirupsen/logrus)) = 6699a89a232f3db797f2e280639854bbc4b89725 +Provides: bundled(golang(github.com/spf13/cobra)) = 86f8bfd7fef868a174e1b606783bd7f5c82ddf8f +Provides: bundled(golang(github.com/spf13/pflag)) = 2e9d26c8c37aae03e3f9d4e90b7116f5accb7cab +Provides: bundled(golang(github.com/theupdateframework/notary)) = d6e1431feb32348e0650bf7551ac5cffd01d857b +Provides: bundled(golang(github.com/tonistiigi/fsutil)) = 0834f99b7b85462efb69b4f571a4fa3ca7da5ac9 +Provides: bundled(golang(github.com/tonistiigi/go-rosetta)) = f79598599c5d34ea253b56a1d7c89bc6a96de7db +Provides: bundled(golang(github.com/tonistiigi/units)) = 6950e57a87eaf136bbe44ef2ec8e75b9e3569de2 +Provides: bundled(golang(github.com/xeipuuv/gojsonpointer)) = 02993c407bfbf5f6dae44c4f4b1cf6a39b5fc5bb +Provides: bundled(golang(github.com/xeipuuv/gojsonreference)) = bd5ef7bd5415a7ac448318e64f11a24cd21e594b +Provides: bundled(golang(github.com/xeipuuv/gojsonschema)) = 82fcdeb203eb6ab2a67d0a623d9c19e5e5a64927 +Provides: bundled(golang(golang.org/x/crypto)) = c1f2f97bffc9c53fc40a1a28a5b460094c0050d9 +Provides: bundled(golang(golang.org/x/net)) = ab34263943818b32f575efc978a3d24e80b04bd7 +Provides: bundled(golang(golang.org/x/oauth2)) = bf48bf16ab8d622ce64ec6ce98d2c98f916b6303 +Provides: bundled(golang(golang.org/x/sync)) = cd5d95a43a6e21273425c7ae415d3df9ea832eeb +Provides: bundled(golang(golang.org/x/sys)) = b64e53b001e413bd5067f36d4e439eded3827374 +Provides: bundled(golang(golang.org/x/term)) = f5c789dd3221ff39d752ac54467d762de7cfbec6 +Provides: bundled(golang(golang.org/x/text)) = 23ae387dee1f90d29a23c0e87ee0b46038fbed0e +Provides: bundled(golang(golang.org/x/time)) = 555d28b269f0569763d25dbe1a237ae74c6bcc82 +Provides: bundled(golang(google.golang.org/genproto)) = 3f1135a288c9a07e340ae8ba4cc6c7065a3160e8 +Provides: bundled(golang(google.golang.org/grpc)) = f495f5b15ae7ccda3b38c53a1bfcde4c1a58a2bc +Provides: bundled(golang(go.opencensus.io)) = d835ff86be02193d324330acdb7d65546b05f814 +Provides: bundled(golang(gopkg.in/inf.v0)) = d2d2541c53f18d2a059457998ce2876cc8e67cbf +Provides: bundled(golang(gopkg.in/yaml.v2)) = 53403b58ad1b561927d19068c655246f2db79d48 +Provides: bundled(golang(gotest.tools/v3)) = bb0d8a963040ea5048dcef1a14d8f8b58a33d4b3 +Provides: bundled(golang(k8s.io/api)) = d49a3f108dab8e8d25f22c497fb48678b124efd2 +Provides: bundled(golang(k8s.io/apimachinery)) = f336d9be0221d10a93a7d6d2ec25f6fc799f4fc6 +Provides: bundled(golang(k8s.io/client-go)) = 002560d5bf54049bf5b5ae99231cb2b591f15954 +Provides: bundled(golang(k8s.io/klog)) = 4ad0115ba9e45c096d06a31d8dfb0e5bd945ec5f +Provides: bundled(golang(k8s.io/kube-openapi)) = 0270cf2f1c1d995d34b36019a6f65d58e6e33ad4 +Provides: bundled(golang(k8s.io/utils)) = 69764acb6e8e900b7c05296c5d3c9c19545475f9 +Provides: bundled(golang(sigs.k8s.io/yaml)) = fd68e9863619f6ec2fdd8625fe1f02e7c877e480 + + %description Docker is an open source project to build, ship and run any application as a lightweight container. @@ -114,17 +217,6 @@ Provides: %{service_name}-fish-completion = %{version}-%{release} %description fish-completion This package installs %{summary}. -%package vim -Summary: Vim syntax highlighting files for %{name} -Requires: %{name} = %{version}-%{release} -Requires: vim -Conflicts: %{service_name}-vim -Obsoletes: %{service_name}-vim < 2:%{version}-%{release} -Provides: %{service_name}-vim = %{version}-%{release} - -%description vim -This package installs %{summary}. - %package zsh-completion Summary: Zsh completion files for %{name} Requires: %{name} = %{version}-%{release} @@ -145,26 +237,24 @@ Requires: nano This package installs %{summary}. %prep -%autosetup -N -Sgit -n %{service_name}-ce-%{commit_moby} +%autosetup -n moby-%{version} -# untar libnetwork +# untar cli tar zxf %{SOURCE1} +# correct rpmlint errors for bash completion +sed -i '/env bash/d' cli-%{version}/contrib/completion/bash/docker # untar tini tar zxf %{SOURCE2} -# correct rpmlint errors for bash completion -sed -i '/env bash/d' components/cli/contrib/completion/bash/docker - %build +export GOPATH="/usr/share/gocode" +mkdir -p _build + # build docker-proxy / libnetwork ( - cd libnetwork-%{commit_libnetwork} - mkdir -p src/github.com/%{service_name} - ln -fns ../../.. src/github.com/%{service_name}/libnetwork - export GOPATH="${PWD}" export LDFLAGS="-linkmode=external" - %gobuild -o %{service_name}-proxy github.com/%{service_name}/libnetwork/cmd/proxy + %gobuild -o _build/%{service_name}-proxy github.com/%{service_name}/libnetwork/cmd/proxy ) # build tini @@ -176,25 +266,24 @@ sed -i '/env bash/d' components/cli/contrib/completion/bash/docker # build engine ( - cd components/engine - mkdir -p _build/src/github.com/%{service_name} - ln -fns ../../../.. _build/src/github.com/%{service_name}/%{service_name} - export DOCKER_BUILDTAGS="seccomp selinux" - export DOCKER_DEBUG=1 - export DOCKER_GITCOMMIT=%{shortcommit_moby} - export GOPATH="${PWD}/_build" - export VERSION=%{version} - bash -x hack/make.sh dynbinary + export LDFLAGS="-w" + export LDFLAGS+=" -X github.com/docker/docker/dockerversion.Version=%{version}" + export LDFLAGS+=" -X github.com/docker/docker/dockerversion.GitCommit=%{shortcommit_moby}" + export LDFLAGS+=" -X github.com/docker/docker/dockerversion.IAmStatic=false" + export LDFLAGS+=" -X 'github.com/docker/docker/dockerversion.BuildTime=$(date -u --rfc-3339 ns)'" + export BUILDTAGS="seccomp selinux journald" + %gobuild -o _build/%{service_name}d github.com/%{service_name}/%{service_name}/cmd/dockerd ) # build cli ( - cd components/cli + cd cli-%{version} mkdir -p src/github.com/%{service_name} ln -fns ../../.. src/github.com/%{service_name}/cli export DISABLE_WARN_OUTSIDE_CONTAINER=1 export GOPATH="${PWD}" - make VERSION=%{version} GITCOMMIT=%{shortcommit_moby} dynbinary + export GO111MODULE=off + make VERSION=%{version} GITCOMMIT=%{shortcommit_cli} dynbinary man/md2man-all.sh ) @@ -203,60 +292,48 @@ install -dp %{buildroot}%{_bindir} install -dp %{buildroot}%{_libexecdir}/%{service_name} # install binary -install -p -m 755 components/cli/build/%{service_name} %{buildroot}%{_bindir}/%{service_name} -install -p -m 755 components/engine/bundles/dynbinary-daemon/%{service_name}d %{buildroot}%{_bindir}/%{service_name}d +install -p -m 755 cli-%{version}/build/%{service_name} %{buildroot}%{_bindir}/%{service_name} +install -p -m 755 _build/%{service_name}d %{buildroot}%{_bindir}/%{service_name}d # install proxy -install -p -m 755 libnetwork-%{commit_libnetwork}/%{service_name}-proxy %{buildroot}%{_libexecdir}/%{service_name}/%{service_name}-proxy +install -p -m 755 _build/%{service_name}-proxy %{buildroot}%{_libexecdir}/%{service_name}/%{service_name}-proxy # install tini install -p -m 755 tini-%{commit_tini}/%{__cmake_builddir}/tini-static %{buildroot}%{_libexecdir}/%{service_name}/%{service_name}-init # install udev rules install -dp %{buildroot}%{_prefix}/lib/udev/rules.d -install -p -m 644 components/engine/contrib/udev/80-%{service_name}.rules %{buildroot}%{_usr}/lib/udev/rules.d/80-%{service_name}.rules +install -p -m 644 contrib/udev/80-%{service_name}.rules %{buildroot}%{_usr}/lib/udev/rules.d/80-%{service_name}.rules # add init scripts install -dp %{buildroot}%{_unitdir} install -p -m 644 %{SOURCE3} %{buildroot}%{_unitdir} -install -p -m 644 components/engine/contrib/init/systemd/docker.socket %{buildroot}%{_unitdir} +install -p -m 644 contrib/init/systemd/docker.socket %{buildroot}%{_unitdir} # for additional args install -dp %{buildroot}%{_sysconfdir}/sysconfig install -p -m 644 %{SOURCE4} %{buildroot}%{_sysconfdir}/sysconfig/%{service_name} -# add firewalld zone (cf #1817022) -install -dp %{buildroot}%{_prefix}/lib/firewalld/zones -install -p -m 644 %{SOURCE5} %{buildroot}%{_prefix}/lib/firewalld/zones/docker.xml - # add bash, zsh, and fish completions install -dp %{buildroot}%{_datadir}/bash-completion/completions install -dp %{buildroot}%{_datadir}/zsh/vendor-completions install -dp %{buildroot}%{_datadir}/fish/vendor_completions.d -install -p -m 644 components/cli/contrib/completion/bash/%{service_name} %{buildroot}%{_datadir}/bash-completion/completions/%{service_name} -install -p -m 644 components/cli/contrib/completion/zsh/_%{service_name} %{buildroot}%{_datadir}/zsh/vendor-completions/_%{service_name} -install -p -m 644 components/cli/contrib/completion/fish/%{service_name}.fish %{buildroot}%{_datadir}/fish/vendor_completions.d/%{service_name}.fish +install -p -m 644 cli-%{version}/contrib/completion/bash/%{service_name} %{buildroot}%{_datadir}/bash-completion/completions/%{service_name} +install -p -m 644 cli-%{version}/contrib/completion/zsh/_%{service_name} %{buildroot}%{_datadir}/zsh/vendor-completions/_%{service_name} +install -p -m 644 cli-%{version}/contrib/completion/fish/%{service_name}.fish %{buildroot}%{_datadir}/fish/vendor_completions.d/%{service_name}.fish # install manpages install -dp %{buildroot}%{_mandir}/man{1,5,8} -install -p -m 644 components/cli/man/man1/*.1 %{buildroot}%{_mandir}/man1 -install -p -m 644 components/cli/man/man5/*.5 %{buildroot}%{_mandir}/man5 -install -p -m 644 components/cli/man/man8/*.8 %{buildroot}%{_mandir}/man8 - -# add vimfiles -install -dp %{buildroot}%{_datadir}/vim/vimfiles/doc -install -dp %{buildroot}%{_datadir}/vim/vimfiles/ftdetect -install -dp %{buildroot}%{_datadir}/vim/vimfiles/syntax -install -p -m 644 components/engine/contrib/syntax/vim/doc/%{service_name}file.txt %{buildroot}%{_datadir}/vim/vimfiles/doc/%{service_name}file.txt -install -p -m 644 components/engine/contrib/syntax/vim/ftdetect/%{service_name}file.vim %{buildroot}%{_datadir}/vim/vimfiles/ftdetect/%{service_name}file.vim -install -p -m 644 components/engine/contrib/syntax/vim/syntax/%{service_name}file.vim %{buildroot}%{_datadir}/vim/vimfiles/syntax/%{service_name}file.vim +install -p -m 644 cli-%{version}/man/man1/*.1 %{buildroot}%{_mandir}/man1 +install -p -m 644 cli-%{version}/man/man5/*.5 %{buildroot}%{_mandir}/man5 +install -p -m 644 cli-%{version}/man/man8/*.8 %{buildroot}%{_mandir}/man8 # add nano files install -dp %{buildroot}%{_datadir}/nano -install -p -m 644 components/engine/contrib/syntax/nano/Dockerfile.nanorc %{buildroot}%{_datadir}/nano/Dockerfile.nanorc +install -p -m 644 contrib/syntax/nano/Dockerfile.nanorc %{buildroot}%{_datadir}/nano/Dockerfile.nanorc for cli_file in LICENSE MAINTAINERS NOTICE README.md; do - cp "components/cli/$cli_file" "cli-$cli_file" + cp "cli-%{version}/$cli_file" "cli-$cli_file" done %pre @@ -271,11 +348,10 @@ getent group %{service_name} >/dev/null || groupadd -r %{service_name} || : %postun %systemd_postun_with_restart %{service_name}.service -%firewalld_reload %files -%license cli-LICENSE components/engine/LICENSE -%doc components/engine/{AUTHORS,CHANGELOG.md,CONTRIBUTING.md,MAINTAINERS,NOTICE,README.md} +%license LICENSE cli-LICENSE +%doc AUTHORS CHANGELOG.md CONTRIBUTING.md MAINTAINERS NOTICE README.md %doc cli-MAINTAINERS cli-NOTICE cli-README.md %config(noreplace) %{_sysconfdir}/sysconfig/%{service_name} %{_bindir}/%{service_name} @@ -286,18 +362,11 @@ getent group %{service_name} >/dev/null || groupadd -r %{service_name} || : %{_usr}/lib/udev/rules.d/80-%{service_name}.rules %{_unitdir}/%{service_name}.service %{_unitdir}/%{service_name}.socket -%{_prefix}/lib/firewalld/zones/docker.xml %{_datadir}/bash-completion/completions/%{service_name} %{_mandir}/man1/* %{_mandir}/man5/* %{_mandir}/man8/* -%files vim -%dir %{_datadir}/vim/vimfiles/{doc,ftdetect,syntax} -%{_datadir}/vim/vimfiles/doc/%{service_name}file.txt -%{_datadir}/vim/vimfiles/ftdetect/%{service_name}file.vim -%{_datadir}/vim/vimfiles/syntax/%{service_name}file.vim - %files zsh-completion %dir %{_datadir}/zsh/vendor-completions/ %{_datadir}/zsh/vendor-completions/_%{service_name} @@ -311,6 +380,13 @@ getent group %{service_name} >/dev/null || groupadd -r %{service_name} || : %{_datadir}/nano/Dockerfile.nanorc %changelog +* Sun Mar 14 2021 Olivier Lemasle - 20.10.5-1 +- Update to latest upstream 20.10.5 - fixes #1903426 +- Upstream brings compatibility with cgroups v2 - fixes #1746355 +- Remove package moby-engine-vim (dockerfile.vim has been merged in upstream vim) +- Remove firewalld docker zone, since dockerd can now communicate with firewalld - fixes #1852680 +- Build dockerd and docker-proxy from unbundled source packages + * Tue Mar 02 2021 Zbigniew Jędrzejewski-Szmek - 19.03.13-3.ce.git4484c46 - Rebuilt for updated systemd-rpm-macros See https://pagure.io/fesco/issue/2583. diff --git a/sources b/sources index 477a164..1812968 100644 --- a/sources +++ b/sources @@ -1,3 +1,3 @@ -SHA512 (4484c46d9d1a2d10b8fc662923ad586daeedb04f.tar.gz) = dd839a0a38bc50653bfa8bc8d5583d3961dac8513c54a3f9c73a4c8ad6ecc48ed7242e1b9190a28813f822f682b4ad692a339e5b61aed803b27b94f4ae1ab802 -SHA512 (026aabaa659832804b01754aaadd2c0f420c68b6.tar.gz) = fe8644611e975c051ee6e7ad4871624fb45862d9b4a2fd62ea4283e76ad9804d91d585e2165915b09356f11f9dfb31c40dd9ce6a66d63c5032c8c62354960538 -SHA512 (fec3683b971d9c3ef73f284f176672c44b448662.tar.gz) = ee46d21467f8bacb4e8be72f5dfcbb23c1964286e90b4b3d3bf67dbbf79a337968ac8a0042a8191e329a65398b20ea160aae3ae5ef20ee03ebae11c2083d7621 +SHA512 (moby-v20.10.5.tar.gz) = 620a5345d99be16b4c6ba7321e91e4896128f7d638dfe2220554a6cadeb78b21dd3003cff6db60ed5ffd671ea243b310b21cc1123543b0e0cbfa93eec2900973 +SHA512 (cli-v20.10.5.tar.gz) = 868e19fa834993bbd20a0d28a57f364287f39434355ccf90e63f3ead8d55fe488ac3bdab3f85230bfbede318b93513536f36da131fc17c27763a5375b4e0c636 +SHA512 (de40ad007797e0dcd8b7126f27bb87401d224240.tar.gz) = 6e21fbcc8ab0daf2f2ac407f8d85373d2873d4b1e7d010056e4dd7071183fe1ede9dadf116c520e68a6226d5eb9d5ede383729327630600ed85080c1586bf3bb