update to 20.10.8 [release 20.10.8-1mamba;Wed Aug 04 2021]

docker.spec

@@ -1,27 +1,32 @@
 %define groupid 65440
 %define userid  65440
-%define libnetwork_tag master@3eb39382bfa6a3c42f83674ab080ae13b0e34e5d
+# https://github.com/moby/moby/tree/v20.10.0/hack/dockerfile/install
-%define tini_tag v0.18.0@fec3683b971d9c3ef73f284f176672c44b448662
+%define libnetwork_tag master@64b7a4574d1426139437d20e81c0b6d391130ec8
+%define tini_tag master@de40ad007797e0dcd8b7126f27bb87401d224240
+%define buildx_tag master@11057da37336192bfc57d81e02359ba7ba848e4a
+%define app_tag master@9d2c67f87b7338eb1a0fa2f18eb81af3d2aac0e1
 
 Name:          docker
-Version:       19.03.15
+Version:       20.10.8
-Release:       2mamba
+Release:       1mamba
 Summary:       An open-source application container engine
 Group:         System/Servers
 Vendor:        openmamba
 Distribution:  openmamba
 Packager:      Silvan Calarco <silvan.calarco@mambasoft.it>
 URL:           https://www.docker.com/
-Source:        https://github.com/docker/docker-ce.git/v%{version}/docker-ce-%{version}.tar.bz2
+#Source:        https://github.com/docker/docker-ce.git/v%{version}/docker-ce-%{version}.tar.bz2
-#Source1:       https://github.com/opencontainers/runc.git/%{runc_tag}/runc-%{version}.tar.bz2
+Source:        https://github.com/docker/cli.git/v%{version}/cli-%{version}.tar.bz2
-#Source2:       https://github.com/containerd/containerd.git/%{containerd_tag}/containerd-%{version}.tar.bz2
+Source1:       https://github.com/moby/moby.git/v%{version}/moby-%{version}.tar.bz2
-Source3:       https://github.com/docker/libnetwork.git/%{libnetwork_tag}/libnetwork-%{version}.tar.bz2
+Source2:       https://github.com/docker/libnetwork.git/%{libnetwork_tag}/libnetwork-%{version}.tar.bz2
-Source4:       https://github.com/krallin/tini.git/%{tini_tag}/tini-%{version}.tar.bz2
+Source3:       https://github.com/krallin/tini.git/%{tini_tag}/tini-%{version}.tar.bz2
-Source5:       https://github.com/spf13/cobra.git/master/cobra-%{version}.tar.bz2
+Source4:       https://github.com/docker/buildx.git/%{buildx_tag}/buildx-%{version}.tar.bz2
+Source5:       https://github.com/docker/app.git/%{buildx_tag}/app-%{version}.tar.bz2
 Patch0:        docker-1.9.1-build-missing-flags.patch
 License:       Apache License 2.0
 ## AUTOBUILDREQ-BEGIN
 BuildRequires: glibc-devel
+BuildRequires: ldconfig
 BuildRequires: libdevmapper-devel
 BuildRequires: libseccomp-devel
 BuildRequires: libsystemd-devel
@@ -39,15 +44,21 @@ An open-source application container engine.
 %debug_package
 
 %prep
-%setup -q -n docker-ce-%{version} -a3 -a4 -a5
+%setup -q -c -a0 -a1 -a2 -a3 -a4 -a5
+#% setup -q -c -D -T
+#:<< _EOF
 #%patch0 -p1
+mv cli-%{version} cli
+mv moby-%{version} moby
 mv libnetwork-%{version} libnetwork
 mv tini-%{version} tini
-mv cobra-%{version} cobra
+mv buildx-%{version} buildx
+mv app-%{version} app
 
-sed -i 's,/var/run,/run,' components/engine/contrib/init/systemd/docker.socket
+#sed -i 's,/var/run,/run,' components/engine/contrib/init/systemd/docker.socket
   
 %build
+#:<< _EOF
 # create a fake go path directory and pushd into it
 # $1 real directory
 # $2 gopath directory
@@ -62,36 +73,27 @@ _fake_gopath_popd() {
   popd >/dev/null
 }
 
-srcdir=`pwd`
 ### globals
-export GOPATH="$srcdir"
+export GOPATH="$PWD"
 export PATH="$GOPATH/bin:$PATH"
 
 # Required since Go 1.16
 export GO111MODULE=off
 
 ### cli
-_fake_gopath_pushd components/cli github.com/docker/cli
+_fake_gopath_pushd cli github.com/docker/cli
-DISABLE_WARN_OUTSIDE_CONTAINER=1 make VERSION=%{version}-ce dynbinary
+DISABLE_WARN_OUTSIDE_CONTAINER=1 make VERSION=%{version} dynbinary
+make manpages
 _fake_gopath_popd
 
 ### daemon
-_fake_gopath_pushd components/engine github.com/docker/docker
+_fake_gopath_pushd moby github.com/docker/docker
 DOCKER_GITCOMMIT=v%{version} \
 DOCKER_BUILDTAGS='seccomp journald apparmor' \
     VERSION=%{version}-ce \
     hack/make.sh dynbinary
 _fake_gopath_popd
 
-### docker man pages
-mkdir -p src/github.com/spf13
-ln -rsfT cobra src/github.com/spf13/cobra
-# use docker-ce cli version because they mess up with man dir
-_fake_gopath_pushd components/cli github.com/docker/cli
-make manpages
-#2>/dev/null
-_fake_gopath_popd
-
 ### docker proxy
 _fake_gopath_pushd libnetwork github.com/docker/libnetwork
 go build -ldflags='-linkmode=external' github.com/docker/libnetwork/cmd/proxy
@@ -104,49 +106,62 @@ cmake .
 make tini-static
 _fake_gopath_popd
 
+### app cli plugin
+echo 'Building app cli plugin'
+_fake_gopath_pushd app github.com/docker/app
+make dynamic
+_fake_gopath_popd
+
+### buildx cli plugin
+echo 'Building buildx cli plugin'
+_fake_gopath_pushd buildx github.com/docker/buildx
+go build -o docker-buildx -ldflags "\
+  -X github.com/docker/buildx/version.Version=$(git describe --match 'v[0-9]*' --always --tags)-tp-docker \
+  -X github.com/docker/buildx/version.Revision=$(git rev-parse HEAD) \
+  -X github.com/docker/buildx/version.Package=github.com/docker/buildx \
+  -X main.experimental=1 -linkmode=external" ./cmd/buildx
+_fake_gopath_popd
+
 %install
 [ "%{buildroot}" != / ] && rm -rf "%{buildroot}"
 
-srcdir=`pwd`
-
 ### proxy
 install -Dm755 libnetwork/proxy %{buildroot}%{_bindir}/docker-proxy
+
 ### init
 install -Dm755 tini/tini-static %{buildroot}%{_bindir}/docker-init
 
-### engine
+### dockerd
-cd $srcdir/components/engine
+install -Dm755 moby/bundles/dynbinary-daemon/dockerd %{buildroot}%{_bindir}/dockerd
-# binary
+
-install -Dm755 {bundles/dynbinary-daemon,%{buildroot}%{_bindir}}/dockerd
 # systemd
-install -Dm644 'contrib/init/systemd/docker.service' \
+install -Dm644 moby/contrib/init/systemd/docker.service \
   %{buildroot}%{_unitdir}/docker.service
-install -Dm644 'contrib/init/systemd/docker.socket' \
+install -Dm644 moby/contrib/init/systemd/docker.socket \
   %{buildroot}%{_unitdir}/docker.socket
-install -Dm644 'contrib/udev/80-docker.rules' \
+install -Dm644 moby/contrib/udev/80-docker.rules \
   %{buildroot}%{_udevrulesdir}/80-docker.rules
 #install -Dm644 "$srcdir/$pkgname.sysusers" \
 #    "$pkgdir/usr/lib/sysusers.d/$pkgname.conf"
-# vim syntax
+
-install -Dm644 'contrib/syntax/vim/syntax/dockerfile.vim' \
-  %{buildroot}%{_datadir}/vim/vimfiles/syntax/dockerfile.vim
-install -Dm644 'contrib/syntax/vim/ftdetect/dockerfile.vim' \
-  %{buildroot}%{_datadir}/vim/vimfiles/ftdetect/dockerfile.vim
 ### cli
-cd $srcdir/components/cli
 # binary
-install -Dm755 build/docker %{buildroot}%{_bindir}/docker
+install -Dm755 cli/build/docker %{buildroot}%{_bindir}/docker
 # completion
-install -Dm644 'contrib/completion/bash/docker' \
+install -Dm644 cli/contrib/completion/bash/docker \
   %{buildroot}%{_datadir}/bash-completion/completions/docker
-install -Dm644 'contrib/completion/zsh/_docker' \
+install -Dm644 cli/contrib/completion/zsh/_docker \
   %{buildroot}%{_datadir}/zsh/site-functions/_docker
-install -Dm644 'contrib/completion/fish/docker.fish' \
+install -Dm644 cli/contrib/completion/fish/docker.fish \
   %{buildroot}%{_datadir}/fish/vendor_completions.d/docker.fish
 # man
 install -dm755 %{buildroot}%{_mandir}
-cp -r man/man* %{buildroot}%{_mandir}/
+cp -r cli/man/man* %{buildroot}%{_mandir}/
 
+# cli-plugins
+install -Dm755 app/bin/docker-app %{buildroot}%{_prefix}/lib/docker/cli-plugins/docker-app
+install -Dm755 buildx/docker-buildx %{buildroot}%{_prefix}/lib/docker/cli-plugins/docker-buildx
+  
 # symlink containerd/run
 ln -s containerd %{buildroot}%{_bindir}/docker-containerd
 ln -s containerd-shim %{buildroot}%{_bindir}/docker-containerd-shim
@@ -186,6 +201,10 @@ fi
 %{_bindir}/docker-runc
 %{_bindir}/docker-containerd
 %{_bindir}/dockerd
+%dir %{_prefix}/lib/docker
+%dir %{_prefix}/lib/docker/cli-plugins
+%{_prefix}/lib/docker/cli-plugins/docker-app
+%{_prefix}/lib/docker/cli-plugins/docker-buildx
 %{_udevrulesdir}/80-docker.rules
 %{_unitdir}/docker.service
 %{_unitdir}/docker.socket
@@ -195,12 +214,15 @@ fi
 %{_mandir}/man5/Dockerfile.5*
 %{_mandir}/man5/docker-config-json.5*
 %{_mandir}/man8/dockerd.8*
-%{_datadir}/vim/vimfiles/ftdetect/dockerfile.vim
+#%{_datadir}/vim/vimfiles/ftdetect/dockerfile.vim
-%{_datadir}/vim/vimfiles/syntax/dockerfile.vim
+#%{_datadir}/vim/vimfiles/syntax/dockerfile.vim
 %{_datadir}/zsh/site-functions/_docker
-%doc components/engine/AUTHORS components/engine/LICENSE
+%doc moby/AUTHORS moby/LICENSE
 
 %changelog
+* Wed Aug 04 2021 Silvan Calarco <silvan.calarco@mambasoft.it> 20.10.8-1mamba
+- update to 20.10.8
+
 * Wed Aug 04 2021 Silvan Calarco <silvan.calarco@mambasoft.it> 19.03.15-2mamba
 - install docker-proxy and docker-init