From 3a2fa17643d062a590a7c0758045f326cfd99e37 Mon Sep 17 00:00:00 2001 From: Marcin Skarbek Date: Mon, 12 Nov 2018 19:44:15 +0100 Subject: [PATCH 001/163] additional configuration --- docker.service | 36 ++++++++++++++++++++++++++++++++++++ docker.sysconfig | 4 ++++ moby-engine.spec | 17 ++++++++++++++--- 3 files changed, 54 insertions(+), 3 deletions(-) create mode 100644 docker.service create mode 100644 docker.sysconfig diff --git a/docker.service b/docker.service new file mode 100644 index 0000000..7063007 --- /dev/null +++ b/docker.service @@ -0,0 +1,36 @@ +[Unit] +Description=Docker Application Container Engine +Documentation=https://docs.docker.com +After=network-online.target firewalld.service +Wants=network-online.target + +[Service] +Type=notify +EnvironmentFile=-/etc/sysconfig/docker +# the default is not to use systemd for cgroups because the delegate issues still +# exists and systemd currently does not support the cgroup feature set required +# for containers run by docker +ExecStart=/usr/bin/dockerd \ + --exec-opt native.cgroupdriver=systemd \ + $OPTIONS +ExecReload=/bin/kill -s HUP $MAINPID +# Having non-zero Limit*s causes performance problems due to accounting overhead +# in the kernel. We recommend using cgroups to do container-local accounting. +LimitNOFILE=infinity +LimitNPROC=infinity +LimitCORE=infinity +# Uncomment TasksMax if your systemd version supports it. +# Only systemd 226 and above support this version. +#TasksMax=infinity +TimeoutStartSec=0 +# set delegate yes so that systemd does not reset the cgroups of docker containers +#Delegate=yes +# kill only the docker process, not all processes in the cgroup +KillMode=process +# restart the docker process if it exits prematurely +Restart=on-failure +StartLimitBurst=3 +StartLimitInterval=60s + +[Install] +WantedBy=multi-user.target diff --git a/docker.sysconfig b/docker.sysconfig new file mode 100644 index 0000000..5a78251 --- /dev/null +++ b/docker.sysconfig @@ -0,0 +1,4 @@ +# /etc/sysconfig/docker + +# Modify these options if you want to change the way the docker daemon runs +OPTIONS='--selinux-enabled --log-driver=journald --live-restore' diff --git a/moby-engine.spec b/moby-engine.spec index 46aeb28..0ad2727 100644 --- a/moby-engine.spec +++ b/moby-engine.spec @@ -40,7 +40,7 @@ Name: %{newname}-engine Version: 18.06.0 -Release: 1.ce.git%{shortcommit_moby}%{?dist} +Release: 2.ce.git%{shortcommit_moby}%{?dist} Summary: The open-source application container engine License: ASL 2.0 # no golang / go-md2man for ppc64 @@ -50,6 +50,8 @@ Source1: %{git_runc}/archive/%{commit_runc}.tar.gz Source2: %{git_containerd}/archive/%{commit_containerd}.tar.gz Source3: %{git_libnetwork}/archive/%{commit_libnetwork}.tar.gz Source4: %{git_tini}/archive/%{commit_tini}.tar.gz +Source5: %{service_name}.service +Source6: %{service_name}.sysconfig URL: https://www.%{origname}.com BuildRequires: btrfs-progs-devel @@ -240,8 +242,12 @@ 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 # add init scripts -install -dp %{buildroot}/%{_unitdir} -install -p -m 644 components/packaging/rpm/systemd/%{service_name}.service %{buildroot}%{_unitdir} +install -dp %{buildroot}%{_unitdir} +install -p -m 644 %{SOURCE5} %{buildroot}%{_unitdir} + +# for additional args +install -dp %{buildroot}%{_sysconfdir}/sysconfig +install -p -m 644 %{SOURCE6} %{buildroot}%{_sysconfdir}/sysconfig/%{service_name} # add bash, zsh, and fish completions install -dp %{buildroot}%{_datadir}/bash-completion/completions @@ -286,6 +292,7 @@ done %license cli-LICENSE components/engine/LICENSE %doc components/engine/{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} %{_bindir}/%{service_name}d %dir %{_libexecdir}/%{service_name}/ @@ -321,6 +328,10 @@ done %{_datadir}/nano/Dockerfile.nanorc %changelog +* Mon Nov 12 2018 Marcin Skarbek - 18.06.0-2.ce.git0ffa825 +- add configuration file +- update service file + * Sat Aug 18 2018 Lokesh Mandvekar - 18.06.0-1.ce.git0ffa825 - Resolves: #1539161 - first upload to Fedora - built docker-ce commit 0ffa825 From a3ed866e382d3dec4a136b90b62f9b8dc73c879f Mon Sep 17 00:00:00 2001 From: David Michael Date: Thu, 13 Sep 2018 10:38:48 -0400 Subject: [PATCH 002/163] Update to 18.06.1 This should fix https://bugzilla.redhat.com/show_bug.cgi?id=1654325 since the runc snapshot was after the first fix was applied and before it broke again. --- .gitignore | 8 ++++---- moby-engine.spec | 18 ++++++++++++------ sources | 8 ++++---- 3 files changed, 20 insertions(+), 14 deletions(-) diff --git a/.gitignore b/.gitignore index 69cc20e..47ab0f8 100644 --- a/.gitignore +++ b/.gitignore @@ -1,5 +1,5 @@ -/0ffa8257ec673ed6849b73b03fb01b0cac90fdb3.tar.gz -/a79d3687931697244b8e03485bf7b2042f8ec6b6.tar.gz -/a88b6319614de846458750ff882723479ca7b1a1.tar.gz -/ad0f5255060d36872be04de22f8731f38ef2d7b1.tar.gz +/3ac297bc7fd0afec9051bbb47024c9bc1d75bf5b.tar.gz +/468a545b9edcd5932818eb9de8e72413e616e86e.tar.gz +/69663f0bd4b60df09991c08812a60108003fa340.tar.gz +/e68fc7a215d7133c34aa18e3b72b4a21fd0c6136.tar.gz /fec3683b971d9c3ef73f284f176672c44b448662.tar.gz diff --git a/moby-engine.spec b/moby-engine.spec index 0ad2727..07c73a6 100644 --- a/moby-engine.spec +++ b/moby-engine.spec @@ -15,22 +15,22 @@ # moby / docker-ce / cli %global git_moby https://github.com/%{service_name}/%{service_name}-ce -%global commit_moby 0ffa8257ec673ed6849b73b03fb01b0cac90fdb3 +%global commit_moby e68fc7a215d7133c34aa18e3b72b4a21fd0c6136 %global shortcommit_moby %(c=%{commit_moby}; echo ${c:0:7}) # docker-runc %global git_runc https://github.com/opencontainers/runc -%global commit_runc ad0f5255060d36872be04de22f8731f38ef2d7b1 +%global commit_runc 69663f0bd4b60df09991c08812a60108003fa340 %global shortcommit_runc %(c=%{commit_runc}; echo ${c:0:7}) # docker-containerd %global git_containerd https://github.com/containerd/containerd -%global commit_containerd a88b6319614de846458750ff882723479ca7b1a1 +%global commit_containerd 468a545b9edcd5932818eb9de8e72413e616e86e %global shortcommit_containerd %(c=%{commit_containerd}; echo ${c:0:7}) # docker-proxy / libnetwork %global git_libnetwork https://github.com/%{service_name}/libnetwork -%global commit_libnetwork a79d3687931697244b8e03485bf7b2042f8ec6b6 +%global commit_libnetwork 3ac297bc7fd0afec9051bbb47024c9bc1d75bf5b %global shortcommit_libnetwork %(c=%{commit_libnetwork}; echo ${c:0:7}) # tini @@ -39,8 +39,8 @@ %global shortcommit_tini %(c=%{commit_tini}; echo ${c:0:7}) Name: %{newname}-engine -Version: 18.06.0 -Release: 2.ce.git%{shortcommit_moby}%{?dist} +Version: 18.06.1 +Release: 1.ce.git%{shortcommit_moby}%{?dist} Summary: The open-source application container engine License: ASL 2.0 # no golang / go-md2man for ppc64 @@ -328,6 +328,12 @@ done %{_datadir}/nano/Dockerfile.nanorc %changelog +* Thu Nov 29 2018 David Michael - 18.06.1-1.ce.gite68fc7a +- Update docker-ce to commit e68fc7a (version 18.06.1). +- Update docker-runc to commit 69663f0. +- Update docker-containerd to commit 468a545 (version 1.1.2). +- Update docker-proxy to commit 3ac297b. + * Mon Nov 12 2018 Marcin Skarbek - 18.06.0-2.ce.git0ffa825 - add configuration file - update service file diff --git a/sources b/sources index 432023c..752dfb8 100644 --- a/sources +++ b/sources @@ -1,5 +1,5 @@ -SHA512 (0ffa8257ec673ed6849b73b03fb01b0cac90fdb3.tar.gz) = 4045d655548bb3d9cced82a7c27014a48343d91af47cd06a9128bfec40fe61c0688716246422128f963af9fa72eeab7c3d8e7c6ab0a2aac568a95edadc03b54a -SHA512 (a79d3687931697244b8e03485bf7b2042f8ec6b6.tar.gz) = df6e608ecf04e81f5df16e18677fe0a2dc3402eb7b74d5c718b240937ed2c9f6781988881147bb7f30914a2fdf0c1c93092b71d45405e534a8e83cc5b763da0a -SHA512 (a88b6319614de846458750ff882723479ca7b1a1.tar.gz) = 0e43133030c924c1c06979eaff52790fc74332e47aeaf0e6f3ce3f0a3abf5825288eab746bcfafe2aa14387f5cbd8b04a317a454596c12c6ab772e4f8d6cc25e -SHA512 (ad0f5255060d36872be04de22f8731f38ef2d7b1.tar.gz) = 93b2c9a063a5f403f38ee9da535464456a07ea103a24e15d51105af93887f7ac18073bf6c9be87d9612087d6f6e78f4ce141ad2bc2bcdc0c70c30dfe052f8d76 +SHA512 (3ac297bc7fd0afec9051bbb47024c9bc1d75bf5b.tar.gz) = 21d3d1bd8aafeab51a3e0a14ada4d559b5b113a48d315e91f7d70e4fa839f5c92d4068b38c28bf6929da9c11cfc61703bafc7148f64b784208d61fa14ee4545d +SHA512 (468a545b9edcd5932818eb9de8e72413e616e86e.tar.gz) = 0c3cb261a535826f281af2d2df7e5c93e7d37139d5b709d7534148b9e706db56704d06b81a9e76acc2e86180f37475d566b8ddde990bbaae424af70206602347 +SHA512 (69663f0bd4b60df09991c08812a60108003fa340.tar.gz) = 9a55bdb8e39830f46cceff48970b7688139927552e3d268b9ef4a6e640ffc3d95164b99c5b05d07d295bedc2ea22daf6062fd520df1548d78b1d481fd928f1e3 +SHA512 (e68fc7a215d7133c34aa18e3b72b4a21fd0c6136.tar.gz) = cbeb029bbdcb6d7bd83b0257fe51fc9434fed18ac1c266e79fba43be663c3cfb38434ba2dbca055a0524b58e767b4715d1f59a79b66cf13406fb10f511423cd0 SHA512 (fec3683b971d9c3ef73f284f176672c44b448662.tar.gz) = ee46d21467f8bacb4e8be72f5dfcbb23c1964286e90b4b3d3bf67dbbf79a337968ac8a0042a8191e329a65398b20ea160aae3ae5ef20ee03ebae11c2083d7621 From ff932103c399f9ce9613158bf3b431302f37df8d Mon Sep 17 00:00:00 2001 From: David Michael Date: Tue, 2 Oct 2018 11:34:26 -0400 Subject: [PATCH 003/163] Backport a fix for mounting named volumes This fixes https://github.com/moby/moby/issues/37689 . --- .gitignore | 1 + moby-engine.spec | 6 +++++- sources | 1 + 3 files changed, 7 insertions(+), 1 deletion(-) diff --git a/.gitignore b/.gitignore index 47ab0f8..db75545 100644 --- a/.gitignore +++ b/.gitignore @@ -3,3 +3,4 @@ /69663f0bd4b60df09991c08812a60108003fa340.tar.gz /e68fc7a215d7133c34aa18e3b72b4a21fd0c6136.tar.gz /fec3683b971d9c3ef73f284f176672c44b448662.tar.gz +/moby-engine-18.06.1-named-volumes.patch diff --git a/moby-engine.spec b/moby-engine.spec index 07c73a6..22e0502 100644 --- a/moby-engine.spec +++ b/moby-engine.spec @@ -52,6 +52,7 @@ Source3: %{git_libnetwork}/archive/%{commit_libnetwork}.tar.gz Source4: %{git_tini}/archive/%{commit_tini}.tar.gz Source5: %{service_name}.service Source6: %{service_name}.sysconfig +Patch1: https://github.com/moby/moby/commit/27d9030b2371aa4a6b167fded6b8dc25987a0af7.patch#/%{name}-%{version}-named-volumes.patch URL: https://www.%{origname}.com BuildRequires: btrfs-progs-devel @@ -137,7 +138,7 @@ Requires: nano This package installs %{summary}. %prep -%autosetup -Sgit -n %{service_name}-ce-%{commit_moby} +%autosetup -N -Sgit -n %{service_name}-ce-%{commit_moby} # correct rpmlint errors for bash completion pushd components/cli @@ -156,6 +157,8 @@ tar zxf %{SOURCE3} # untar tini tar zxf %{SOURCE4} +%patch1 -p1 -d components/engine + %build # build docker-runc pushd runc-%{commit_runc} @@ -333,6 +336,7 @@ done - Update docker-runc to commit 69663f0. - Update docker-containerd to commit 468a545 (version 1.1.2). - Update docker-proxy to commit 3ac297b. +- Backport a fix for mounting named volumes. * Mon Nov 12 2018 Marcin Skarbek - 18.06.0-2.ce.git0ffa825 - add configuration file diff --git a/sources b/sources index 752dfb8..705c7de 100644 --- a/sources +++ b/sources @@ -3,3 +3,4 @@ SHA512 (468a545b9edcd5932818eb9de8e72413e616e86e.tar.gz) = 0c3cb261a535826f281af SHA512 (69663f0bd4b60df09991c08812a60108003fa340.tar.gz) = 9a55bdb8e39830f46cceff48970b7688139927552e3d268b9ef4a6e640ffc3d95164b99c5b05d07d295bedc2ea22daf6062fd520df1548d78b1d481fd928f1e3 SHA512 (e68fc7a215d7133c34aa18e3b72b4a21fd0c6136.tar.gz) = cbeb029bbdcb6d7bd83b0257fe51fc9434fed18ac1c266e79fba43be663c3cfb38434ba2dbca055a0524b58e767b4715d1f59a79b66cf13406fb10f511423cd0 SHA512 (fec3683b971d9c3ef73f284f176672c44b448662.tar.gz) = ee46d21467f8bacb4e8be72f5dfcbb23c1964286e90b4b3d3bf67dbbf79a337968ac8a0042a8191e329a65398b20ea160aae3ae5ef20ee03ebae11c2083d7621 +SHA512 (moby-engine-18.06.1-named-volumes.patch) = 70a1075592e31bfa89f6b24231bdeb0d476f137a1b4aa568c281cdab1acfbcd9b738d42a31a83950479171412991ddd3d1c4bc58623df07c8ae15d606f843c9a From 41eeacfcb5219f176235cb2f4f84b8176e99f129 Mon Sep 17 00:00:00 2001 From: David Michael Date: Thu, 29 Nov 2018 08:47:33 -0500 Subject: [PATCH 004/163] Support systemd socket-activation This also creates a "docker" group now. --- docker.service | 4 +++- moby-engine.spec | 13 ++++++++++--- 2 files changed, 13 insertions(+), 4 deletions(-) diff --git a/docker.service b/docker.service index 7063007..41cb0e3 100644 --- a/docker.service +++ b/docker.service @@ -1,7 +1,8 @@ [Unit] Description=Docker Application Container Engine Documentation=https://docs.docker.com -After=network-online.target firewalld.service +After=docker.socket network-online.target firewalld.service +Requires=docker.socket Wants=network-online.target [Service] @@ -11,6 +12,7 @@ EnvironmentFile=-/etc/sysconfig/docker # exists and systemd currently does not support the cgroup feature set required # for containers run by docker ExecStart=/usr/bin/dockerd \ + --host=fd:// \ --exec-opt native.cgroupdriver=systemd \ $OPTIONS ExecReload=/bin/kill -s HUP $MAINPID diff --git a/moby-engine.spec b/moby-engine.spec index 22e0502..1fd66ac 100644 --- a/moby-engine.spec +++ b/moby-engine.spec @@ -247,6 +247,7 @@ install -p -m 644 components/engine/contrib/udev/80-%{service_name}.rules %{buil # add init scripts install -dp %{buildroot}%{_unitdir} install -p -m 644 %{SOURCE5} %{buildroot}%{_unitdir} +install -p -m 644 components/engine/contrib/init/systemd/docker.socket %{buildroot}%{_unitdir} # for additional args install -dp %{buildroot}%{_sysconfdir}/sysconfig @@ -282,14 +283,17 @@ for cli_file in LICENSE MAINTAINERS NOTICE README.md; do cp "components/cli/$cli_file" "$(pwd)/cli-$cli_file" done +%pre +getent group %{service_name} >/dev/null || groupadd -r %{service_name} || : + %post -%systemd_post %{service_name} +%systemd_post %{service_name}.service %{service_name}.socket %preun -%systemd_preun %{service_name} +%systemd_preun %{service_name}.service %{service_name}.socket %postun -%systemd_postun_with_restart %{service_name} +%systemd_postun_with_restart %{service_name}.service %files %license cli-LICENSE components/engine/LICENSE @@ -307,6 +311,7 @@ done %{_bindir}/%{service_name}-init %{_usr}/lib/udev/rules.d/80-%{service_name}.rules %{_unitdir}/%{service_name}.service +%{_unitdir}/%{service_name}.socket %{_datadir}/bash-completion/completions/%{service_name} %{_mandir}/man1/* %{_mandir}/man5/* @@ -337,6 +342,8 @@ done - Update docker-containerd to commit 468a545 (version 1.1.2). - Update docker-proxy to commit 3ac297b. - Backport a fix for mounting named volumes. +- Create a "docker" group for non-root Docker access. +- Support systemd socket-activation. * Mon Nov 12 2018 Marcin Skarbek - 18.06.0-2.ce.git0ffa825 - add configuration file From 3b30c6b59ff085e81af00ea3f6cd5f1135a336cd Mon Sep 17 00:00:00 2001 From: David Michael Date: Thu, 29 Nov 2018 09:32:04 -0500 Subject: [PATCH 005/163] Apply some minor build fixes - Preserve containerd debuginfo - Set containerd and runc commit IDs to their expected values: curl -s --unix-socket /run/docker.sock http://docker/v1.24/info - Drop unused runc Makefile edit - Skip the warning and delay when building the CLI - Build projects in subshells to avoid environment mixing --- moby-engine.spec | 110 +++++++++++++++++++++++++---------------------- 1 file changed, 58 insertions(+), 52 deletions(-) diff --git a/moby-engine.spec b/moby-engine.spec index 1fd66ac..d126c00 100644 --- a/moby-engine.spec +++ b/moby-engine.spec @@ -140,11 +140,6 @@ This package installs %{summary}. %prep %autosetup -N -Sgit -n %{service_name}-ce-%{commit_moby} -# correct rpmlint errors for bash completion -pushd components/cli -sed -i '/env bash/d' contrib/completion/bash/docker -popd - # untar runc tar zxf %{SOURCE1} @@ -159,64 +154,73 @@ tar zxf %{SOURCE4} %patch1 -p1 -d components/engine +# correct rpmlint errors for bash completion +sed -i '/env bash/d' components/cli/contrib/completion/bash/docker + +# disable stripping containerd during build +sed -i 's/-s -w *//' containerd-%{commit_containerd}/Makefile + %build # build docker-runc -pushd runc-%{commit_runc} -mv vendor src -mkdir -p src/github.com/opencontainers -ln -s $(pwd) src/github.com/opencontainers/runc -sed -i 's/go build -i/go build/g' Makefile -GOPATH=$(pwd) make BUILDTAGS="seccomp selinux" -popd +( + cd runc-%{commit_runc} + mv vendor src + mkdir -p src/github.com/opencontainers + ln -fns ../../.. src/github.com/opencontainers/runc + export GOPATH="${PWD}" + make BUILDTAGS="seccomp selinux" COMMIT=%{commit_runc} +) # build docker-containerd -pushd containerd-%{commit_containerd} -mv vendor src -mkdir -p src/github.com/containerd -ln -s $(pwd) src/github.com/containerd/containerd -GOPATH=$(pwd) make -popd +( + cd containerd-%{commit_containerd} + version=$(sed -n '/^\t*Version = /s/[^0-9.]//gp' version/version.go) + mv vendor src + mkdir -p src/github.com/containerd + ln -fns ../../.. src/github.com/containerd/containerd + export GOPATH="${PWD}" + make VERSION="${version}" REVISION=%{commit_containerd} +) # build docker-proxy / libnetwork -pushd libnetwork-%{commit_libnetwork} -mkdir -p src/github.com/%{service_name} -ln -s $(pwd) src/github.com/%{service_name}/libnetwork -export GOPATH=$(pwd) -LDFLAGS="-linkmode=external" %gobuild -o %{service_name}-proxy github.com/%{service_name}/libnetwork/cmd/proxy -popd +( + 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 +) # build tini -pushd tini-%{commit_tini} -cmake . -make tini-static -popd +( + cd tini-%{commit_tini} + %cmake . + make tini-static +) # build engine -pushd components/engine -mkdir _build -pushd _build -mkdir -p $(pwd)/src/github.com/%{service_name} -ln -s $(dirs +1 -l) src/github.com/%{service_name}/%{service_name} -ln -s $(dirs +1 -l) src/github.com/%{service_name}/%{service_name} -popd - -export DOCKER_GITCOMMIT=%{shortcommit_moby} -export DOCKER_BUILDTAGS="seccomp selinux" -DOCKER_DEBUG=1 GOPATH=$(pwd)/_build:$(pwd)/vendor:%{gopath} bash -x hack/make.sh dynbinary -popd +( + 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" + bash -x hack/make.sh dynbinary +) # build cli -pushd components/cli -mkdir -p src/github.com/%{service_name}/cli -ln -s $(pwd)/* src/github.com/%{service_name}/cli -export GOPATH=%{gopath}:$(pwd) -make VERSION=$(cat VERSION) GITCOMMIT=%{shortcommit_moby} dynbinary # cli -./man/md2man-all.sh -pushd man/man1 -popd -pushd man/man5 -popd -popd +( + cd components/cli + 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 + man/md2man-all.sh +) %install install -dp %{buildroot}%{_bindir} @@ -280,7 +284,7 @@ install -dp %{buildroot}%{_datadir}/nano install -p -m 644 components/engine/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" "$(pwd)/cli-$cli_file" + cp "components/cli/$cli_file" "cli-$cli_file" done %pre @@ -344,6 +348,8 @@ getent group %{service_name} >/dev/null || groupadd -r %{service_name} || : - Backport a fix for mounting named volumes. - Create a "docker" group for non-root Docker access. - Support systemd socket-activation. +- Make runc and containerd commit IDs match their expected values. +- Preserve containerd debuginfo. * Mon Nov 12 2018 Marcin Skarbek - 18.06.0-2.ce.git0ffa825 - add configuration file From 38120252f0f66126786b362dc27c2f2cd275d92f Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Fri, 1 Feb 2019 11:12:16 +0000 Subject: [PATCH 006/163] - Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- moby-engine.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/moby-engine.spec b/moby-engine.spec index d126c00..13dbbd8 100644 --- a/moby-engine.spec +++ b/moby-engine.spec @@ -40,7 +40,7 @@ Name: %{newname}-engine Version: 18.06.1 -Release: 1.ce.git%{shortcommit_moby}%{?dist} +Release: 2.ce.git%{shortcommit_moby}%{?dist} Summary: The open-source application container engine License: ASL 2.0 # no golang / go-md2man for ppc64 @@ -340,6 +340,9 @@ getent group %{service_name} >/dev/null || groupadd -r %{service_name} || : %{_datadir}/nano/Dockerfile.nanorc %changelog +* Fri Feb 01 2019 Fedora Release Engineering - 18.06.1-2.ce.gite68fc7a +- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild + * Thu Nov 29 2018 David Michael - 18.06.1-1.ce.gite68fc7a - Update docker-ce to commit e68fc7a (version 18.06.1). - Update docker-runc to commit 69663f0. From c1ebadd023dd5db4f8bb0ec5569daf730497cf7a Mon Sep 17 00:00:00 2001 From: David Michael Date: Sun, 10 Feb 2019 18:27:59 -0500 Subject: [PATCH 007/163] Add a runc patch for CVE-2019-5736 --- moby-engine-18.06.1-CVE-2019-5736.patch | 337 ++++++++++++++++++++++++ moby-engine.spec | 7 +- 2 files changed, 343 insertions(+), 1 deletion(-) create mode 100644 moby-engine-18.06.1-CVE-2019-5736.patch diff --git a/moby-engine-18.06.1-CVE-2019-5736.patch b/moby-engine-18.06.1-CVE-2019-5736.patch new file mode 100644 index 0000000..420a73d --- /dev/null +++ b/moby-engine-18.06.1-CVE-2019-5736.patch @@ -0,0 +1,337 @@ +From 2d069bb79260e594870ce3e7466477e54a0c5307 Mon Sep 17 00:00:00 2001 +From: Aleksa Sarai +Date: Wed, 9 Jan 2019 13:40:01 +1100 +Subject: [PATCH] nsenter: clone /proc/self/exe to avoid exposing host binary + to container + +There are quite a few circumstances where /proc/self/exe pointing to a +pretty important container binary is a _bad_ thing, so to avoid this we +have to make a copy (preferably doing self-clean-up and not being +writeable). + +We require memfd_create(2) -- though there is an O_TMPFILE fallback -- +but we can always extend this to use a scratch MNT_DETACH overlayfs or +tmpfs. The main downside to this approach is no page-cache sharing for +the runc binary (which overlayfs would give us) but this is far less +complicated. + +This is only done during nsenter so that it happens transparently to the +Go code, and any libcontainer users benefit from it. This also makes +ExtraFiles and --preserve-fds handling trivial (because we don't need to +worry about it). + +Fixes: CVE-2019-5736 +Co-developed-by: Christian Brauner +Signed-off-by: Aleksa Sarai +--- + libcontainer/nsenter/cloned_binary.c | 268 +++++++++++++++++++++++++++ + libcontainer/nsenter/nsexec.c | 11 ++ + 2 files changed, 279 insertions(+) + create mode 100644 libcontainer/nsenter/cloned_binary.c + +diff --git a/libcontainer/nsenter/cloned_binary.c b/libcontainer/nsenter/cloned_binary.c +new file mode 100644 +index 000000000000..c8a42c23f73f +--- /dev/null ++++ b/libcontainer/nsenter/cloned_binary.c +@@ -0,0 +1,268 @@ ++/* ++ * Copyright (C) 2019 Aleksa Sarai ++ * Copyright (C) 2019 SUSE LLC ++ * ++ * Licensed under the Apache License, Version 2.0 (the "License"); ++ * you may not use this file except in compliance with the License. ++ * You may obtain a copy of the License at ++ * ++ * http://www.apache.org/licenses/LICENSE-2.0 ++ * ++ * Unless required by applicable law or agreed to in writing, software ++ * distributed under the License is distributed on an "AS IS" BASIS, ++ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. ++ * See the License for the specific language governing permissions and ++ * limitations under the License. ++ */ ++ ++#define _GNU_SOURCE ++#include ++#include ++#include ++#include ++#include ++#include ++#include ++#include ++ ++#include ++#include ++#include ++#include ++#include ++#include ++ ++/* Use our own wrapper for memfd_create. */ ++#if !defined(SYS_memfd_create) && defined(__NR_memfd_create) ++# define SYS_memfd_create __NR_memfd_create ++#endif ++#ifdef SYS_memfd_create ++# define HAVE_MEMFD_CREATE ++/* memfd_create(2) flags -- copied from . */ ++# ifndef MFD_CLOEXEC ++# define MFD_CLOEXEC 0x0001U ++# define MFD_ALLOW_SEALING 0x0002U ++# endif ++int memfd_create(const char *name, unsigned int flags) ++{ ++ return syscall(SYS_memfd_create, name, flags); ++} ++#endif ++ ++/* This comes directly from . */ ++#ifndef F_LINUX_SPECIFIC_BASE ++# define F_LINUX_SPECIFIC_BASE 1024 ++#endif ++#ifndef F_ADD_SEALS ++# define F_ADD_SEALS (F_LINUX_SPECIFIC_BASE + 9) ++# define F_GET_SEALS (F_LINUX_SPECIFIC_BASE + 10) ++#endif ++#ifndef F_SEAL_SEAL ++# define F_SEAL_SEAL 0x0001 /* prevent further seals from being set */ ++# define F_SEAL_SHRINK 0x0002 /* prevent file from shrinking */ ++# define F_SEAL_GROW 0x0004 /* prevent file from growing */ ++# define F_SEAL_WRITE 0x0008 /* prevent writes */ ++#endif ++ ++#define RUNC_SENDFILE_MAX 0x7FFFF000 /* sendfile(2) is limited to 2GB. */ ++#ifdef HAVE_MEMFD_CREATE ++# define RUNC_MEMFD_COMMENT "runc_cloned:/proc/self/exe" ++# define RUNC_MEMFD_SEALS \ ++ (F_SEAL_SEAL | F_SEAL_SHRINK | F_SEAL_GROW | F_SEAL_WRITE) ++#endif ++ ++static void *must_realloc(void *ptr, size_t size) ++{ ++ void *old = ptr; ++ do { ++ ptr = realloc(old, size); ++ } while(!ptr); ++ return ptr; ++} ++ ++/* ++ * Verify whether we are currently in a self-cloned program (namely, is ++ * /proc/self/exe a memfd). F_GET_SEALS will only succeed for memfds (or rather ++ * for shmem files), and we want to be sure it's actually sealed. ++ */ ++static int is_self_cloned(void) ++{ ++ int fd, ret, is_cloned = 0; ++ ++ fd = open("/proc/self/exe", O_RDONLY|O_CLOEXEC); ++ if (fd < 0) ++ return -ENOTRECOVERABLE; ++ ++#ifdef HAVE_MEMFD_CREATE ++ ret = fcntl(fd, F_GET_SEALS); ++ is_cloned = (ret == RUNC_MEMFD_SEALS); ++#else ++ struct stat statbuf = {0}; ++ ret = fstat(fd, &statbuf); ++ if (ret >= 0) ++ is_cloned = (statbuf.st_nlink == 0); ++#endif ++ close(fd); ++ return is_cloned; ++} ++ ++/* ++ * Basic wrapper around mmap(2) that gives you the file length so you can ++ * safely treat it as an ordinary buffer. Only gives you read access. ++ */ ++static char *read_file(char *path, size_t *length) ++{ ++ int fd; ++ char buf[4096], *copy = NULL; ++ ++ if (!length) ++ return NULL; ++ ++ fd = open(path, O_RDONLY | O_CLOEXEC); ++ if (fd < 0) ++ return NULL; ++ ++ *length = 0; ++ for (;;) { ++ int n; ++ ++ n = read(fd, buf, sizeof(buf)); ++ if (n < 0) ++ goto error; ++ if (!n) ++ break; ++ ++ copy = must_realloc(copy, (*length + n) * sizeof(*copy)); ++ memcpy(copy + *length, buf, n); ++ *length += n; ++ } ++ close(fd); ++ return copy; ++ ++error: ++ close(fd); ++ free(copy); ++ return NULL; ++} ++ ++/* ++ * A poor-man's version of "xargs -0". Basically parses a given block of ++ * NUL-delimited data, within the given length and adds a pointer to each entry ++ * to the array of pointers. ++ */ ++static int parse_xargs(char *data, int data_length, char ***output) ++{ ++ int num = 0; ++ char *cur = data; ++ ++ if (!data || *output != NULL) ++ return -1; ++ ++ while (cur < data + data_length) { ++ num++; ++ *output = must_realloc(*output, (num + 1) * sizeof(**output)); ++ (*output)[num - 1] = cur; ++ cur += strlen(cur) + 1; ++ } ++ (*output)[num] = NULL; ++ return num; ++} ++ ++/* ++ * "Parse" out argv and envp from /proc/self/cmdline and /proc/self/environ. ++ * This is necessary because we are running in a context where we don't have a ++ * main() that we can just get the arguments from. ++ */ ++static int fetchve(char ***argv, char ***envp) ++{ ++ char *cmdline = NULL, *environ = NULL; ++ size_t cmdline_size, environ_size; ++ ++ cmdline = read_file("/proc/self/cmdline", &cmdline_size); ++ if (!cmdline) ++ goto error; ++ environ = read_file("/proc/self/environ", &environ_size); ++ if (!environ) ++ goto error; ++ ++ if (parse_xargs(cmdline, cmdline_size, argv) <= 0) ++ goto error; ++ if (parse_xargs(environ, environ_size, envp) <= 0) ++ goto error; ++ ++ return 0; ++ ++error: ++ free(environ); ++ free(cmdline); ++ return -EINVAL; ++} ++ ++static int clone_binary(void) ++{ ++ int binfd, memfd; ++ ssize_t sent = 0; ++ ++#ifdef HAVE_MEMFD_CREATE ++ memfd = memfd_create(RUNC_MEMFD_COMMENT, MFD_CLOEXEC | MFD_ALLOW_SEALING); ++#else ++ memfd = open("/tmp", O_TMPFILE | O_EXCL | O_RDWR | O_CLOEXEC, 0711); ++#endif ++ if (memfd < 0) ++ return -ENOTRECOVERABLE; ++ ++ binfd = open("/proc/self/exe", O_RDONLY | O_CLOEXEC); ++ if (binfd < 0) ++ goto error; ++ ++ sent = sendfile(memfd, binfd, NULL, RUNC_SENDFILE_MAX); ++ close(binfd); ++ if (sent < 0) ++ goto error; ++ ++#ifdef HAVE_MEMFD_CREATE ++ int err = fcntl(memfd, F_ADD_SEALS, RUNC_MEMFD_SEALS); ++ if (err < 0) ++ goto error; ++#else ++ /* Need to re-open "memfd" as read-only to avoid execve(2) giving -EXTBUSY. */ ++ int newfd; ++ char *fdpath = NULL; ++ ++ if (asprintf(&fdpath, "/proc/self/fd/%d", memfd) < 0) ++ goto error; ++ newfd = open(fdpath, O_RDONLY | O_CLOEXEC); ++ free(fdpath); ++ if (newfd < 0) ++ goto error; ++ ++ close(memfd); ++ memfd = newfd; ++#endif ++ return memfd; ++ ++error: ++ close(memfd); ++ return -EIO; ++} ++ ++int ensure_cloned_binary(void) ++{ ++ int execfd; ++ char **argv = NULL, **envp = NULL; ++ ++ /* Check that we're not self-cloned, and if we are then bail. */ ++ int cloned = is_self_cloned(); ++ if (cloned > 0 || cloned == -ENOTRECOVERABLE) ++ return cloned; ++ ++ if (fetchve(&argv, &envp) < 0) ++ return -EINVAL; ++ ++ execfd = clone_binary(); ++ if (execfd < 0) ++ return -EIO; ++ ++ fexecve(execfd, argv, envp); ++ return -ENOEXEC; ++} +diff --git a/libcontainer/nsenter/nsexec.c b/libcontainer/nsenter/nsexec.c +index 28269dfc027f..7750af35ea92 100644 +--- a/libcontainer/nsenter/nsexec.c ++++ b/libcontainer/nsenter/nsexec.c +@@ -534,6 +534,9 @@ void join_namespaces(char *nslist) + free(namespaces); + } + ++/* Defined in cloned_binary.c. */ ++extern int ensure_cloned_binary(void); ++ + void nsexec(void) + { + int pipenum; +@@ -549,6 +552,14 @@ void nsexec(void) + if (pipenum == -1) + return; + ++ /* ++ * We need to re-exec if we are not in a cloned binary. This is necessary ++ * to ensure that containers won't be able to access the host binary ++ * through /proc/self/exe. See CVE-2019-5736. ++ */ ++ if (ensure_cloned_binary() < 0) ++ bail("could not ensure we are a cloned binary"); ++ + /* Parse all of the netlink configuration. */ + nl_parse(pipenum, &config); + +-- +2.20.1 + diff --git a/moby-engine.spec b/moby-engine.spec index 13dbbd8..6a22756 100644 --- a/moby-engine.spec +++ b/moby-engine.spec @@ -40,7 +40,7 @@ Name: %{newname}-engine Version: 18.06.1 -Release: 2.ce.git%{shortcommit_moby}%{?dist} +Release: 3.ce.git%{shortcommit_moby}%{?dist} Summary: The open-source application container engine License: ASL 2.0 # no golang / go-md2man for ppc64 @@ -53,6 +53,7 @@ Source4: %{git_tini}/archive/%{commit_tini}.tar.gz Source5: %{service_name}.service Source6: %{service_name}.sysconfig Patch1: https://github.com/moby/moby/commit/27d9030b2371aa4a6b167fded6b8dc25987a0af7.patch#/%{name}-%{version}-named-volumes.patch +Patch2: %{name}-%{version}-CVE-2019-5736.patch URL: https://www.%{origname}.com BuildRequires: btrfs-progs-devel @@ -153,6 +154,7 @@ tar zxf %{SOURCE3} tar zxf %{SOURCE4} %patch1 -p1 -d components/engine +%patch2 -p1 -d runc-%{commit_runc} # correct rpmlint errors for bash completion sed -i '/env bash/d' components/cli/contrib/completion/bash/docker @@ -340,6 +342,9 @@ getent group %{service_name} >/dev/null || groupadd -r %{service_name} || : %{_datadir}/nano/Dockerfile.nanorc %changelog +* Mon Feb 11 2019 David Michael - 18.06.1-3.ce.gite68fc7a +- Apply a runc patch for CVE-2019-5736. + * Fri Feb 01 2019 Fedora Release Engineering - 18.06.1-2.ce.gite68fc7a - Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild From dfd5e45f9610ef18f0872aeb8928b226a5012c22 Mon Sep 17 00:00:00 2001 From: David Michael Date: Sun, 10 Feb 2019 18:38:38 -0500 Subject: [PATCH 008/163] Add a runc patch for CVE-2019-5736 --- moby-engine-18.06.0-CVE-2019-5736.patch | 337 ++++++++++++++++++++++++ moby-engine.spec | 10 +- 2 files changed, 345 insertions(+), 2 deletions(-) create mode 100644 moby-engine-18.06.0-CVE-2019-5736.patch diff --git a/moby-engine-18.06.0-CVE-2019-5736.patch b/moby-engine-18.06.0-CVE-2019-5736.patch new file mode 100644 index 0000000..420a73d --- /dev/null +++ b/moby-engine-18.06.0-CVE-2019-5736.patch @@ -0,0 +1,337 @@ +From 2d069bb79260e594870ce3e7466477e54a0c5307 Mon Sep 17 00:00:00 2001 +From: Aleksa Sarai +Date: Wed, 9 Jan 2019 13:40:01 +1100 +Subject: [PATCH] nsenter: clone /proc/self/exe to avoid exposing host binary + to container + +There are quite a few circumstances where /proc/self/exe pointing to a +pretty important container binary is a _bad_ thing, so to avoid this we +have to make a copy (preferably doing self-clean-up and not being +writeable). + +We require memfd_create(2) -- though there is an O_TMPFILE fallback -- +but we can always extend this to use a scratch MNT_DETACH overlayfs or +tmpfs. The main downside to this approach is no page-cache sharing for +the runc binary (which overlayfs would give us) but this is far less +complicated. + +This is only done during nsenter so that it happens transparently to the +Go code, and any libcontainer users benefit from it. This also makes +ExtraFiles and --preserve-fds handling trivial (because we don't need to +worry about it). + +Fixes: CVE-2019-5736 +Co-developed-by: Christian Brauner +Signed-off-by: Aleksa Sarai +--- + libcontainer/nsenter/cloned_binary.c | 268 +++++++++++++++++++++++++++ + libcontainer/nsenter/nsexec.c | 11 ++ + 2 files changed, 279 insertions(+) + create mode 100644 libcontainer/nsenter/cloned_binary.c + +diff --git a/libcontainer/nsenter/cloned_binary.c b/libcontainer/nsenter/cloned_binary.c +new file mode 100644 +index 000000000000..c8a42c23f73f +--- /dev/null ++++ b/libcontainer/nsenter/cloned_binary.c +@@ -0,0 +1,268 @@ ++/* ++ * Copyright (C) 2019 Aleksa Sarai ++ * Copyright (C) 2019 SUSE LLC ++ * ++ * Licensed under the Apache License, Version 2.0 (the "License"); ++ * you may not use this file except in compliance with the License. ++ * You may obtain a copy of the License at ++ * ++ * http://www.apache.org/licenses/LICENSE-2.0 ++ * ++ * Unless required by applicable law or agreed to in writing, software ++ * distributed under the License is distributed on an "AS IS" BASIS, ++ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. ++ * See the License for the specific language governing permissions and ++ * limitations under the License. ++ */ ++ ++#define _GNU_SOURCE ++#include ++#include ++#include ++#include ++#include ++#include ++#include ++#include ++ ++#include ++#include ++#include ++#include ++#include ++#include ++ ++/* Use our own wrapper for memfd_create. */ ++#if !defined(SYS_memfd_create) && defined(__NR_memfd_create) ++# define SYS_memfd_create __NR_memfd_create ++#endif ++#ifdef SYS_memfd_create ++# define HAVE_MEMFD_CREATE ++/* memfd_create(2) flags -- copied from . */ ++# ifndef MFD_CLOEXEC ++# define MFD_CLOEXEC 0x0001U ++# define MFD_ALLOW_SEALING 0x0002U ++# endif ++int memfd_create(const char *name, unsigned int flags) ++{ ++ return syscall(SYS_memfd_create, name, flags); ++} ++#endif ++ ++/* This comes directly from . */ ++#ifndef F_LINUX_SPECIFIC_BASE ++# define F_LINUX_SPECIFIC_BASE 1024 ++#endif ++#ifndef F_ADD_SEALS ++# define F_ADD_SEALS (F_LINUX_SPECIFIC_BASE + 9) ++# define F_GET_SEALS (F_LINUX_SPECIFIC_BASE + 10) ++#endif ++#ifndef F_SEAL_SEAL ++# define F_SEAL_SEAL 0x0001 /* prevent further seals from being set */ ++# define F_SEAL_SHRINK 0x0002 /* prevent file from shrinking */ ++# define F_SEAL_GROW 0x0004 /* prevent file from growing */ ++# define F_SEAL_WRITE 0x0008 /* prevent writes */ ++#endif ++ ++#define RUNC_SENDFILE_MAX 0x7FFFF000 /* sendfile(2) is limited to 2GB. */ ++#ifdef HAVE_MEMFD_CREATE ++# define RUNC_MEMFD_COMMENT "runc_cloned:/proc/self/exe" ++# define RUNC_MEMFD_SEALS \ ++ (F_SEAL_SEAL | F_SEAL_SHRINK | F_SEAL_GROW | F_SEAL_WRITE) ++#endif ++ ++static void *must_realloc(void *ptr, size_t size) ++{ ++ void *old = ptr; ++ do { ++ ptr = realloc(old, size); ++ } while(!ptr); ++ return ptr; ++} ++ ++/* ++ * Verify whether we are currently in a self-cloned program (namely, is ++ * /proc/self/exe a memfd). F_GET_SEALS will only succeed for memfds (or rather ++ * for shmem files), and we want to be sure it's actually sealed. ++ */ ++static int is_self_cloned(void) ++{ ++ int fd, ret, is_cloned = 0; ++ ++ fd = open("/proc/self/exe", O_RDONLY|O_CLOEXEC); ++ if (fd < 0) ++ return -ENOTRECOVERABLE; ++ ++#ifdef HAVE_MEMFD_CREATE ++ ret = fcntl(fd, F_GET_SEALS); ++ is_cloned = (ret == RUNC_MEMFD_SEALS); ++#else ++ struct stat statbuf = {0}; ++ ret = fstat(fd, &statbuf); ++ if (ret >= 0) ++ is_cloned = (statbuf.st_nlink == 0); ++#endif ++ close(fd); ++ return is_cloned; ++} ++ ++/* ++ * Basic wrapper around mmap(2) that gives you the file length so you can ++ * safely treat it as an ordinary buffer. Only gives you read access. ++ */ ++static char *read_file(char *path, size_t *length) ++{ ++ int fd; ++ char buf[4096], *copy = NULL; ++ ++ if (!length) ++ return NULL; ++ ++ fd = open(path, O_RDONLY | O_CLOEXEC); ++ if (fd < 0) ++ return NULL; ++ ++ *length = 0; ++ for (;;) { ++ int n; ++ ++ n = read(fd, buf, sizeof(buf)); ++ if (n < 0) ++ goto error; ++ if (!n) ++ break; ++ ++ copy = must_realloc(copy, (*length + n) * sizeof(*copy)); ++ memcpy(copy + *length, buf, n); ++ *length += n; ++ } ++ close(fd); ++ return copy; ++ ++error: ++ close(fd); ++ free(copy); ++ return NULL; ++} ++ ++/* ++ * A poor-man's version of "xargs -0". Basically parses a given block of ++ * NUL-delimited data, within the given length and adds a pointer to each entry ++ * to the array of pointers. ++ */ ++static int parse_xargs(char *data, int data_length, char ***output) ++{ ++ int num = 0; ++ char *cur = data; ++ ++ if (!data || *output != NULL) ++ return -1; ++ ++ while (cur < data + data_length) { ++ num++; ++ *output = must_realloc(*output, (num + 1) * sizeof(**output)); ++ (*output)[num - 1] = cur; ++ cur += strlen(cur) + 1; ++ } ++ (*output)[num] = NULL; ++ return num; ++} ++ ++/* ++ * "Parse" out argv and envp from /proc/self/cmdline and /proc/self/environ. ++ * This is necessary because we are running in a context where we don't have a ++ * main() that we can just get the arguments from. ++ */ ++static int fetchve(char ***argv, char ***envp) ++{ ++ char *cmdline = NULL, *environ = NULL; ++ size_t cmdline_size, environ_size; ++ ++ cmdline = read_file("/proc/self/cmdline", &cmdline_size); ++ if (!cmdline) ++ goto error; ++ environ = read_file("/proc/self/environ", &environ_size); ++ if (!environ) ++ goto error; ++ ++ if (parse_xargs(cmdline, cmdline_size, argv) <= 0) ++ goto error; ++ if (parse_xargs(environ, environ_size, envp) <= 0) ++ goto error; ++ ++ return 0; ++ ++error: ++ free(environ); ++ free(cmdline); ++ return -EINVAL; ++} ++ ++static int clone_binary(void) ++{ ++ int binfd, memfd; ++ ssize_t sent = 0; ++ ++#ifdef HAVE_MEMFD_CREATE ++ memfd = memfd_create(RUNC_MEMFD_COMMENT, MFD_CLOEXEC | MFD_ALLOW_SEALING); ++#else ++ memfd = open("/tmp", O_TMPFILE | O_EXCL | O_RDWR | O_CLOEXEC, 0711); ++#endif ++ if (memfd < 0) ++ return -ENOTRECOVERABLE; ++ ++ binfd = open("/proc/self/exe", O_RDONLY | O_CLOEXEC); ++ if (binfd < 0) ++ goto error; ++ ++ sent = sendfile(memfd, binfd, NULL, RUNC_SENDFILE_MAX); ++ close(binfd); ++ if (sent < 0) ++ goto error; ++ ++#ifdef HAVE_MEMFD_CREATE ++ int err = fcntl(memfd, F_ADD_SEALS, RUNC_MEMFD_SEALS); ++ if (err < 0) ++ goto error; ++#else ++ /* Need to re-open "memfd" as read-only to avoid execve(2) giving -EXTBUSY. */ ++ int newfd; ++ char *fdpath = NULL; ++ ++ if (asprintf(&fdpath, "/proc/self/fd/%d", memfd) < 0) ++ goto error; ++ newfd = open(fdpath, O_RDONLY | O_CLOEXEC); ++ free(fdpath); ++ if (newfd < 0) ++ goto error; ++ ++ close(memfd); ++ memfd = newfd; ++#endif ++ return memfd; ++ ++error: ++ close(memfd); ++ return -EIO; ++} ++ ++int ensure_cloned_binary(void) ++{ ++ int execfd; ++ char **argv = NULL, **envp = NULL; ++ ++ /* Check that we're not self-cloned, and if we are then bail. */ ++ int cloned = is_self_cloned(); ++ if (cloned > 0 || cloned == -ENOTRECOVERABLE) ++ return cloned; ++ ++ if (fetchve(&argv, &envp) < 0) ++ return -EINVAL; ++ ++ execfd = clone_binary(); ++ if (execfd < 0) ++ return -EIO; ++ ++ fexecve(execfd, argv, envp); ++ return -ENOEXEC; ++} +diff --git a/libcontainer/nsenter/nsexec.c b/libcontainer/nsenter/nsexec.c +index 28269dfc027f..7750af35ea92 100644 +--- a/libcontainer/nsenter/nsexec.c ++++ b/libcontainer/nsenter/nsexec.c +@@ -534,6 +534,9 @@ void join_namespaces(char *nslist) + free(namespaces); + } + ++/* Defined in cloned_binary.c. */ ++extern int ensure_cloned_binary(void); ++ + void nsexec(void) + { + int pipenum; +@@ -549,6 +552,14 @@ void nsexec(void) + if (pipenum == -1) + return; + ++ /* ++ * We need to re-exec if we are not in a cloned binary. This is necessary ++ * to ensure that containers won't be able to access the host binary ++ * through /proc/self/exe. See CVE-2019-5736. ++ */ ++ if (ensure_cloned_binary() < 0) ++ bail("could not ensure we are a cloned binary"); ++ + /* Parse all of the netlink configuration. */ + nl_parse(pipenum, &config); + +-- +2.20.1 + diff --git a/moby-engine.spec b/moby-engine.spec index 46aeb28..e6003db 100644 --- a/moby-engine.spec +++ b/moby-engine.spec @@ -40,7 +40,7 @@ Name: %{newname}-engine Version: 18.06.0 -Release: 1.ce.git%{shortcommit_moby}%{?dist} +Release: 2.ce.git%{shortcommit_moby}%{?dist} Summary: The open-source application container engine License: ASL 2.0 # no golang / go-md2man for ppc64 @@ -50,6 +50,7 @@ Source1: %{git_runc}/archive/%{commit_runc}.tar.gz Source2: %{git_containerd}/archive/%{commit_containerd}.tar.gz Source3: %{git_libnetwork}/archive/%{commit_libnetwork}.tar.gz Source4: %{git_tini}/archive/%{commit_tini}.tar.gz +Patch1: %{name}-%{version}-CVE-2019-5736.patch URL: https://www.%{origname}.com BuildRequires: btrfs-progs-devel @@ -135,7 +136,7 @@ Requires: nano This package installs %{summary}. %prep -%autosetup -Sgit -n %{service_name}-ce-%{commit_moby} +%autosetup -N -Sgit -n %{service_name}-ce-%{commit_moby} # correct rpmlint errors for bash completion pushd components/cli @@ -154,6 +155,8 @@ tar zxf %{SOURCE3} # untar tini tar zxf %{SOURCE4} +%patch1 -p1 -d runc-%{commit_runc} + %build # build docker-runc pushd runc-%{commit_runc} @@ -321,6 +324,9 @@ done %{_datadir}/nano/Dockerfile.nanorc %changelog +* Mon Feb 11 2019 David Michael - 18.06.0-2.ce.git0ffa825 +- Apply a runc patch for CVE-2019-5736. + * Sat Aug 18 2018 Lokesh Mandvekar - 18.06.0-1.ce.git0ffa825 - Resolves: #1539161 - first upload to Fedora - built docker-ce commit 0ffa825 From 31fce5170a24936e5cf33442c03c475036ea9d49 Mon Sep 17 00:00:00 2001 From: David Michael Date: Thu, 14 Feb 2019 09:34:51 -0500 Subject: [PATCH 009/163] Update to 18.06.2 --- .gitignore | 6 +- moby-engine-18.06.1-CVE-2019-5736.patch | 337 ------------------------ moby-engine.spec | 19 +- sources | 6 +- 4 files changed, 18 insertions(+), 350 deletions(-) delete mode 100644 moby-engine-18.06.1-CVE-2019-5736.patch diff --git a/.gitignore b/.gitignore index db75545..bfc5425 100644 --- a/.gitignore +++ b/.gitignore @@ -1,6 +1,6 @@ /3ac297bc7fd0afec9051bbb47024c9bc1d75bf5b.tar.gz /468a545b9edcd5932818eb9de8e72413e616e86e.tar.gz -/69663f0bd4b60df09991c08812a60108003fa340.tar.gz -/e68fc7a215d7133c34aa18e3b72b4a21fd0c6136.tar.gz +/6d37f41e333ee478440ef969392020f7e3915cd3.tar.gz +/a592beb5bc4c4092b1b1bac971afed27687340c5.tar.gz /fec3683b971d9c3ef73f284f176672c44b448662.tar.gz -/moby-engine-18.06.1-named-volumes.patch +/moby-engine-18.06.2-named-volumes.patch diff --git a/moby-engine-18.06.1-CVE-2019-5736.patch b/moby-engine-18.06.1-CVE-2019-5736.patch deleted file mode 100644 index 420a73d..0000000 --- a/moby-engine-18.06.1-CVE-2019-5736.patch +++ /dev/null @@ -1,337 +0,0 @@ -From 2d069bb79260e594870ce3e7466477e54a0c5307 Mon Sep 17 00:00:00 2001 -From: Aleksa Sarai -Date: Wed, 9 Jan 2019 13:40:01 +1100 -Subject: [PATCH] nsenter: clone /proc/self/exe to avoid exposing host binary - to container - -There are quite a few circumstances where /proc/self/exe pointing to a -pretty important container binary is a _bad_ thing, so to avoid this we -have to make a copy (preferably doing self-clean-up and not being -writeable). - -We require memfd_create(2) -- though there is an O_TMPFILE fallback -- -but we can always extend this to use a scratch MNT_DETACH overlayfs or -tmpfs. The main downside to this approach is no page-cache sharing for -the runc binary (which overlayfs would give us) but this is far less -complicated. - -This is only done during nsenter so that it happens transparently to the -Go code, and any libcontainer users benefit from it. This also makes -ExtraFiles and --preserve-fds handling trivial (because we don't need to -worry about it). - -Fixes: CVE-2019-5736 -Co-developed-by: Christian Brauner -Signed-off-by: Aleksa Sarai ---- - libcontainer/nsenter/cloned_binary.c | 268 +++++++++++++++++++++++++++ - libcontainer/nsenter/nsexec.c | 11 ++ - 2 files changed, 279 insertions(+) - create mode 100644 libcontainer/nsenter/cloned_binary.c - -diff --git a/libcontainer/nsenter/cloned_binary.c b/libcontainer/nsenter/cloned_binary.c -new file mode 100644 -index 000000000000..c8a42c23f73f ---- /dev/null -+++ b/libcontainer/nsenter/cloned_binary.c -@@ -0,0 +1,268 @@ -+/* -+ * Copyright (C) 2019 Aleksa Sarai -+ * Copyright (C) 2019 SUSE LLC -+ * -+ * Licensed under the Apache License, Version 2.0 (the "License"); -+ * you may not use this file except in compliance with the License. -+ * You may obtain a copy of the License at -+ * -+ * http://www.apache.org/licenses/LICENSE-2.0 -+ * -+ * Unless required by applicable law or agreed to in writing, software -+ * distributed under the License is distributed on an "AS IS" BASIS, -+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -+ * See the License for the specific language governing permissions and -+ * limitations under the License. -+ */ -+ -+#define _GNU_SOURCE -+#include -+#include -+#include -+#include -+#include -+#include -+#include -+#include -+ -+#include -+#include -+#include -+#include -+#include -+#include -+ -+/* Use our own wrapper for memfd_create. */ -+#if !defined(SYS_memfd_create) && defined(__NR_memfd_create) -+# define SYS_memfd_create __NR_memfd_create -+#endif -+#ifdef SYS_memfd_create -+# define HAVE_MEMFD_CREATE -+/* memfd_create(2) flags -- copied from . */ -+# ifndef MFD_CLOEXEC -+# define MFD_CLOEXEC 0x0001U -+# define MFD_ALLOW_SEALING 0x0002U -+# endif -+int memfd_create(const char *name, unsigned int flags) -+{ -+ return syscall(SYS_memfd_create, name, flags); -+} -+#endif -+ -+/* This comes directly from . */ -+#ifndef F_LINUX_SPECIFIC_BASE -+# define F_LINUX_SPECIFIC_BASE 1024 -+#endif -+#ifndef F_ADD_SEALS -+# define F_ADD_SEALS (F_LINUX_SPECIFIC_BASE + 9) -+# define F_GET_SEALS (F_LINUX_SPECIFIC_BASE + 10) -+#endif -+#ifndef F_SEAL_SEAL -+# define F_SEAL_SEAL 0x0001 /* prevent further seals from being set */ -+# define F_SEAL_SHRINK 0x0002 /* prevent file from shrinking */ -+# define F_SEAL_GROW 0x0004 /* prevent file from growing */ -+# define F_SEAL_WRITE 0x0008 /* prevent writes */ -+#endif -+ -+#define RUNC_SENDFILE_MAX 0x7FFFF000 /* sendfile(2) is limited to 2GB. */ -+#ifdef HAVE_MEMFD_CREATE -+# define RUNC_MEMFD_COMMENT "runc_cloned:/proc/self/exe" -+# define RUNC_MEMFD_SEALS \ -+ (F_SEAL_SEAL | F_SEAL_SHRINK | F_SEAL_GROW | F_SEAL_WRITE) -+#endif -+ -+static void *must_realloc(void *ptr, size_t size) -+{ -+ void *old = ptr; -+ do { -+ ptr = realloc(old, size); -+ } while(!ptr); -+ return ptr; -+} -+ -+/* -+ * Verify whether we are currently in a self-cloned program (namely, is -+ * /proc/self/exe a memfd). F_GET_SEALS will only succeed for memfds (or rather -+ * for shmem files), and we want to be sure it's actually sealed. -+ */ -+static int is_self_cloned(void) -+{ -+ int fd, ret, is_cloned = 0; -+ -+ fd = open("/proc/self/exe", O_RDONLY|O_CLOEXEC); -+ if (fd < 0) -+ return -ENOTRECOVERABLE; -+ -+#ifdef HAVE_MEMFD_CREATE -+ ret = fcntl(fd, F_GET_SEALS); -+ is_cloned = (ret == RUNC_MEMFD_SEALS); -+#else -+ struct stat statbuf = {0}; -+ ret = fstat(fd, &statbuf); -+ if (ret >= 0) -+ is_cloned = (statbuf.st_nlink == 0); -+#endif -+ close(fd); -+ return is_cloned; -+} -+ -+/* -+ * Basic wrapper around mmap(2) that gives you the file length so you can -+ * safely treat it as an ordinary buffer. Only gives you read access. -+ */ -+static char *read_file(char *path, size_t *length) -+{ -+ int fd; -+ char buf[4096], *copy = NULL; -+ -+ if (!length) -+ return NULL; -+ -+ fd = open(path, O_RDONLY | O_CLOEXEC); -+ if (fd < 0) -+ return NULL; -+ -+ *length = 0; -+ for (;;) { -+ int n; -+ -+ n = read(fd, buf, sizeof(buf)); -+ if (n < 0) -+ goto error; -+ if (!n) -+ break; -+ -+ copy = must_realloc(copy, (*length + n) * sizeof(*copy)); -+ memcpy(copy + *length, buf, n); -+ *length += n; -+ } -+ close(fd); -+ return copy; -+ -+error: -+ close(fd); -+ free(copy); -+ return NULL; -+} -+ -+/* -+ * A poor-man's version of "xargs -0". Basically parses a given block of -+ * NUL-delimited data, within the given length and adds a pointer to each entry -+ * to the array of pointers. -+ */ -+static int parse_xargs(char *data, int data_length, char ***output) -+{ -+ int num = 0; -+ char *cur = data; -+ -+ if (!data || *output != NULL) -+ return -1; -+ -+ while (cur < data + data_length) { -+ num++; -+ *output = must_realloc(*output, (num + 1) * sizeof(**output)); -+ (*output)[num - 1] = cur; -+ cur += strlen(cur) + 1; -+ } -+ (*output)[num] = NULL; -+ return num; -+} -+ -+/* -+ * "Parse" out argv and envp from /proc/self/cmdline and /proc/self/environ. -+ * This is necessary because we are running in a context where we don't have a -+ * main() that we can just get the arguments from. -+ */ -+static int fetchve(char ***argv, char ***envp) -+{ -+ char *cmdline = NULL, *environ = NULL; -+ size_t cmdline_size, environ_size; -+ -+ cmdline = read_file("/proc/self/cmdline", &cmdline_size); -+ if (!cmdline) -+ goto error; -+ environ = read_file("/proc/self/environ", &environ_size); -+ if (!environ) -+ goto error; -+ -+ if (parse_xargs(cmdline, cmdline_size, argv) <= 0) -+ goto error; -+ if (parse_xargs(environ, environ_size, envp) <= 0) -+ goto error; -+ -+ return 0; -+ -+error: -+ free(environ); -+ free(cmdline); -+ return -EINVAL; -+} -+ -+static int clone_binary(void) -+{ -+ int binfd, memfd; -+ ssize_t sent = 0; -+ -+#ifdef HAVE_MEMFD_CREATE -+ memfd = memfd_create(RUNC_MEMFD_COMMENT, MFD_CLOEXEC | MFD_ALLOW_SEALING); -+#else -+ memfd = open("/tmp", O_TMPFILE | O_EXCL | O_RDWR | O_CLOEXEC, 0711); -+#endif -+ if (memfd < 0) -+ return -ENOTRECOVERABLE; -+ -+ binfd = open("/proc/self/exe", O_RDONLY | O_CLOEXEC); -+ if (binfd < 0) -+ goto error; -+ -+ sent = sendfile(memfd, binfd, NULL, RUNC_SENDFILE_MAX); -+ close(binfd); -+ if (sent < 0) -+ goto error; -+ -+#ifdef HAVE_MEMFD_CREATE -+ int err = fcntl(memfd, F_ADD_SEALS, RUNC_MEMFD_SEALS); -+ if (err < 0) -+ goto error; -+#else -+ /* Need to re-open "memfd" as read-only to avoid execve(2) giving -EXTBUSY. */ -+ int newfd; -+ char *fdpath = NULL; -+ -+ if (asprintf(&fdpath, "/proc/self/fd/%d", memfd) < 0) -+ goto error; -+ newfd = open(fdpath, O_RDONLY | O_CLOEXEC); -+ free(fdpath); -+ if (newfd < 0) -+ goto error; -+ -+ close(memfd); -+ memfd = newfd; -+#endif -+ return memfd; -+ -+error: -+ close(memfd); -+ return -EIO; -+} -+ -+int ensure_cloned_binary(void) -+{ -+ int execfd; -+ char **argv = NULL, **envp = NULL; -+ -+ /* Check that we're not self-cloned, and if we are then bail. */ -+ int cloned = is_self_cloned(); -+ if (cloned > 0 || cloned == -ENOTRECOVERABLE) -+ return cloned; -+ -+ if (fetchve(&argv, &envp) < 0) -+ return -EINVAL; -+ -+ execfd = clone_binary(); -+ if (execfd < 0) -+ return -EIO; -+ -+ fexecve(execfd, argv, envp); -+ return -ENOEXEC; -+} -diff --git a/libcontainer/nsenter/nsexec.c b/libcontainer/nsenter/nsexec.c -index 28269dfc027f..7750af35ea92 100644 ---- a/libcontainer/nsenter/nsexec.c -+++ b/libcontainer/nsenter/nsexec.c -@@ -534,6 +534,9 @@ void join_namespaces(char *nslist) - free(namespaces); - } - -+/* Defined in cloned_binary.c. */ -+extern int ensure_cloned_binary(void); -+ - void nsexec(void) - { - int pipenum; -@@ -549,6 +552,14 @@ void nsexec(void) - if (pipenum == -1) - return; - -+ /* -+ * We need to re-exec if we are not in a cloned binary. This is necessary -+ * to ensure that containers won't be able to access the host binary -+ * through /proc/self/exe. See CVE-2019-5736. -+ */ -+ if (ensure_cloned_binary() < 0) -+ bail("could not ensure we are a cloned binary"); -+ - /* Parse all of the netlink configuration. */ - nl_parse(pipenum, &config); - --- -2.20.1 - diff --git a/moby-engine.spec b/moby-engine.spec index 6a22756..519eee4 100644 --- a/moby-engine.spec +++ b/moby-engine.spec @@ -15,12 +15,12 @@ # moby / docker-ce / cli %global git_moby https://github.com/%{service_name}/%{service_name}-ce -%global commit_moby e68fc7a215d7133c34aa18e3b72b4a21fd0c6136 +%global commit_moby 6d37f41e333ee478440ef969392020f7e3915cd3 %global shortcommit_moby %(c=%{commit_moby}; echo ${c:0:7}) # docker-runc %global git_runc https://github.com/opencontainers/runc -%global commit_runc 69663f0bd4b60df09991c08812a60108003fa340 +%global commit_runc a592beb5bc4c4092b1b1bac971afed27687340c5 %global shortcommit_runc %(c=%{commit_runc}; echo ${c:0:7}) # docker-containerd @@ -39,8 +39,8 @@ %global shortcommit_tini %(c=%{commit_tini}; echo ${c:0:7}) Name: %{newname}-engine -Version: 18.06.1 -Release: 3.ce.git%{shortcommit_moby}%{?dist} +Version: 18.06.2 +Release: 1.ce.git%{shortcommit_moby}%{?dist} Summary: The open-source application container engine License: ASL 2.0 # no golang / go-md2man for ppc64 @@ -53,7 +53,6 @@ Source4: %{git_tini}/archive/%{commit_tini}.tar.gz Source5: %{service_name}.service Source6: %{service_name}.sysconfig Patch1: https://github.com/moby/moby/commit/27d9030b2371aa4a6b167fded6b8dc25987a0af7.patch#/%{name}-%{version}-named-volumes.patch -Patch2: %{name}-%{version}-CVE-2019-5736.patch URL: https://www.%{origname}.com BuildRequires: btrfs-progs-devel @@ -154,7 +153,6 @@ tar zxf %{SOURCE3} tar zxf %{SOURCE4} %patch1 -p1 -d components/engine -%patch2 -p1 -d runc-%{commit_runc} # correct rpmlint errors for bash completion sed -i '/env bash/d' components/cli/contrib/completion/bash/docker @@ -170,7 +168,10 @@ sed -i 's/-s -w *//' containerd-%{commit_containerd}/Makefile mkdir -p src/github.com/opencontainers ln -fns ../../.. src/github.com/opencontainers/runc export GOPATH="${PWD}" - make BUILDTAGS="seccomp selinux" COMMIT=%{commit_runc} + # Match versions resulting from Docker CE's embargoed patch process. + make BUILDTAGS="seccomp selinux" \ + COMMIT=69663f0bd4b60df09991c08812a60108003fa340 \ + VERSION=1.0.0-rc5+dev.docker-18.06 ) # build docker-containerd @@ -342,6 +343,10 @@ getent group %{service_name} >/dev/null || groupadd -r %{service_name} || : %{_datadir}/nano/Dockerfile.nanorc %changelog +* Tue Feb 12 2019 David Michael - 18.06.2-1.ce.git6d37f41 +- Update docker-ce to commit 6d37f41 (version 18.06.2). +- Update docker-runc to commit a592beb. + * Mon Feb 11 2019 David Michael - 18.06.1-3.ce.gite68fc7a - Apply a runc patch for CVE-2019-5736. diff --git a/sources b/sources index 705c7de..579c7f0 100644 --- a/sources +++ b/sources @@ -1,6 +1,6 @@ SHA512 (3ac297bc7fd0afec9051bbb47024c9bc1d75bf5b.tar.gz) = 21d3d1bd8aafeab51a3e0a14ada4d559b5b113a48d315e91f7d70e4fa839f5c92d4068b38c28bf6929da9c11cfc61703bafc7148f64b784208d61fa14ee4545d SHA512 (468a545b9edcd5932818eb9de8e72413e616e86e.tar.gz) = 0c3cb261a535826f281af2d2df7e5c93e7d37139d5b709d7534148b9e706db56704d06b81a9e76acc2e86180f37475d566b8ddde990bbaae424af70206602347 -SHA512 (69663f0bd4b60df09991c08812a60108003fa340.tar.gz) = 9a55bdb8e39830f46cceff48970b7688139927552e3d268b9ef4a6e640ffc3d95164b99c5b05d07d295bedc2ea22daf6062fd520df1548d78b1d481fd928f1e3 -SHA512 (e68fc7a215d7133c34aa18e3b72b4a21fd0c6136.tar.gz) = cbeb029bbdcb6d7bd83b0257fe51fc9434fed18ac1c266e79fba43be663c3cfb38434ba2dbca055a0524b58e767b4715d1f59a79b66cf13406fb10f511423cd0 +SHA512 (6d37f41e333ee478440ef969392020f7e3915cd3.tar.gz) = cab8ff386cc4f82789751c6b8660f155e1ad3c4fbb62766f9d9820f3843cc116fc9c851b6022ea4cb0e01e65b61abd5412e84b2ade838fb11127b9147491e8c8 +SHA512 (a592beb5bc4c4092b1b1bac971afed27687340c5.tar.gz) = 4b45d5f899ece2c017e93bdb211436ccea84c14ac99f3104baa5728b188536d390036f0defd40dab9514a529e48f39d093cbcc15fa98012e70c8e4f560168f9f SHA512 (fec3683b971d9c3ef73f284f176672c44b448662.tar.gz) = ee46d21467f8bacb4e8be72f5dfcbb23c1964286e90b4b3d3bf67dbbf79a337968ac8a0042a8191e329a65398b20ea160aae3ae5ef20ee03ebae11c2083d7621 -SHA512 (moby-engine-18.06.1-named-volumes.patch) = 70a1075592e31bfa89f6b24231bdeb0d476f137a1b4aa568c281cdab1acfbcd9b738d42a31a83950479171412991ddd3d1c4bc58623df07c8ae15d606f843c9a +SHA512 (moby-engine-18.06.2-named-volumes.patch) = 70a1075592e31bfa89f6b24231bdeb0d476f137a1b4aa568c281cdab1acfbcd9b738d42a31a83950479171412991ddd3d1c4bc58623df07c8ae15d606f843c9a From 36c67c12e5ace0a593c9a214eca9e1d1df78d7ab Mon Sep 17 00:00:00 2001 From: David Michael Date: Thu, 21 Feb 2019 13:44:06 -0500 Subject: [PATCH 010/163] Update to 18.06.3 --- .gitignore | 4 ++-- moby-engine.spec | 11 ++++++----- sources | 4 ++-- 3 files changed, 10 insertions(+), 9 deletions(-) diff --git a/.gitignore b/.gitignore index bfc5425..b424f53 100644 --- a/.gitignore +++ b/.gitignore @@ -1,6 +1,6 @@ /3ac297bc7fd0afec9051bbb47024c9bc1d75bf5b.tar.gz /468a545b9edcd5932818eb9de8e72413e616e86e.tar.gz -/6d37f41e333ee478440ef969392020f7e3915cd3.tar.gz /a592beb5bc4c4092b1b1bac971afed27687340c5.tar.gz +/d7080c17a580919f5340a15a8e5e013133089680.tar.gz /fec3683b971d9c3ef73f284f176672c44b448662.tar.gz -/moby-engine-18.06.2-named-volumes.patch +/moby-engine-18.06.3-named-volumes.patch diff --git a/moby-engine.spec b/moby-engine.spec index 519eee4..a3ceb2a 100644 --- a/moby-engine.spec +++ b/moby-engine.spec @@ -15,7 +15,7 @@ # moby / docker-ce / cli %global git_moby https://github.com/%{service_name}/%{service_name}-ce -%global commit_moby 6d37f41e333ee478440ef969392020f7e3915cd3 +%global commit_moby d7080c17a580919f5340a15a8e5e013133089680 %global shortcommit_moby %(c=%{commit_moby}; echo ${c:0:7}) # docker-runc @@ -39,7 +39,7 @@ %global shortcommit_tini %(c=%{commit_tini}; echo ${c:0:7}) Name: %{newname}-engine -Version: 18.06.2 +Version: 18.06.3 Release: 1.ce.git%{shortcommit_moby}%{?dist} Summary: The open-source application container engine License: ASL 2.0 @@ -168,9 +168,7 @@ sed -i 's/-s -w *//' containerd-%{commit_containerd}/Makefile mkdir -p src/github.com/opencontainers ln -fns ../../.. src/github.com/opencontainers/runc export GOPATH="${PWD}" - # Match versions resulting from Docker CE's embargoed patch process. - make BUILDTAGS="seccomp selinux" \ - COMMIT=69663f0bd4b60df09991c08812a60108003fa340 \ + make BUILDTAGS="seccomp selinux" COMMIT=%{commit_runc} \ VERSION=1.0.0-rc5+dev.docker-18.06 ) @@ -343,6 +341,9 @@ getent group %{service_name} >/dev/null || groupadd -r %{service_name} || : %{_datadir}/nano/Dockerfile.nanorc %changelog +* Thu Feb 21 2019 David Michael - 18.06.3-1.ce.gitd7080c1 +- Update docker-ce to commit d7080c1 (version 18.06.3). + * Tue Feb 12 2019 David Michael - 18.06.2-1.ce.git6d37f41 - Update docker-ce to commit 6d37f41 (version 18.06.2). - Update docker-runc to commit a592beb. diff --git a/sources b/sources index 579c7f0..db87ddd 100644 --- a/sources +++ b/sources @@ -1,6 +1,6 @@ SHA512 (3ac297bc7fd0afec9051bbb47024c9bc1d75bf5b.tar.gz) = 21d3d1bd8aafeab51a3e0a14ada4d559b5b113a48d315e91f7d70e4fa839f5c92d4068b38c28bf6929da9c11cfc61703bafc7148f64b784208d61fa14ee4545d SHA512 (468a545b9edcd5932818eb9de8e72413e616e86e.tar.gz) = 0c3cb261a535826f281af2d2df7e5c93e7d37139d5b709d7534148b9e706db56704d06b81a9e76acc2e86180f37475d566b8ddde990bbaae424af70206602347 -SHA512 (6d37f41e333ee478440ef969392020f7e3915cd3.tar.gz) = cab8ff386cc4f82789751c6b8660f155e1ad3c4fbb62766f9d9820f3843cc116fc9c851b6022ea4cb0e01e65b61abd5412e84b2ade838fb11127b9147491e8c8 SHA512 (a592beb5bc4c4092b1b1bac971afed27687340c5.tar.gz) = 4b45d5f899ece2c017e93bdb211436ccea84c14ac99f3104baa5728b188536d390036f0defd40dab9514a529e48f39d093cbcc15fa98012e70c8e4f560168f9f +SHA512 (d7080c17a580919f5340a15a8e5e013133089680.tar.gz) = 65a67f906f2a7e28d9c7e35491e5da8430d075027adf6d41b9baec21a0b3f08d006de7568e6bfa37e3b9edbbed53af71e96a553446e01abaa51533ceb4db21a2 SHA512 (fec3683b971d9c3ef73f284f176672c44b448662.tar.gz) = ee46d21467f8bacb4e8be72f5dfcbb23c1964286e90b4b3d3bf67dbbf79a337968ac8a0042a8191e329a65398b20ea160aae3ae5ef20ee03ebae11c2083d7621 -SHA512 (moby-engine-18.06.2-named-volumes.patch) = 70a1075592e31bfa89f6b24231bdeb0d476f137a1b4aa568c281cdab1acfbcd9b738d42a31a83950479171412991ddd3d1c4bc58623df07c8ae15d606f843c9a +SHA512 (moby-engine-18.06.3-named-volumes.patch) = 70a1075592e31bfa89f6b24231bdeb0d476f137a1b4aa568c281cdab1acfbcd9b738d42a31a83950479171412991ddd3d1c4bc58623df07c8ae15d606f843c9a From 01525ef4c00217b856a0ab436a1d6e2e7427dada Mon Sep 17 00:00:00 2001 From: David Michael Date: Thu, 28 Mar 2019 12:09:52 -0400 Subject: [PATCH 011/163] Conflict with docker-common It also installs /usr/bin/docker etc. --- moby-engine.spec | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/moby-engine.spec b/moby-engine.spec index a3ceb2a..1a67ffd 100644 --- a/moby-engine.spec +++ b/moby-engine.spec @@ -40,7 +40,7 @@ Name: %{newname}-engine Version: 18.06.3 -Release: 1.ce.git%{shortcommit_moby}%{?dist} +Release: 2.ce.git%{shortcommit_moby}%{?dist} Summary: The open-source application container engine License: ASL 2.0 # no golang / go-md2man for ppc64 @@ -86,6 +86,7 @@ Requires: device-mapper-libs >= 1.02.90-1 # conflicting packages Conflicts: %{origname} +Conflicts: %{origname}-common Conflicts: %{origname}-io Conflicts: %{origname}-engine-cs Conflicts: %{origname}-ce @@ -341,6 +342,9 @@ getent group %{service_name} >/dev/null || groupadd -r %{service_name} || : %{_datadir}/nano/Dockerfile.nanorc %changelog +* Thu Mar 28 2019 David Michael - 18.06.3-2.ce.gitd7080c1 +- Conflict with docker-common. (#1693397) + * Thu Feb 21 2019 David Michael - 18.06.3-1.ce.gitd7080c1 - Update docker-ce to commit d7080c1 (version 18.06.3). From 06a6728e59f270f02c5f928c238ab9f653cc3ccc Mon Sep 17 00:00:00 2001 From: David Michael Date: Tue, 27 Nov 2018 09:45:13 -0500 Subject: [PATCH 012/163] Update to 18.09.5 Version 18.09 requires unprefixed runc and containerd commands now, so the package has new conflicts with containerd and runc. Maybe in the future alternatives can be set up across packages to choose which versions to use, but for now just follow precedent and add more conflicts. --- .gitignore | 9 ++++----- moby-engine.spec | 39 ++++++++++++++++++++++++++++----------- sources | 9 ++++----- 3 files changed, 36 insertions(+), 21 deletions(-) diff --git a/.gitignore b/.gitignore index b424f53..12fb923 100644 --- a/.gitignore +++ b/.gitignore @@ -1,6 +1,5 @@ -/3ac297bc7fd0afec9051bbb47024c9bc1d75bf5b.tar.gz -/468a545b9edcd5932818eb9de8e72413e616e86e.tar.gz -/a592beb5bc4c4092b1b1bac971afed27687340c5.tar.gz -/d7080c17a580919f5340a15a8e5e013133089680.tar.gz +/2b18fe1d885ee5083ef9f0838fee39b62d653e30.tar.gz +/4725f2163fb214a6312f3beae5991f838ec36326.tar.gz +/bb71b10fd8f58240ca47fbb579b9d1028eea7c84.tar.gz +/e8ff056dbcfadaeca12a5f508b0cec281126c01d.tar.gz /fec3683b971d9c3ef73f284f176672c44b448662.tar.gz -/moby-engine-18.06.3-named-volumes.patch diff --git a/moby-engine.spec b/moby-engine.spec index 1a67ffd..ea64168 100644 --- a/moby-engine.spec +++ b/moby-engine.spec @@ -15,22 +15,22 @@ # moby / docker-ce / cli %global git_moby https://github.com/%{service_name}/%{service_name}-ce -%global commit_moby d7080c17a580919f5340a15a8e5e013133089680 +%global commit_moby e8ff056dbcfadaeca12a5f508b0cec281126c01d %global shortcommit_moby %(c=%{commit_moby}; echo ${c:0:7}) # docker-runc %global git_runc https://github.com/opencontainers/runc -%global commit_runc a592beb5bc4c4092b1b1bac971afed27687340c5 +%global commit_runc 2b18fe1d885ee5083ef9f0838fee39b62d653e30 %global shortcommit_runc %(c=%{commit_runc}; echo ${c:0:7}) # docker-containerd %global git_containerd https://github.com/containerd/containerd -%global commit_containerd 468a545b9edcd5932818eb9de8e72413e616e86e +%global commit_containerd bb71b10fd8f58240ca47fbb579b9d1028eea7c84 %global shortcommit_containerd %(c=%{commit_containerd}; echo ${c:0:7}) # docker-proxy / libnetwork %global git_libnetwork https://github.com/%{service_name}/libnetwork -%global commit_libnetwork 3ac297bc7fd0afec9051bbb47024c9bc1d75bf5b +%global commit_libnetwork 4725f2163fb214a6312f3beae5991f838ec36326 %global shortcommit_libnetwork %(c=%{commit_libnetwork}; echo ${c:0:7}) # tini @@ -39,8 +39,8 @@ %global shortcommit_tini %(c=%{commit_tini}; echo ${c:0:7}) Name: %{newname}-engine -Version: 18.06.3 -Release: 2.ce.git%{shortcommit_moby}%{?dist} +Version: 18.09.5 +Release: 1.ce.git%{shortcommit_moby}%{?dist} Summary: The open-source application container engine License: ASL 2.0 # no golang / go-md2man for ppc64 @@ -52,7 +52,6 @@ Source3: %{git_libnetwork}/archive/%{commit_libnetwork}.tar.gz Source4: %{git_tini}/archive/%{commit_tini}.tar.gz Source5: %{service_name}.service Source6: %{service_name}.sysconfig -Patch1: https://github.com/moby/moby/commit/27d9030b2371aa4a6b167fded6b8dc25987a0af7.patch#/%{name}-%{version}-named-volumes.patch URL: https://www.%{origname}.com BuildRequires: btrfs-progs-devel @@ -91,6 +90,8 @@ Conflicts: %{origname}-io Conflicts: %{origname}-engine-cs Conflicts: %{origname}-ce Conflicts: %{origname}-ee +Conflicts: containerd +Conflicts: runc %description Docker is an open source project to build, ship and run any application as a @@ -153,8 +154,6 @@ tar zxf %{SOURCE3} # untar tini tar zxf %{SOURCE4} -%patch1 -p1 -d components/engine - # correct rpmlint errors for bash completion sed -i '/env bash/d' components/cli/contrib/completion/bash/docker @@ -169,8 +168,7 @@ sed -i 's/-s -w *//' containerd-%{commit_containerd}/Makefile mkdir -p src/github.com/opencontainers ln -fns ../../.. src/github.com/opencontainers/runc export GOPATH="${PWD}" - make BUILDTAGS="seccomp selinux" COMMIT=%{commit_runc} \ - VERSION=1.0.0-rc5+dev.docker-18.06 + make BUILDTAGS="seccomp selinux" COMMIT=%{commit_runc} ) # build docker-containerd @@ -210,6 +208,7 @@ sed -i 's/-s -w *//' containerd-%{commit_containerd}/Makefile export DOCKER_DEBUG=1 export DOCKER_GITCOMMIT=%{shortcommit_moby} export GOPATH="${PWD}/_build" + export VERSION=%{version} bash -x hack/make.sh dynbinary ) @@ -243,6 +242,12 @@ install -p -m 755 containerd-%{commit_containerd}/bin/ctr %{buildroot}%{_bindir} # install runc install -p -m 755 runc-%{commit_runc}/runc %{buildroot}%{_bindir}/%{service_name}-runc +# install symlinks for Docker 18.09 program names +ln -fns %{service_name}-containerd %{buildroot}%{_bindir}/containerd +ln -fns %{service_name}-containerd-ctr %{buildroot}%{_bindir}/ctr +ln -fns %{service_name}-containerd-shim %{buildroot}%{_bindir}/containerd-shim +ln -fns %{service_name}-runc %{buildroot}%{_bindir}/runc + # install tini install -p -m 755 tini-%{commit_tini}/tini-static %{buildroot}%{_bindir}/%{service_name}-init @@ -315,6 +320,10 @@ getent group %{service_name} >/dev/null || groupadd -r %{service_name} || : %{_bindir}/%{service_name}-proxy %{_bindir}/%{service_name}-runc %{_bindir}/%{service_name}-init +%{_bindir}/containerd +%{_bindir}/containerd-shim +%{_bindir}/ctr +%{_bindir}/runc %{_usr}/lib/udev/rules.d/80-%{service_name}.rules %{_unitdir}/%{service_name}.service %{_unitdir}/%{service_name}.socket @@ -342,6 +351,14 @@ getent group %{service_name} >/dev/null || groupadd -r %{service_name} || : %{_datadir}/nano/Dockerfile.nanorc %changelog +* Thu Apr 11 2019 David Michael - 18.09.5-1.ce.gite8ff056 +- Update docker-ce to commit e8ff056 (version 18.09.5). +- Update docker-runc to commit 2b18fe1. +- Update docker-containerd to commit bb71b10 (version 1.2.5). +- Update docker-proxy to commit 4725f21. +- Report the correct engine version. +- Install symlinks to unprefixed runc/containerd program names. + * Thu Mar 28 2019 David Michael - 18.06.3-2.ce.gitd7080c1 - Conflict with docker-common. (#1693397) diff --git a/sources b/sources index db87ddd..1b9e3b4 100644 --- a/sources +++ b/sources @@ -1,6 +1,5 @@ -SHA512 (3ac297bc7fd0afec9051bbb47024c9bc1d75bf5b.tar.gz) = 21d3d1bd8aafeab51a3e0a14ada4d559b5b113a48d315e91f7d70e4fa839f5c92d4068b38c28bf6929da9c11cfc61703bafc7148f64b784208d61fa14ee4545d -SHA512 (468a545b9edcd5932818eb9de8e72413e616e86e.tar.gz) = 0c3cb261a535826f281af2d2df7e5c93e7d37139d5b709d7534148b9e706db56704d06b81a9e76acc2e86180f37475d566b8ddde990bbaae424af70206602347 -SHA512 (a592beb5bc4c4092b1b1bac971afed27687340c5.tar.gz) = 4b45d5f899ece2c017e93bdb211436ccea84c14ac99f3104baa5728b188536d390036f0defd40dab9514a529e48f39d093cbcc15fa98012e70c8e4f560168f9f -SHA512 (d7080c17a580919f5340a15a8e5e013133089680.tar.gz) = 65a67f906f2a7e28d9c7e35491e5da8430d075027adf6d41b9baec21a0b3f08d006de7568e6bfa37e3b9edbbed53af71e96a553446e01abaa51533ceb4db21a2 +SHA512 (2b18fe1d885ee5083ef9f0838fee39b62d653e30.tar.gz) = e3d61506b44f05dfbad2e07d917c8408edea54c87a472ceb109e2ba2a1685b26f1407c2fe7660d416b60fc2583414af09567bcb8b3c95bc14f725d120373337c +SHA512 (4725f2163fb214a6312f3beae5991f838ec36326.tar.gz) = 8ffd6fc97df4b63b1f83a5eb6d8e63c8c413bcf3e2ff82f507dbf875d0df6903b6fe1546d8625dd3b4681d611aed4702c423d0d5c9621ed57073cbe16bf35200 +SHA512 (bb71b10fd8f58240ca47fbb579b9d1028eea7c84.tar.gz) = a20f8e047109eef27792ffabb8c00c400fbc28c7610df480c84da26bd26cea93e4045971ec34580f4f46af403db4fbbbec404acef52162362009d219857e0e1a +SHA512 (e8ff056dbcfadaeca12a5f508b0cec281126c01d.tar.gz) = 854ab72eae79a62c916313a9fe983f609d323c32a7444891ffc236b5c8a6045dcf86bfab592a0af717c4d6b2336907eb2cfbee810a74d62a8283652cb21ec4f9 SHA512 (fec3683b971d9c3ef73f284f176672c44b448662.tar.gz) = ee46d21467f8bacb4e8be72f5dfcbb23c1964286e90b4b3d3bf67dbbf79a337968ac8a0042a8191e329a65398b20ea160aae3ae5ef20ee03ebae11c2083d7621 -SHA512 (moby-engine-18.06.3-named-volumes.patch) = 70a1075592e31bfa89f6b24231bdeb0d476f137a1b4aa568c281cdab1acfbcd9b738d42a31a83950479171412991ddd3d1c4bc58623df07c8ae15d606f843c9a From 624d8fed15bc251027ff35403da8eb10f11c6cf8 Mon Sep 17 00:00:00 2001 From: David Michael Date: Tue, 14 May 2019 22:48:00 -0400 Subject: [PATCH 013/163] Update to 18.09.6 --- .gitignore | 4 ++-- moby-engine.spec | 10 +++++++--- sources | 4 ++-- 3 files changed, 11 insertions(+), 7 deletions(-) diff --git a/.gitignore b/.gitignore index 12fb923..1185114 100644 --- a/.gitignore +++ b/.gitignore @@ -1,5 +1,5 @@ /2b18fe1d885ee5083ef9f0838fee39b62d653e30.tar.gz -/4725f2163fb214a6312f3beae5991f838ec36326.tar.gz +/481bc7715621adba10752357e0d537c8dc86507d.tar.gz +/872f0a83c98add6cae255c8859e29532febc0039.tar.gz /bb71b10fd8f58240ca47fbb579b9d1028eea7c84.tar.gz -/e8ff056dbcfadaeca12a5f508b0cec281126c01d.tar.gz /fec3683b971d9c3ef73f284f176672c44b448662.tar.gz diff --git a/moby-engine.spec b/moby-engine.spec index ea64168..2cf2ac2 100644 --- a/moby-engine.spec +++ b/moby-engine.spec @@ -15,7 +15,7 @@ # moby / docker-ce / cli %global git_moby https://github.com/%{service_name}/%{service_name}-ce -%global commit_moby e8ff056dbcfadaeca12a5f508b0cec281126c01d +%global commit_moby 481bc7715621adba10752357e0d537c8dc86507d %global shortcommit_moby %(c=%{commit_moby}; echo ${c:0:7}) # docker-runc @@ -30,7 +30,7 @@ # docker-proxy / libnetwork %global git_libnetwork https://github.com/%{service_name}/libnetwork -%global commit_libnetwork 4725f2163fb214a6312f3beae5991f838ec36326 +%global commit_libnetwork 872f0a83c98add6cae255c8859e29532febc0039 %global shortcommit_libnetwork %(c=%{commit_libnetwork}; echo ${c:0:7}) # tini @@ -39,7 +39,7 @@ %global shortcommit_tini %(c=%{commit_tini}; echo ${c:0:7}) Name: %{newname}-engine -Version: 18.09.5 +Version: 18.09.6 Release: 1.ce.git%{shortcommit_moby}%{?dist} Summary: The open-source application container engine License: ASL 2.0 @@ -351,6 +351,10 @@ getent group %{service_name} >/dev/null || groupadd -r %{service_name} || : %{_datadir}/nano/Dockerfile.nanorc %changelog +* Tue May 14 2019 David Michael - 18.09.6-1.ce.git481bc77 +- Update docker-ce to commit 481bc77 (version 18.09.6). +- Update docker-proxy to commit 872f0a8. + * Thu Apr 11 2019 David Michael - 18.09.5-1.ce.gite8ff056 - Update docker-ce to commit e8ff056 (version 18.09.5). - Update docker-runc to commit 2b18fe1. diff --git a/sources b/sources index 1b9e3b4..6320d2e 100644 --- a/sources +++ b/sources @@ -1,5 +1,5 @@ SHA512 (2b18fe1d885ee5083ef9f0838fee39b62d653e30.tar.gz) = e3d61506b44f05dfbad2e07d917c8408edea54c87a472ceb109e2ba2a1685b26f1407c2fe7660d416b60fc2583414af09567bcb8b3c95bc14f725d120373337c -SHA512 (4725f2163fb214a6312f3beae5991f838ec36326.tar.gz) = 8ffd6fc97df4b63b1f83a5eb6d8e63c8c413bcf3e2ff82f507dbf875d0df6903b6fe1546d8625dd3b4681d611aed4702c423d0d5c9621ed57073cbe16bf35200 +SHA512 (481bc7715621adba10752357e0d537c8dc86507d.tar.gz) = ea5166dab5dd803f9c83efeabaabeb29a21ed7d4b350f43d838eab6c7fa61a0c6dcc4171df35f728bc54bb671e6e5cbb1615bba47efeed7b23dfdc0e58b6c7eb +SHA512 (872f0a83c98add6cae255c8859e29532febc0039.tar.gz) = c8e8544a3d8d44dc0f309aa3520a2cf62cee374a06d40473542078de94d88cb484c0dca1cee7ad89fb312c969af1694c848f464d04d61df5a9888058e21a485e SHA512 (bb71b10fd8f58240ca47fbb579b9d1028eea7c84.tar.gz) = a20f8e047109eef27792ffabb8c00c400fbc28c7610df480c84da26bd26cea93e4045971ec34580f4f46af403db4fbbbec404acef52162362009d219857e0e1a -SHA512 (e8ff056dbcfadaeca12a5f508b0cec281126c01d.tar.gz) = 854ab72eae79a62c916313a9fe983f609d323c32a7444891ffc236b5c8a6045dcf86bfab592a0af717c4d6b2336907eb2cfbee810a74d62a8283652cb21ec4f9 SHA512 (fec3683b971d9c3ef73f284f176672c44b448662.tar.gz) = ee46d21467f8bacb4e8be72f5dfcbb23c1964286e90b4b3d3bf67dbbf79a337968ac8a0042a8191e329a65398b20ea160aae3ae5ef20ee03ebae11c2083d7621 From d24afc5060ac4715f360264b76697019e57ad753 Mon Sep 17 00:00:00 2001 From: David Michael Date: Tue, 14 May 2019 22:51:51 -0400 Subject: [PATCH 014/163] Obsolete and provide docker and docker-latest --- moby-engine.spec | 14 ++++++++++++++ 1 file changed, 14 insertions(+) diff --git a/moby-engine.spec b/moby-engine.spec index 2cf2ac2..e84fbca 100644 --- a/moby-engine.spec +++ b/moby-engine.spec @@ -83,8 +83,15 @@ Requires: pigz # Resolves: rhbz#1165615 Requires: device-mapper-libs >= 1.02.90-1 +# Replace the old Docker packages +Obsoletes: %{origname} <= %{version}-%{release} +Obsoletes: %{origname}-latest <= %{version}-%{release} +Provides: %{origname} = %{version}-%{release} +Provides: %{origname}-latest = %{version}-%{release} + # conflicting packages Conflicts: %{origname} +Conflicts: %{origname}-latest Conflicts: %{origname}-common Conflicts: %{origname}-io Conflicts: %{origname}-engine-cs @@ -109,6 +116,8 @@ Summary: Fish completion files for %{name} Requires: %{name} = %{version}-%{release} Requires: fish Conflicts: %{service_name}-fish-completion +Obsoletes: %{service_name}-fish-completion <= %{version}-%{release} +Provides: %{service_name}-fish-completion = %{version}-%{release} %description fish-completion This package installs %{summary}. @@ -118,6 +127,8 @@ Summary: Vim syntax highlighting files for %{name} Requires: %{name} = %{version}-%{release} Requires: vim Conflicts: %{service_name}-vim +Obsoletes: %{service_name}-vim <= %{version}-%{release} +Provides: %{service_name}-vim = %{version}-%{release} %description vim This package installs %{summary}. @@ -127,6 +138,8 @@ Summary: Zsh completion files for %{name} Requires: %{name} = %{version}-%{release} Requires: zsh Conflicts: %{service_name}-zsh-completion +Obsoletes: %{service_name}-zsh-completion <= %{version}-%{release} +Provides: %{service_name}-zsh-completion = %{version}-%{release} %description zsh-completion This package installs %{summary}. @@ -354,6 +367,7 @@ getent group %{service_name} >/dev/null || groupadd -r %{service_name} || : * Tue May 14 2019 David Michael - 18.09.6-1.ce.git481bc77 - Update docker-ce to commit 481bc77 (version 18.09.6). - Update docker-proxy to commit 872f0a8. +- Obsolete and provide the docker and docker-latest packages. (#1700006) * Thu Apr 11 2019 David Michael - 18.09.5-1.ce.gite8ff056 - Update docker-ce to commit e8ff056 (version 18.09.5). From e47c540d79f7fccca289747f19491bac4177497a Mon Sep 17 00:00:00 2001 From: David Michael Date: Fri, 28 Jun 2019 16:32:44 -0400 Subject: [PATCH 015/163] Update to 18.09.7 --- .gitignore | 8 ++++---- moby-engine.spec | 36 +++++++++++++++++++++--------------- sources | 8 ++++---- 3 files changed, 29 insertions(+), 23 deletions(-) diff --git a/.gitignore b/.gitignore index 1185114..eec94bd 100644 --- a/.gitignore +++ b/.gitignore @@ -1,5 +1,5 @@ -/2b18fe1d885ee5083ef9f0838fee39b62d653e30.tar.gz -/481bc7715621adba10752357e0d537c8dc86507d.tar.gz -/872f0a83c98add6cae255c8859e29532febc0039.tar.gz -/bb71b10fd8f58240ca47fbb579b9d1028eea7c84.tar.gz +/2d0083d657f82c47044c8d3948ba434b622fe2fd.tar.gz +/425e105d5a03fabd737a126ad93d62a9eeede87f.tar.gz +/894b81a4b802e4eb2a91d1ce216b8817763c29fb.tar.gz +/e7933d41e7b206756115aa9df5e0599fc5169742.tar.gz /fec3683b971d9c3ef73f284f176672c44b448662.tar.gz diff --git a/moby-engine.spec b/moby-engine.spec index e84fbca..6021f1a 100644 --- a/moby-engine.spec +++ b/moby-engine.spec @@ -15,22 +15,22 @@ # moby / docker-ce / cli %global git_moby https://github.com/%{service_name}/%{service_name}-ce -%global commit_moby 481bc7715621adba10752357e0d537c8dc86507d +%global commit_moby 2d0083d657f82c47044c8d3948ba434b622fe2fd %global shortcommit_moby %(c=%{commit_moby}; echo ${c:0:7}) -# docker-runc +# runc %global git_runc https://github.com/opencontainers/runc -%global commit_runc 2b18fe1d885ee5083ef9f0838fee39b62d653e30 +%global commit_runc 425e105d5a03fabd737a126ad93d62a9eeede87f %global shortcommit_runc %(c=%{commit_runc}; echo ${c:0:7}) -# docker-containerd +# containerd %global git_containerd https://github.com/containerd/containerd -%global commit_containerd bb71b10fd8f58240ca47fbb579b9d1028eea7c84 +%global commit_containerd 894b81a4b802e4eb2a91d1ce216b8817763c29fb %global shortcommit_containerd %(c=%{commit_containerd}; echo ${c:0:7}) # docker-proxy / libnetwork %global git_libnetwork https://github.com/%{service_name}/libnetwork -%global commit_libnetwork 872f0a83c98add6cae255c8859e29532febc0039 +%global commit_libnetwork e7933d41e7b206756115aa9df5e0599fc5169742 %global shortcommit_libnetwork %(c=%{commit_libnetwork}; echo ${c:0:7}) # tini @@ -39,7 +39,7 @@ %global shortcommit_tini %(c=%{commit_tini}; echo ${c:0:7}) Name: %{newname}-engine -Version: 18.09.6 +Version: 18.09.7 Release: 1.ce.git%{shortcommit_moby}%{?dist} Summary: The open-source application container engine License: ASL 2.0 @@ -84,8 +84,8 @@ Requires: pigz Requires: device-mapper-libs >= 1.02.90-1 # Replace the old Docker packages -Obsoletes: %{origname} <= %{version}-%{release} -Obsoletes: %{origname}-latest <= %{version}-%{release} +Obsoletes: %{origname} < %{version}-%{release} +Obsoletes: %{origname}-latest < %{version}-%{release} Provides: %{origname} = %{version}-%{release} Provides: %{origname}-latest = %{version}-%{release} @@ -116,7 +116,7 @@ Summary: Fish completion files for %{name} Requires: %{name} = %{version}-%{release} Requires: fish Conflicts: %{service_name}-fish-completion -Obsoletes: %{service_name}-fish-completion <= %{version}-%{release} +Obsoletes: %{service_name}-fish-completion < %{version}-%{release} Provides: %{service_name}-fish-completion = %{version}-%{release} %description fish-completion @@ -127,7 +127,7 @@ Summary: Vim syntax highlighting files for %{name} Requires: %{name} = %{version}-%{release} Requires: vim Conflicts: %{service_name}-vim -Obsoletes: %{service_name}-vim <= %{version}-%{release} +Obsoletes: %{service_name}-vim < %{version}-%{release} Provides: %{service_name}-vim = %{version}-%{release} %description vim @@ -138,7 +138,7 @@ Summary: Zsh completion files for %{name} Requires: %{name} = %{version}-%{release} Requires: zsh Conflicts: %{service_name}-zsh-completion -Obsoletes: %{service_name}-zsh-completion <= %{version}-%{release} +Obsoletes: %{service_name}-zsh-completion < %{version}-%{release} Provides: %{service_name}-zsh-completion = %{version}-%{release} %description zsh-completion @@ -174,7 +174,7 @@ sed -i '/env bash/d' components/cli/contrib/completion/bash/docker sed -i 's/-s -w *//' containerd-%{commit_containerd}/Makefile %build -# build docker-runc +# build runc ( cd runc-%{commit_runc} mv vendor src @@ -184,10 +184,10 @@ sed -i 's/-s -w *//' containerd-%{commit_containerd}/Makefile make BUILDTAGS="seccomp selinux" COMMIT=%{commit_runc} ) -# build docker-containerd +# build containerd ( cd containerd-%{commit_containerd} - version=$(sed -n '/^\t*Version = /s/[^0-9.]//gp' version/version.go) + version=1.2.6 #$(sed -n '/^\t*Version = /s/[^0-9.]//gp' version/version.go) mv vendor src mkdir -p src/github.com/containerd ln -fns ../../.. src/github.com/containerd/containerd @@ -364,6 +364,12 @@ getent group %{service_name} >/dev/null || groupadd -r %{service_name} || : %{_datadir}/nano/Dockerfile.nanorc %changelog +* Thu Jun 27 2019 David Michael - 18.09.7-1.ce.git2d0083d +- Update docker-ce to commit 2d0083d (version 18.09.7). +- Update runc to commit 425e105. +- Update containerd to commit 894b81a (1.2.6). +- Update docker-proxy to commit e7933d4. + * Tue May 14 2019 David Michael - 18.09.6-1.ce.git481bc77 - Update docker-ce to commit 481bc77 (version 18.09.6). - Update docker-proxy to commit 872f0a8. diff --git a/sources b/sources index 6320d2e..506d400 100644 --- a/sources +++ b/sources @@ -1,5 +1,5 @@ -SHA512 (2b18fe1d885ee5083ef9f0838fee39b62d653e30.tar.gz) = e3d61506b44f05dfbad2e07d917c8408edea54c87a472ceb109e2ba2a1685b26f1407c2fe7660d416b60fc2583414af09567bcb8b3c95bc14f725d120373337c -SHA512 (481bc7715621adba10752357e0d537c8dc86507d.tar.gz) = ea5166dab5dd803f9c83efeabaabeb29a21ed7d4b350f43d838eab6c7fa61a0c6dcc4171df35f728bc54bb671e6e5cbb1615bba47efeed7b23dfdc0e58b6c7eb -SHA512 (872f0a83c98add6cae255c8859e29532febc0039.tar.gz) = c8e8544a3d8d44dc0f309aa3520a2cf62cee374a06d40473542078de94d88cb484c0dca1cee7ad89fb312c969af1694c848f464d04d61df5a9888058e21a485e -SHA512 (bb71b10fd8f58240ca47fbb579b9d1028eea7c84.tar.gz) = a20f8e047109eef27792ffabb8c00c400fbc28c7610df480c84da26bd26cea93e4045971ec34580f4f46af403db4fbbbec404acef52162362009d219857e0e1a +SHA512 (2d0083d657f82c47044c8d3948ba434b622fe2fd.tar.gz) = 4403f06f387663603876dc5bb38d32cf5aa554e3642aa4c164c0071390d1957f843a39f87459edb1ba5ec31e664207c83b56caef9b60172fcfefbfca052f7454 +SHA512 (425e105d5a03fabd737a126ad93d62a9eeede87f.tar.gz) = f213b6a7fa96597d2ba1068f77752bccc0a1d62e0aac02ec8d2a2552dc3c1140fd4e52b2daeb0ac8fc09c48abe4521834450baae01ad4165308813eee7654a2b +SHA512 (894b81a4b802e4eb2a91d1ce216b8817763c29fb.tar.gz) = fa3a2652b71425a17a82f66e9a9941e5a44bffc0a223a2357630d7d72b08638fc20aa77c46400cdcb48d512a49861af802234f27966f673d9df94f7f82721cb0 +SHA512 (e7933d41e7b206756115aa9df5e0599fc5169742.tar.gz) = 0a833510df0029999bfc05c23445a58a8b2ff165c0fb2fd5c411498d1e89b5b1990d2778b32346dd2b6d61c166ff707c6277a5d1937db6345c77d3825eb59875 SHA512 (fec3683b971d9c3ef73f284f176672c44b448662.tar.gz) = ee46d21467f8bacb4e8be72f5dfcbb23c1964286e90b4b3d3bf67dbbf79a337968ac8a0042a8191e329a65398b20ea160aae3ae5ef20ee03ebae11c2083d7621 From b27960ac0159d8d26597b4153309bd23c44495ed Mon Sep 17 00:00:00 2001 From: Olivier Lemasle Date: Fri, 12 Jul 2019 14:08:08 +0000 Subject: [PATCH 016/163] Depend on packaged versions "runc" and "containerd" instead of building them. --- moby-engine.spec | 89 ++++++++---------------------------------------- sources | 2 -- 2 files changed, 14 insertions(+), 77 deletions(-) diff --git a/moby-engine.spec b/moby-engine.spec index 6021f1a..5af8d02 100644 --- a/moby-engine.spec +++ b/moby-engine.spec @@ -18,16 +18,6 @@ %global commit_moby 2d0083d657f82c47044c8d3948ba434b622fe2fd %global shortcommit_moby %(c=%{commit_moby}; echo ${c:0:7}) -# runc -%global git_runc https://github.com/opencontainers/runc -%global commit_runc 425e105d5a03fabd737a126ad93d62a9eeede87f -%global shortcommit_runc %(c=%{commit_runc}; echo ${c:0:7}) - -# containerd -%global git_containerd https://github.com/containerd/containerd -%global commit_containerd 894b81a4b802e4eb2a91d1ce216b8817763c29fb -%global shortcommit_containerd %(c=%{commit_containerd}; echo ${c:0:7}) - # docker-proxy / libnetwork %global git_libnetwork https://github.com/%{service_name}/libnetwork %global commit_libnetwork e7933d41e7b206756115aa9df5e0599fc5169742 @@ -40,18 +30,16 @@ Name: %{newname}-engine Version: 18.09.7 -Release: 1.ce.git%{shortcommit_moby}%{?dist} +Release: 2.ce.git%{shortcommit_moby}%{?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_runc}/archive/%{commit_runc}.tar.gz -Source2: %{git_containerd}/archive/%{commit_containerd}.tar.gz -Source3: %{git_libnetwork}/archive/%{commit_libnetwork}.tar.gz -Source4: %{git_tini}/archive/%{commit_tini}.tar.gz -Source5: %{service_name}.service -Source6: %{service_name}.sysconfig +Source1: %{git_libnetwork}/archive/%{commit_libnetwork}.tar.gz +Source2: %{git_tini}/archive/%{commit_tini}.tar.gz +Source3: %{service_name}.service +Source4: %{service_name}.sysconfig URL: https://www.%{origname}.com BuildRequires: btrfs-progs-devel @@ -79,6 +67,8 @@ Requires: systemd Requires: tar Requires: xz Requires: pigz +Requires: runc +Requires: containerd # Resolves: rhbz#1165615 Requires: device-mapper-libs >= 1.02.90-1 @@ -97,8 +87,6 @@ Conflicts: %{origname}-io Conflicts: %{origname}-engine-cs Conflicts: %{origname}-ce Conflicts: %{origname}-ee -Conflicts: containerd -Conflicts: runc %description Docker is an open source project to build, ship and run any application as a @@ -155,46 +143,16 @@ This package installs %{summary}. %prep %autosetup -N -Sgit -n %{service_name}-ce-%{commit_moby} -# untar runc +# untar libnetwork tar zxf %{SOURCE1} -# untar containerd -tar zxf %{SOURCE2} - -# untar libnetwork -tar zxf %{SOURCE3} - # untar tini -tar zxf %{SOURCE4} +tar zxf %{SOURCE2} # correct rpmlint errors for bash completion sed -i '/env bash/d' components/cli/contrib/completion/bash/docker -# disable stripping containerd during build -sed -i 's/-s -w *//' containerd-%{commit_containerd}/Makefile - %build -# build runc -( - cd runc-%{commit_runc} - mv vendor src - mkdir -p src/github.com/opencontainers - ln -fns ../../.. src/github.com/opencontainers/runc - export GOPATH="${PWD}" - make BUILDTAGS="seccomp selinux" COMMIT=%{commit_runc} -) - -# build containerd -( - cd containerd-%{commit_containerd} - version=1.2.6 #$(sed -n '/^\t*Version = /s/[^0-9.]//gp' version/version.go) - mv vendor src - mkdir -p src/github.com/containerd - ln -fns ../../.. src/github.com/containerd/containerd - export GOPATH="${PWD}" - make VERSION="${version}" REVISION=%{commit_containerd} -) - # build docker-proxy / libnetwork ( cd libnetwork-%{commit_libnetwork} @@ -247,20 +205,6 @@ install -p -m 755 components/engine/bundles/latest/dynbinary-daemon/%{service_na # install proxy install -p -m 755 libnetwork-%{commit_libnetwork}/%{service_name}-proxy %{buildroot}%{_bindir}/%{service_name}-proxy -# install containerd -install -p -m 755 containerd-%{commit_containerd}/bin/containerd %{buildroot}%{_bindir}/%{service_name}-containerd -install -p -m 755 containerd-%{commit_containerd}/bin/containerd-shim %{buildroot}%{_bindir}/%{service_name}-containerd-shim -install -p -m 755 containerd-%{commit_containerd}/bin/ctr %{buildroot}%{_bindir}/%{service_name}-containerd-ctr - -# install runc -install -p -m 755 runc-%{commit_runc}/runc %{buildroot}%{_bindir}/%{service_name}-runc - -# install symlinks for Docker 18.09 program names -ln -fns %{service_name}-containerd %{buildroot}%{_bindir}/containerd -ln -fns %{service_name}-containerd-ctr %{buildroot}%{_bindir}/ctr -ln -fns %{service_name}-containerd-shim %{buildroot}%{_bindir}/containerd-shim -ln -fns %{service_name}-runc %{buildroot}%{_bindir}/runc - # install tini install -p -m 755 tini-%{commit_tini}/tini-static %{buildroot}%{_bindir}/%{service_name}-init @@ -270,12 +214,12 @@ install -p -m 644 components/engine/contrib/udev/80-%{service_name}.rules %{buil # add init scripts install -dp %{buildroot}%{_unitdir} -install -p -m 644 %{SOURCE5} %{buildroot}%{_unitdir} +install -p -m 644 %{SOURCE3} %{buildroot}%{_unitdir} install -p -m 644 components/engine/contrib/init/systemd/docker.socket %{buildroot}%{_unitdir} # for additional args install -dp %{buildroot}%{_sysconfdir}/sysconfig -install -p -m 644 %{SOURCE6} %{buildroot}%{_sysconfdir}/sysconfig/%{service_name} +install -p -m 644 %{SOURCE4} %{buildroot}%{_sysconfdir}/sysconfig/%{service_name} # add bash, zsh, and fish completions install -dp %{buildroot}%{_datadir}/bash-completion/completions @@ -327,16 +271,8 @@ getent group %{service_name} >/dev/null || groupadd -r %{service_name} || : %{_bindir}/%{service_name} %{_bindir}/%{service_name}d %dir %{_libexecdir}/%{service_name}/ -%{_bindir}/%{service_name}-containerd -%{_bindir}/%{service_name}-containerd-shim -%{_bindir}/%{service_name}-containerd-ctr %{_bindir}/%{service_name}-proxy -%{_bindir}/%{service_name}-runc %{_bindir}/%{service_name}-init -%{_bindir}/containerd -%{_bindir}/containerd-shim -%{_bindir}/ctr -%{_bindir}/runc %{_usr}/lib/udev/rules.d/80-%{service_name}.rules %{_unitdir}/%{service_name}.service %{_unitdir}/%{service_name}.socket @@ -364,6 +300,9 @@ getent group %{service_name} >/dev/null || groupadd -r %{service_name} || : %{_datadir}/nano/Dockerfile.nanorc %changelog +* Fri Jul 12 2019 Olivier Lemasle - 18.09.7-2.ce.git2d0083d +- Depend on packaged versions "runc" and "containerd" instead of building them. + * Thu Jun 27 2019 David Michael - 18.09.7-1.ce.git2d0083d - Update docker-ce to commit 2d0083d (version 18.09.7). - Update runc to commit 425e105. diff --git a/sources b/sources index 506d400..3da0662 100644 --- a/sources +++ b/sources @@ -1,5 +1,3 @@ SHA512 (2d0083d657f82c47044c8d3948ba434b622fe2fd.tar.gz) = 4403f06f387663603876dc5bb38d32cf5aa554e3642aa4c164c0071390d1957f843a39f87459edb1ba5ec31e664207c83b56caef9b60172fcfefbfca052f7454 -SHA512 (425e105d5a03fabd737a126ad93d62a9eeede87f.tar.gz) = f213b6a7fa96597d2ba1068f77752bccc0a1d62e0aac02ec8d2a2552dc3c1140fd4e52b2daeb0ac8fc09c48abe4521834450baae01ad4165308813eee7654a2b -SHA512 (894b81a4b802e4eb2a91d1ce216b8817763c29fb.tar.gz) = fa3a2652b71425a17a82f66e9a9941e5a44bffc0a223a2357630d7d72b08638fc20aa77c46400cdcb48d512a49861af802234f27966f673d9df94f7f82721cb0 SHA512 (e7933d41e7b206756115aa9df5e0599fc5169742.tar.gz) = 0a833510df0029999bfc05c23445a58a8b2ff165c0fb2fd5c411498d1e89b5b1990d2778b32346dd2b6d61c166ff707c6277a5d1937db6345c77d3825eb59875 SHA512 (fec3683b971d9c3ef73f284f176672c44b448662.tar.gz) = ee46d21467f8bacb4e8be72f5dfcbb23c1964286e90b4b3d3bf67dbbf79a337968ac8a0042a8191e329a65398b20ea160aae3ae5ef20ee03ebae11c2083d7621 From a6ffb4992d9f134013d2b7a0320e7ad1643230b2 Mon Sep 17 00:00:00 2001 From: Olivier Lemasle Date: Sat, 13 Jul 2019 13:54:07 +0200 Subject: [PATCH 017/163] Add nofile ulimit to default docker daemon options (#1715254, #1708115) Thanks to Nicolas MURE's patch (#1715254). --- docker.sysconfig | 2 +- moby-engine.spec | 8 +++++++- 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/docker.sysconfig b/docker.sysconfig index 5a78251..a03d72d 100644 --- a/docker.sysconfig +++ b/docker.sysconfig @@ -1,4 +1,4 @@ # /etc/sysconfig/docker # Modify these options if you want to change the way the docker daemon runs -OPTIONS='--selinux-enabled --log-driver=journald --live-restore' +OPTIONS='--selinux-enabled --log-driver=journald --live-restore --default-ulimit nofile=1024:1024' diff --git a/moby-engine.spec b/moby-engine.spec index 5af8d02..263b07a 100644 --- a/moby-engine.spec +++ b/moby-engine.spec @@ -30,7 +30,7 @@ Name: %{newname}-engine Version: 18.09.7 -Release: 2.ce.git%{shortcommit_moby}%{?dist} +Release: 4.ce.git%{shortcommit_moby}%{?dist} Summary: The open-source application container engine License: ASL 2.0 # no golang / go-md2man for ppc64 @@ -300,6 +300,12 @@ getent group %{service_name} >/dev/null || groupadd -r %{service_name} || : %{_datadir}/nano/Dockerfile.nanorc %changelog +* Sat Jul 13 2019 Olivier Lemasle - 18.09.7-3.ce.git2d0083d +- Add nofile ulimit to default docker daemon options (#1715254, #1708115) + +* Fri Jul 12 2019 Olivier Lemasle - 18.09.7-4.ce.git2d0083d +- rebuilt + * Fri Jul 12 2019 Olivier Lemasle - 18.09.7-2.ce.git2d0083d - Depend on packaged versions "runc" and "containerd" instead of building them. From b73040075e618f039def4adb0476adaba24b68bd Mon Sep 17 00:00:00 2001 From: Olivier Lemasle Date: Sat, 13 Jul 2019 21:58:42 +0200 Subject: [PATCH 018/163] Move docker-init and docker-proxy to /usr/libexec/docker Update moby-engine-nano summary to follow guidelines --- docker.sysconfig | 8 +++++++- moby-engine.spec | 20 ++++++++++++-------- 2 files changed, 19 insertions(+), 9 deletions(-) diff --git a/docker.sysconfig b/docker.sysconfig index a03d72d..6ba9fd7 100644 --- a/docker.sysconfig +++ b/docker.sysconfig @@ -1,4 +1,10 @@ # /etc/sysconfig/docker # Modify these options if you want to change the way the docker daemon runs -OPTIONS='--selinux-enabled --log-driver=journald --live-restore --default-ulimit nofile=1024:1024' +OPTIONS="--selinux-enabled \ + --log-driver=journald \ + --live-restore \ + --default-ulimit nofile=1024:1024 \ + --init-path /usr/libexec/docker/docker-init \ + --userland-proxy-path /usr/libexec/docker/docker-proxy \ +" diff --git a/moby-engine.spec b/moby-engine.spec index 263b07a..f1b5716 100644 --- a/moby-engine.spec +++ b/moby-engine.spec @@ -30,7 +30,7 @@ Name: %{newname}-engine Version: 18.09.7 -Release: 4.ce.git%{shortcommit_moby}%{?dist} +Release: 5.ce.git%{shortcommit_moby}%{?dist} Summary: The open-source application container engine License: ASL 2.0 # no golang / go-md2man for ppc64 @@ -133,7 +133,7 @@ Provides: %{service_name}-zsh-completion = %{version}-%{release} This package installs %{summary}. %package nano -Summary: nano syntax highlighting files for Moby +Summary: GNU nano syntax highlighting files for Moby Requires: %{name} = %{version}-%{release} Requires: nano @@ -203,10 +203,10 @@ install -p -m 755 components/cli/build/%{service_name} %{buildroot}%{_bindir}/%{ install -p -m 755 components/engine/bundles/latest/dynbinary-daemon/%{service_name}d %{buildroot}%{_bindir}/%{service_name}d # install proxy -install -p -m 755 libnetwork-%{commit_libnetwork}/%{service_name}-proxy %{buildroot}%{_bindir}/%{service_name}-proxy +install -p -m 755 libnetwork-%{commit_libnetwork}/%{service_name}-proxy %{buildroot}%{_libexecdir}/%{service_name}/%{service_name}-proxy # install tini -install -p -m 755 tini-%{commit_tini}/tini-static %{buildroot}%{_bindir}/%{service_name}-init +install -p -m 755 tini-%{commit_tini}/tini-static %{buildroot}%{_libexecdir}/%{service_name}/%{service_name}-init # install udev rules install -dp %{buildroot}%{_prefix}/lib/udev/rules.d @@ -271,8 +271,8 @@ getent group %{service_name} >/dev/null || groupadd -r %{service_name} || : %{_bindir}/%{service_name} %{_bindir}/%{service_name}d %dir %{_libexecdir}/%{service_name}/ -%{_bindir}/%{service_name}-proxy -%{_bindir}/%{service_name}-init +%{_libexecdir}/%{service_name}/%{service_name}-proxy +%{_libexecdir}/%{service_name}/%{service_name}-init %{_usr}/lib/udev/rules.d/80-%{service_name}.rules %{_unitdir}/%{service_name}.service %{_unitdir}/%{service_name}.socket @@ -300,10 +300,14 @@ getent group %{service_name} >/dev/null || groupadd -r %{service_name} || : %{_datadir}/nano/Dockerfile.nanorc %changelog -* Sat Jul 13 2019 Olivier Lemasle - 18.09.7-3.ce.git2d0083d +* Sat Jul 13 2019 Olivier Lemasle - 18.09.7-5.ce.git2d0083d +- Move docker-init and docker-proxy to /usr/libexec/docker +- Update moby-engine-nano summary to follow guidelines + +* Sat Jul 13 2019 Olivier Lemasle - 18.09.7-4.ce.git2d0083d - Add nofile ulimit to default docker daemon options (#1715254, #1708115) -* Fri Jul 12 2019 Olivier Lemasle - 18.09.7-4.ce.git2d0083d +* Fri Jul 12 2019 Olivier Lemasle - 18.09.7-3.ce.git2d0083d - rebuilt * Fri Jul 12 2019 Olivier Lemasle - 18.09.7-2.ce.git2d0083d From be1ef80fcac12a237a3ca799ad4550f94611abea Mon Sep 17 00:00:00 2001 From: Olivier Lemasle Date: Thu, 18 Jul 2019 21:02:04 +0200 Subject: [PATCH 019/163] Update to latest upstream release - Docker CE 18.09.8 --- .gitignore | 1 + moby-engine.spec | 9 ++++++--- sources | 2 +- 3 files changed, 8 insertions(+), 4 deletions(-) diff --git a/.gitignore b/.gitignore index eec94bd..ef733d6 100644 --- a/.gitignore +++ b/.gitignore @@ -3,3 +3,4 @@ /894b81a4b802e4eb2a91d1ce216b8817763c29fb.tar.gz /e7933d41e7b206756115aa9df5e0599fc5169742.tar.gz /fec3683b971d9c3ef73f284f176672c44b448662.tar.gz +/0dd43dd87fd530113bf44c9bba9ad8b20ce4637f.tar.gz diff --git a/moby-engine.spec b/moby-engine.spec index f1b5716..5f966c6 100644 --- a/moby-engine.spec +++ b/moby-engine.spec @@ -15,7 +15,7 @@ # moby / docker-ce / cli %global git_moby https://github.com/%{service_name}/%{service_name}-ce -%global commit_moby 2d0083d657f82c47044c8d3948ba434b622fe2fd +%global commit_moby 0dd43dd87fd530113bf44c9bba9ad8b20ce4637f %global shortcommit_moby %(c=%{commit_moby}; echo ${c:0:7}) # docker-proxy / libnetwork @@ -29,8 +29,8 @@ %global shortcommit_tini %(c=%{commit_tini}; echo ${c:0:7}) Name: %{newname}-engine -Version: 18.09.7 -Release: 5.ce.git%{shortcommit_moby}%{?dist} +Version: 18.09.8 +Release: 1.ce.git%{shortcommit_moby}%{?dist} Summary: The open-source application container engine License: ASL 2.0 # no golang / go-md2man for ppc64 @@ -300,6 +300,9 @@ getent group %{service_name} >/dev/null || groupadd -r %{service_name} || : %{_datadir}/nano/Dockerfile.nanorc %changelog +* Thu Jul 18 2019 Olivier Lemasle - 18.09.8-1.ce.git0dd43dd +- Update to latest upstream release - Docker CE 18.09.8 + * Sat Jul 13 2019 Olivier Lemasle - 18.09.7-5.ce.git2d0083d - Move docker-init and docker-proxy to /usr/libexec/docker - Update moby-engine-nano summary to follow guidelines diff --git a/sources b/sources index 3da0662..1affe44 100644 --- a/sources +++ b/sources @@ -1,3 +1,3 @@ -SHA512 (2d0083d657f82c47044c8d3948ba434b622fe2fd.tar.gz) = 4403f06f387663603876dc5bb38d32cf5aa554e3642aa4c164c0071390d1957f843a39f87459edb1ba5ec31e664207c83b56caef9b60172fcfefbfca052f7454 SHA512 (e7933d41e7b206756115aa9df5e0599fc5169742.tar.gz) = 0a833510df0029999bfc05c23445a58a8b2ff165c0fb2fd5c411498d1e89b5b1990d2778b32346dd2b6d61c166ff707c6277a5d1937db6345c77d3825eb59875 SHA512 (fec3683b971d9c3ef73f284f176672c44b448662.tar.gz) = ee46d21467f8bacb4e8be72f5dfcbb23c1964286e90b4b3d3bf67dbbf79a337968ac8a0042a8191e329a65398b20ea160aae3ae5ef20ee03ebae11c2083d7621 +SHA512 (0dd43dd87fd530113bf44c9bba9ad8b20ce4637f.tar.gz) = 62ff8afd7356d3dea5d4ae2995058b42b7f30458ec5af5d1bb78209953d106934eee1acb62f552f2f9dfaa1c8892d0a31a15db3c640e04ae82b014414c35653a From 9a6358d428620709a6460ab6fdff38d5bf3af203 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 25 Jul 2019 17:25:54 +0000 Subject: [PATCH 020/163] - Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- moby-engine.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/moby-engine.spec b/moby-engine.spec index 5f966c6..48bdb4c 100644 --- a/moby-engine.spec +++ b/moby-engine.spec @@ -30,7 +30,7 @@ Name: %{newname}-engine Version: 18.09.8 -Release: 1.ce.git%{shortcommit_moby}%{?dist} +Release: 2.ce.git%{shortcommit_moby}%{?dist} Summary: The open-source application container engine License: ASL 2.0 # no golang / go-md2man for ppc64 @@ -300,6 +300,9 @@ getent group %{service_name} >/dev/null || groupadd -r %{service_name} || : %{_datadir}/nano/Dockerfile.nanorc %changelog +* Thu Jul 25 2019 Fedora Release Engineering - 18.09.8-2.ce.git0dd43dd +- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild + * Thu Jul 18 2019 Olivier Lemasle - 18.09.8-1.ce.git0dd43dd - Update to latest upstream release - Docker CE 18.09.8 From 5dd94a48fbfa64bd5d07535b32232db71207c4ee Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Wed, 29 Jan 2020 13:45:21 +0000 Subject: [PATCH 021/163] - Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- moby-engine.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/moby-engine.spec b/moby-engine.spec index 48bdb4c..461812c 100644 --- a/moby-engine.spec +++ b/moby-engine.spec @@ -30,7 +30,7 @@ Name: %{newname}-engine Version: 18.09.8 -Release: 2.ce.git%{shortcommit_moby}%{?dist} +Release: 3.ce.git%{shortcommit_moby}%{?dist} Summary: The open-source application container engine License: ASL 2.0 # no golang / go-md2man for ppc64 @@ -300,6 +300,9 @@ getent group %{service_name} >/dev/null || groupadd -r %{service_name} || : %{_datadir}/nano/Dockerfile.nanorc %changelog +* Wed Jan 29 2020 Fedora Release Engineering - 18.09.8-3.ce.git0dd43dd +- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild + * Thu Jul 25 2019 Fedora Release Engineering - 18.09.8-2.ce.git0dd43dd - Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild From 3579c2166e301785c763b1c08f00af193e936398 Mon Sep 17 00:00:00 2001 From: Olivier Lemasle Date: Sat, 7 Mar 2020 16:33:07 +0100 Subject: [PATCH 022/163] Update to latest upstream release - Docker CE 19.03.7 Add Epoch: 2 to Obsoletes for docker and docker-latest --- .gitignore | 2 ++ moby-engine.spec | 24 ++++++++++++++---------- sources | 4 ++-- 3 files changed, 18 insertions(+), 12 deletions(-) diff --git a/.gitignore b/.gitignore index ef733d6..99cabb3 100644 --- a/.gitignore +++ b/.gitignore @@ -4,3 +4,5 @@ /e7933d41e7b206756115aa9df5e0599fc5169742.tar.gz /fec3683b971d9c3ef73f284f176672c44b448662.tar.gz /0dd43dd87fd530113bf44c9bba9ad8b20ce4637f.tar.gz +/7141c199a2edb2a90b778175f836f9dd2a22c95a.tar.gz +/264bffcb88c1b6b7471c04e3c6b3f301233a544b.tar.gz diff --git a/moby-engine.spec b/moby-engine.spec index 461812c..30c84fe 100644 --- a/moby-engine.spec +++ b/moby-engine.spec @@ -15,12 +15,12 @@ # moby / docker-ce / cli %global git_moby https://github.com/%{service_name}/%{service_name}-ce -%global commit_moby 0dd43dd87fd530113bf44c9bba9ad8b20ce4637f +%global commit_moby 7141c199a2edb2a90b778175f836f9dd2a22c95a %global shortcommit_moby %(c=%{commit_moby}; echo ${c:0:7}) # docker-proxy / libnetwork %global git_libnetwork https://github.com/%{service_name}/libnetwork -%global commit_libnetwork e7933d41e7b206756115aa9df5e0599fc5169742 +%global commit_libnetwork 264bffcb88c1b6b7471c04e3c6b3f301233a544b %global shortcommit_libnetwork %(c=%{commit_libnetwork}; echo ${c:0:7}) # tini @@ -29,8 +29,8 @@ %global shortcommit_tini %(c=%{commit_tini}; echo ${c:0:7}) Name: %{newname}-engine -Version: 18.09.8 -Release: 3.ce.git%{shortcommit_moby}%{?dist} +Version: 19.03.7 +Release: 1.ce.git%{shortcommit_moby}%{?dist} Summary: The open-source application container engine License: ASL 2.0 # no golang / go-md2man for ppc64 @@ -74,8 +74,8 @@ Requires: containerd Requires: device-mapper-libs >= 1.02.90-1 # Replace the old Docker packages -Obsoletes: %{origname} < %{version}-%{release} -Obsoletes: %{origname}-latest < %{version}-%{release} +Obsoletes: %{origname} < 2:%{version}-%{release} +Obsoletes: %{origname}-latest < 2:%{version}-%{release} Provides: %{origname} = %{version}-%{release} Provides: %{origname}-latest = %{version}-%{release} @@ -104,7 +104,7 @@ Summary: Fish completion files for %{name} Requires: %{name} = %{version}-%{release} Requires: fish Conflicts: %{service_name}-fish-completion -Obsoletes: %{service_name}-fish-completion < %{version}-%{release} +Obsoletes: %{service_name}-fish-completion < 2:%{version}-%{release} Provides: %{service_name}-fish-completion = %{version}-%{release} %description fish-completion @@ -115,7 +115,7 @@ Summary: Vim syntax highlighting files for %{name} Requires: %{name} = %{version}-%{release} Requires: vim Conflicts: %{service_name}-vim -Obsoletes: %{service_name}-vim < %{version}-%{release} +Obsoletes: %{service_name}-vim < 2:%{version}-%{release} Provides: %{service_name}-vim = %{version}-%{release} %description vim @@ -126,7 +126,7 @@ Summary: Zsh completion files for %{name} Requires: %{name} = %{version}-%{release} Requires: zsh Conflicts: %{service_name}-zsh-completion -Obsoletes: %{service_name}-zsh-completion < %{version}-%{release} +Obsoletes: %{service_name}-zsh-completion < 2:%{version}-%{release} Provides: %{service_name}-zsh-completion = %{version}-%{release} %description zsh-completion @@ -200,7 +200,7 @@ 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/latest/dynbinary-daemon/%{service_name}d %{buildroot}%{_bindir}/%{service_name}d +install -p -m 755 components/engine/bundles/dynbinary-daemon/%{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 @@ -300,6 +300,10 @@ getent group %{service_name} >/dev/null || groupadd -r %{service_name} || : %{_datadir}/nano/Dockerfile.nanorc %changelog +* Sat Mar 7 2020 Olivier Lemasle - 19.03.7-1.ce.git7141c19 +- Update to latest upstream release - Docker CE 19.03.7 +- Add Epoch: 2 to Obsoletes for docker and docker-latest + * Wed Jan 29 2020 Fedora Release Engineering - 18.09.8-3.ce.git0dd43dd - Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild diff --git a/sources b/sources index 1affe44..25e7d2e 100644 --- a/sources +++ b/sources @@ -1,3 +1,3 @@ -SHA512 (e7933d41e7b206756115aa9df5e0599fc5169742.tar.gz) = 0a833510df0029999bfc05c23445a58a8b2ff165c0fb2fd5c411498d1e89b5b1990d2778b32346dd2b6d61c166ff707c6277a5d1937db6345c77d3825eb59875 +SHA512 (7141c199a2edb2a90b778175f836f9dd2a22c95a.tar.gz) = c2f28be14c6f09670fae5c2bdfe30cf220270a555f45af652290042d93af86d14ed2c3dff170165415276ce63b68b3695d0440efc6065bb7cba0e09fe9b6b5ad +SHA512 (264bffcb88c1b6b7471c04e3c6b3f301233a544b.tar.gz) = d83a26b3156fd1d2713ea2acd380617cb3741952770bbb1bdbed65ef807615b5c008a4435c500ce089bdd60229f591c37b006b73fea417787246ad326166db22 SHA512 (fec3683b971d9c3ef73f284f176672c44b448662.tar.gz) = ee46d21467f8bacb4e8be72f5dfcbb23c1964286e90b4b3d3bf67dbbf79a337968ac8a0042a8191e329a65398b20ea160aae3ae5ef20ee03ebae11c2083d7621 -SHA512 (0dd43dd87fd530113bf44c9bba9ad8b20ce4637f.tar.gz) = 62ff8afd7356d3dea5d4ae2995058b42b7f30458ec5af5d1bb78209953d106934eee1acb62f552f2f9dfaa1c8892d0a31a15db3c640e04ae82b014414c35653a From c52ac6b6096a0d3681f92d0f2490aaa11ce45944 Mon Sep 17 00:00:00 2001 From: Olivier Lemasle Date: Sun, 8 Mar 2020 20:37:14 +0100 Subject: [PATCH 023/163] Add Conflicts with docker-ce-cli and Obsoletes docker-common --- moby-engine.spec | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/moby-engine.spec b/moby-engine.spec index 30c84fe..b4835ae 100644 --- a/moby-engine.spec +++ b/moby-engine.spec @@ -30,7 +30,7 @@ Name: %{newname}-engine Version: 19.03.7 -Release: 1.ce.git%{shortcommit_moby}%{?dist} +Release: 2.ce.git%{shortcommit_moby}%{?dist} Summary: The open-source application container engine License: ASL 2.0 # no golang / go-md2man for ppc64 @@ -76,6 +76,7 @@ Requires: device-mapper-libs >= 1.02.90-1 # Replace the old Docker packages Obsoletes: %{origname} < 2:%{version}-%{release} Obsoletes: %{origname}-latest < 2:%{version}-%{release} +Obsoletes: %{origname}-common < 2:%{version}-%{release} Provides: %{origname} = %{version}-%{release} Provides: %{origname}-latest = %{version}-%{release} @@ -86,6 +87,7 @@ Conflicts: %{origname}-common Conflicts: %{origname}-io Conflicts: %{origname}-engine-cs Conflicts: %{origname}-ce +Conflicts: %{origname}-ce-cli Conflicts: %{origname}-ee %description @@ -300,6 +302,9 @@ getent group %{service_name} >/dev/null || groupadd -r %{service_name} || : %{_datadir}/nano/Dockerfile.nanorc %changelog +* Sun Mar 8 2020 Olivier Lemasle - 19.03.7-2.ce.git7141c19 +- Add Conflicts with docker-ce-cli and Obsoletes docker-common + * Sat Mar 7 2020 Olivier Lemasle - 19.03.7-1.ce.git7141c19 - Update to latest upstream release - Docker CE 19.03.7 - Add Epoch: 2 to Obsoletes for docker and docker-latest From f190099c97d2081b58f982e8dbc616dd982d268a Mon Sep 17 00:00:00 2001 From: Olivier Lemasle Date: Mon, 16 Mar 2020 16:30:53 +0100 Subject: [PATCH 024/163] Update to latest upstream release - Docker CE 19.03.8 Prune unused BuildRequires --- .gitignore | 2 ++ moby-engine.spec | 27 ++++++++++++++------------- sources | 4 ++-- 3 files changed, 18 insertions(+), 15 deletions(-) diff --git a/.gitignore b/.gitignore index 99cabb3..5bd6914 100644 --- a/.gitignore +++ b/.gitignore @@ -6,3 +6,5 @@ /0dd43dd87fd530113bf44c9bba9ad8b20ce4637f.tar.gz /7141c199a2edb2a90b778175f836f9dd2a22c95a.tar.gz /264bffcb88c1b6b7471c04e3c6b3f301233a544b.tar.gz +/afacb8b7f0d8d4f9d2a8e8736e9c993e672b41f3.tar.gz +/bf2bd42abc0a3734f12b5ec724e571434e42c669.tar.gz diff --git a/moby-engine.spec b/moby-engine.spec index b4835ae..d38fd35 100644 --- a/moby-engine.spec +++ b/moby-engine.spec @@ -15,12 +15,12 @@ # moby / docker-ce / cli %global git_moby https://github.com/%{service_name}/%{service_name}-ce -%global commit_moby 7141c199a2edb2a90b778175f836f9dd2a22c95a +%global commit_moby afacb8b7f0d8d4f9d2a8e8736e9c993e672b41f3 %global shortcommit_moby %(c=%{commit_moby}; echo ${c:0:7}) # docker-proxy / libnetwork -%global git_libnetwork https://github.com/%{service_name}/libnetwork -%global commit_libnetwork 264bffcb88c1b6b7471c04e3c6b3f301233a544b +%global git_libnetwork https://github.com/%{newname}/libnetwork +%global commit_libnetwork bf2bd42abc0a3734f12b5ec724e571434e42c669 %global shortcommit_libnetwork %(c=%{commit_libnetwork}; echo ${c:0:7}) # tini @@ -29,8 +29,8 @@ %global shortcommit_tini %(c=%{commit_tini}; echo ${c:0:7}) Name: %{newname}-engine -Version: 19.03.7 -Release: 2.ce.git%{shortcommit_moby}%{?dist} +Version: 19.03.8 +Release: 1.ce.git%{shortcommit_moby}%{?dist} Summary: The open-source application container engine License: ASL 2.0 # no golang / go-md2man for ppc64 @@ -43,22 +43,19 @@ Source4: %{service_name}.sysconfig URL: https://www.%{origname}.com BuildRequires: btrfs-progs-devel -BuildRequires: cmake -BuildRequires: dep BuildRequires: device-mapper-devel BuildRequires: git -BuildRequires: glibc-static BuildRequires: %{?go_compiler:compiler(go-compiler)}%{!?go_compiler:golang >= 1.6.2} BuildRequires: go-md2man -BuildRequires: gpgme-devel -BuildRequires: libassuan-devel -BuildRequires: libseccomp-static >= 2.3.0 -BuildRequires: libtool-ltdl-devel +BuildRequires: libseccomp-devel >= 2.3.0 BuildRequires: make BuildRequires: pkgconfig(audit) BuildRequires: pkgconfig(systemd) BuildRequires: sed -BuildRequires: sqlite-devel + +# Build dependencies for tini +BuildRequires: cmake +BuildRequires: glibc-static # required packages on install Requires: container-selinux @@ -302,6 +299,10 @@ getent group %{service_name} >/dev/null || groupadd -r %{service_name} || : %{_datadir}/nano/Dockerfile.nanorc %changelog +* Mon Mar 16 2020 Olivier Lemasle - 19.03.8-1.ce.gitafacb8b +- Update to latest upstream release - Docker CE 19.03.8 +- Prune unused BuildRequires + * Sun Mar 8 2020 Olivier Lemasle - 19.03.7-2.ce.git7141c19 - Add Conflicts with docker-ce-cli and Obsoletes docker-common diff --git a/sources b/sources index 25e7d2e..3fe65f2 100644 --- a/sources +++ b/sources @@ -1,3 +1,3 @@ -SHA512 (7141c199a2edb2a90b778175f836f9dd2a22c95a.tar.gz) = c2f28be14c6f09670fae5c2bdfe30cf220270a555f45af652290042d93af86d14ed2c3dff170165415276ce63b68b3695d0440efc6065bb7cba0e09fe9b6b5ad -SHA512 (264bffcb88c1b6b7471c04e3c6b3f301233a544b.tar.gz) = d83a26b3156fd1d2713ea2acd380617cb3741952770bbb1bdbed65ef807615b5c008a4435c500ce089bdd60229f591c37b006b73fea417787246ad326166db22 +SHA512 (afacb8b7f0d8d4f9d2a8e8736e9c993e672b41f3.tar.gz) = 6167da129fe5c5d59e41867ed5e4d03584be684b8c37b177c456080e039b84bf5815a6db1d013a62523c3724147434c521e1242a986c4b5412ff6be5c67bc3b1 +SHA512 (bf2bd42abc0a3734f12b5ec724e571434e42c669.tar.gz) = 7a42bd5b33f7f5e7d6864620758c82e581f322757ed452a6ca11efab7ec4d8eae55adc917b9813cdb4757ec0ef5ef976d060edd30e6b9c619e11be64ccc5b966 SHA512 (fec3683b971d9c3ef73f284f176672c44b448662.tar.gz) = ee46d21467f8bacb4e8be72f5dfcbb23c1964286e90b4b3d3bf67dbbf79a337968ac8a0042a8191e329a65398b20ea160aae3ae5ef20ee03ebae11c2083d7621 From 2d3353332799617a020b0b85512cd9e646772f97 Mon Sep 17 00:00:00 2001 From: Olivier Lemasle Date: Thu, 7 May 2020 20:39:32 +0200 Subject: [PATCH 025/163] Configure storage-driver explicitely (fixes #1832301) --- docker.sysconfig | 1 + moby-engine.spec | 5 ++++- 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/docker.sysconfig b/docker.sysconfig index 6ba9fd7..24f1747 100644 --- a/docker.sysconfig +++ b/docker.sysconfig @@ -3,6 +3,7 @@ # Modify these options if you want to change the way the docker daemon runs OPTIONS="--selinux-enabled \ --log-driver=journald \ + --storage-driver=overlay2 \ --live-restore \ --default-ulimit nofile=1024:1024 \ --init-path /usr/libexec/docker/docker-init \ diff --git a/moby-engine.spec b/moby-engine.spec index d38fd35..3a4e64f 100644 --- a/moby-engine.spec +++ b/moby-engine.spec @@ -30,7 +30,7 @@ Name: %{newname}-engine Version: 19.03.8 -Release: 1.ce.git%{shortcommit_moby}%{?dist} +Release: 2.ce.git%{shortcommit_moby}%{?dist} Summary: The open-source application container engine License: ASL 2.0 # no golang / go-md2man for ppc64 @@ -299,6 +299,9 @@ getent group %{service_name} >/dev/null || groupadd -r %{service_name} || : %{_datadir}/nano/Dockerfile.nanorc %changelog +* Thu May 07 2020 Olivier Lemasle - 19.03.8-2.ce.gitafacb8b +- Configure storage-driver explicitely (fixes #1832301) + * Mon Mar 16 2020 Olivier Lemasle - 19.03.8-1.ce.gitafacb8b - Update to latest upstream release - Docker CE 19.03.8 - Prune unused BuildRequires From 8a8c5cd3d24f9aa0d0fe7a8aed409f330bbb13b7 Mon Sep 17 00:00:00 2001 From: Olivier Lemasle Date: Thu, 7 May 2020 20:40:02 +0200 Subject: [PATCH 026/163] Add firewalld zone (fixes #1817022) --- docker-zone.xml | 6 ++++++ moby-engine.spec | 14 ++++++++++++++ 2 files changed, 20 insertions(+) create mode 100644 docker-zone.xml diff --git a/docker-zone.xml b/docker-zone.xml new file mode 100644 index 0000000..34e123b --- /dev/null +++ b/docker-zone.xml @@ -0,0 +1,6 @@ + + + docker + All network connections are accepted. + + diff --git a/moby-engine.spec b/moby-engine.spec index 3a4e64f..7249616 100644 --- a/moby-engine.spec +++ b/moby-engine.spec @@ -40,6 +40,7 @@ Source1: %{git_libnetwork}/archive/%{commit_libnetwork}.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 @@ -52,6 +53,7 @@ BuildRequires: make BuildRequires: pkgconfig(audit) BuildRequires: pkgconfig(systemd) BuildRequires: sed +BuildRequires: firewalld-filesystem # Build dependencies for tini BuildRequires: cmake @@ -67,6 +69,9 @@ Requires: pigz Requires: runc Requires: containerd +Requires(post): firewalld-filesystem +Requires(postun): firewalld-filesystem + # Resolves: rhbz#1165615 Requires: device-mapper-libs >= 1.02.90-1 @@ -220,6 +225,10 @@ install -p -m 644 components/engine/contrib/init/systemd/docker.socket %{buildro 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 @@ -255,12 +264,14 @@ getent group %{service_name} >/dev/null || groupadd -r %{service_name} || : %post %systemd_post %{service_name}.service %{service_name}.socket +%firewalld_reload %preun %systemd_preun %{service_name}.service %{service_name}.socket %postun %systemd_postun_with_restart %{service_name}.service +%firewalld_reload %files %license cli-LICENSE components/engine/LICENSE @@ -275,6 +286,7 @@ 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/* @@ -301,6 +313,8 @@ getent group %{service_name} >/dev/null || groupadd -r %{service_name} || : %changelog * Thu May 07 2020 Olivier Lemasle - 19.03.8-2.ce.gitafacb8b - Configure storage-driver explicitely (fixes #1832301) +- Add firewalld zone: trust interface docker0, as firewalld now uses nftables + by default and docker communicates with iptables (fixes #1817022) * Mon Mar 16 2020 Olivier Lemasle - 19.03.8-1.ce.gitafacb8b - Update to latest upstream release - Docker CE 19.03.8 From 7182e8ca78faae23fd69199cc6c280471501c4f5 Mon Sep 17 00:00:00 2001 From: Olivier Lemasle Date: Sun, 7 Jun 2020 23:10:55 +0200 Subject: [PATCH 027/163] Update to upstream 19.03.11 to prevent CVE-2020-13401 --- .gitignore | 2 ++ moby-engine.spec | 11 +++++++---- sources | 4 ++-- 3 files changed, 11 insertions(+), 6 deletions(-) diff --git a/.gitignore b/.gitignore index 5bd6914..47474f6 100644 --- a/.gitignore +++ b/.gitignore @@ -8,3 +8,5 @@ /264bffcb88c1b6b7471c04e3c6b3f301233a544b.tar.gz /afacb8b7f0d8d4f9d2a8e8736e9c993e672b41f3.tar.gz /bf2bd42abc0a3734f12b5ec724e571434e42c669.tar.gz +/2e24aed516bd5c836e11378bb457dd612aa868ed.tar.gz +/42e35e61f352e527082521280d5ea3761f0dee50.tar.gz diff --git a/moby-engine.spec b/moby-engine.spec index 7249616..13b1f7f 100644 --- a/moby-engine.spec +++ b/moby-engine.spec @@ -15,12 +15,12 @@ # moby / docker-ce / cli %global git_moby https://github.com/%{service_name}/%{service_name}-ce -%global commit_moby afacb8b7f0d8d4f9d2a8e8736e9c993e672b41f3 +%global commit_moby 42e35e61f352e527082521280d5ea3761f0dee50 %global shortcommit_moby %(c=%{commit_moby}; echo ${c:0:7}) # docker-proxy / libnetwork %global git_libnetwork https://github.com/%{newname}/libnetwork -%global commit_libnetwork bf2bd42abc0a3734f12b5ec724e571434e42c669 +%global commit_libnetwork 2e24aed516bd5c836e11378bb457dd612aa868ed %global shortcommit_libnetwork %(c=%{commit_libnetwork}; echo ${c:0:7}) # tini @@ -29,8 +29,8 @@ %global shortcommit_tini %(c=%{commit_tini}; echo ${c:0:7}) Name: %{newname}-engine -Version: 19.03.8 -Release: 2.ce.git%{shortcommit_moby}%{?dist} +Version: 19.03.11 +Release: 1.ce.git%{shortcommit_moby}%{?dist} Summary: The open-source application container engine License: ASL 2.0 # no golang / go-md2man for ppc64 @@ -311,6 +311,9 @@ getent group %{service_name} >/dev/null || groupadd -r %{service_name} || : %{_datadir}/nano/Dockerfile.nanorc %changelog +* Sun Jun 07 2020 Olivier Lemasle - 19.03.11-1.ce.git42e35e6 +- Update to upstream 19.03.11 to prevent CVE-2020-13401 + * Thu May 07 2020 Olivier Lemasle - 19.03.8-2.ce.gitafacb8b - Configure storage-driver explicitely (fixes #1832301) - Add firewalld zone: trust interface docker0, as firewalld now uses nftables diff --git a/sources b/sources index 3fe65f2..0719173 100644 --- a/sources +++ b/sources @@ -1,3 +1,3 @@ -SHA512 (afacb8b7f0d8d4f9d2a8e8736e9c993e672b41f3.tar.gz) = 6167da129fe5c5d59e41867ed5e4d03584be684b8c37b177c456080e039b84bf5815a6db1d013a62523c3724147434c521e1242a986c4b5412ff6be5c67bc3b1 -SHA512 (bf2bd42abc0a3734f12b5ec724e571434e42c669.tar.gz) = 7a42bd5b33f7f5e7d6864620758c82e581f322757ed452a6ca11efab7ec4d8eae55adc917b9813cdb4757ec0ef5ef976d060edd30e6b9c619e11be64ccc5b966 +SHA512 (2e24aed516bd5c836e11378bb457dd612aa868ed.tar.gz) = 68039ed293487e636dcbfc3cd8cd74d8f76ef196d8fc2cceb800a98ba55d6b348b7d9b302ef87d1f2186376174233ef2131d6ccb77b3b1817b4dc06a0fe37556 +SHA512 (42e35e61f352e527082521280d5ea3761f0dee50.tar.gz) = 4bb70a68b941d6f819ecb8c533b6eea7eaf4b9a878e96b13f3b057e7e40efba2442df2f9ab4f34cdceff51a5237ca50affec98092a42a1654be686422f7449cb SHA512 (fec3683b971d9c3ef73f284f176672c44b448662.tar.gz) = ee46d21467f8bacb4e8be72f5dfcbb23c1964286e90b4b3d3bf67dbbf79a337968ac8a0042a8191e329a65398b20ea160aae3ae5ef20ee03ebae11c2083d7621 From 0910c329fa192113551716e5ece5c555ae43fa2d Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Tue, 28 Jul 2020 08:13:17 +0000 Subject: [PATCH 028/163] - Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- moby-engine.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/moby-engine.spec b/moby-engine.spec index 13b1f7f..99591d5 100644 --- a/moby-engine.spec +++ b/moby-engine.spec @@ -30,7 +30,7 @@ Name: %{newname}-engine Version: 19.03.11 -Release: 1.ce.git%{shortcommit_moby}%{?dist} +Release: 2.ce.git%{shortcommit_moby}%{?dist} Summary: The open-source application container engine License: ASL 2.0 # no golang / go-md2man for ppc64 @@ -311,6 +311,9 @@ getent group %{service_name} >/dev/null || groupadd -r %{service_name} || : %{_datadir}/nano/Dockerfile.nanorc %changelog +* Tue Jul 28 2020 Fedora Release Engineering - 19.03.11-2.ce.git42e35e6 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild + * Sun Jun 07 2020 Olivier Lemasle - 19.03.11-1.ce.git42e35e6 - Update to upstream 19.03.11 to prevent CVE-2020-13401 From 08e00655f5d8a14eb915e048eca3911a62378cc2 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sat, 1 Aug 2020 04:32:20 +0000 Subject: [PATCH 029/163] - Second attempt - Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- moby-engine.spec | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/moby-engine.spec b/moby-engine.spec index 99591d5..f226920 100644 --- a/moby-engine.spec +++ b/moby-engine.spec @@ -30,7 +30,7 @@ Name: %{newname}-engine Version: 19.03.11 -Release: 2.ce.git%{shortcommit_moby}%{?dist} +Release: 3.ce.git%{shortcommit_moby}%{?dist} Summary: The open-source application container engine License: ASL 2.0 # no golang / go-md2man for ppc64 @@ -311,6 +311,10 @@ getent group %{service_name} >/dev/null || groupadd -r %{service_name} || : %{_datadir}/nano/Dockerfile.nanorc %changelog +* Sat Aug 01 2020 Fedora Release Engineering - 19.03.11-3.ce.git42e35e6 +- Second attempt - Rebuilt for + https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild + * Tue Jul 28 2020 Fedora Release Engineering - 19.03.11-2.ce.git42e35e6 - Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild From 62dc2fd9855583c7cc45179fc9e1d21d2ce5523c Mon Sep 17 00:00:00 2001 From: Olivier Lemasle Date: Fri, 2 Oct 2020 20:20:30 +0200 Subject: [PATCH 030/163] Fix FTBFS: adapt to change to CMake builds (#1864160) --- moby-engine.spec | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/moby-engine.spec b/moby-engine.spec index f226920..12c1af7 100644 --- a/moby-engine.spec +++ b/moby-engine.spec @@ -30,7 +30,7 @@ Name: %{newname}-engine Version: 19.03.11 -Release: 3.ce.git%{shortcommit_moby}%{?dist} +Release: 4.ce.git%{shortcommit_moby}%{?dist} Summary: The open-source application container engine License: ASL 2.0 # no golang / go-md2man for ppc64 @@ -171,7 +171,7 @@ sed -i '/env bash/d' components/cli/contrib/completion/bash/docker ( cd tini-%{commit_tini} %cmake . - make tini-static + make tini-static -C "%{__cmake_builddir}" ) # build engine @@ -210,7 +210,7 @@ install -p -m 755 components/engine/bundles/dynbinary-daemon/%{service_name}d %{ install -p -m 755 libnetwork-%{commit_libnetwork}/%{service_name}-proxy %{buildroot}%{_libexecdir}/%{service_name}/%{service_name}-proxy # install tini -install -p -m 755 tini-%{commit_tini}/tini-static %{buildroot}%{_libexecdir}/%{service_name}/%{service_name}-init +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 @@ -311,6 +311,9 @@ getent group %{service_name} >/dev/null || groupadd -r %{service_name} || : %{_datadir}/nano/Dockerfile.nanorc %changelog +* Fri Oct 02 2020 Olivier Lemasle - 19.03.11-4.ce.git42e35e6 +- Fix FTBFS: adapt to change to CMake builds (#1864160) + * Sat Aug 01 2020 Fedora Release Engineering - 19.03.11-3.ce.git42e35e6 - Second attempt - Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild From 41674ad3271f87d2c216d047ed4f80090277654c Mon Sep 17 00:00:00 2001 From: Olivier Lemasle Date: Fri, 2 Oct 2020 21:09:52 +0200 Subject: [PATCH 031/163] Update to upstream 19.03.13 --- .gitignore | 2 ++ moby-engine.spec | 11 +++++++---- sources | 4 ++-- 3 files changed, 11 insertions(+), 6 deletions(-) diff --git a/.gitignore b/.gitignore index 47474f6..fd19f93 100644 --- a/.gitignore +++ b/.gitignore @@ -10,3 +10,5 @@ /bf2bd42abc0a3734f12b5ec724e571434e42c669.tar.gz /2e24aed516bd5c836e11378bb457dd612aa868ed.tar.gz /42e35e61f352e527082521280d5ea3761f0dee50.tar.gz +/4484c46d9d1a2d10b8fc662923ad586daeedb04f.tar.gz +/026aabaa659832804b01754aaadd2c0f420c68b6.tar.gz diff --git a/moby-engine.spec b/moby-engine.spec index 12c1af7..dbcd827 100644 --- a/moby-engine.spec +++ b/moby-engine.spec @@ -15,12 +15,12 @@ # moby / docker-ce / cli %global git_moby https://github.com/%{service_name}/%{service_name}-ce -%global commit_moby 42e35e61f352e527082521280d5ea3761f0dee50 +%global commit_moby 4484c46d9d1a2d10b8fc662923ad586daeedb04f %global shortcommit_moby %(c=%{commit_moby}; echo ${c:0:7}) # docker-proxy / libnetwork %global git_libnetwork https://github.com/%{newname}/libnetwork -%global commit_libnetwork 2e24aed516bd5c836e11378bb457dd612aa868ed +%global commit_libnetwork 026aabaa659832804b01754aaadd2c0f420c68b6 %global shortcommit_libnetwork %(c=%{commit_libnetwork}; echo ${c:0:7}) # tini @@ -29,8 +29,8 @@ %global shortcommit_tini %(c=%{commit_tini}; echo ${c:0:7}) Name: %{newname}-engine -Version: 19.03.11 -Release: 4.ce.git%{shortcommit_moby}%{?dist} +Version: 19.03.13 +Release: 1.ce.git%{shortcommit_moby}%{?dist} Summary: The open-source application container engine License: ASL 2.0 # no golang / go-md2man for ppc64 @@ -311,6 +311,9 @@ getent group %{service_name} >/dev/null || groupadd -r %{service_name} || : %{_datadir}/nano/Dockerfile.nanorc %changelog +* Fri Oct 02 2020 Olivier Lemasle - 19.03.13-1.ce.git4484c46 +- Update to upstream 19.03.13 (#1837641) + * Fri Oct 02 2020 Olivier Lemasle - 19.03.11-4.ce.git42e35e6 - Fix FTBFS: adapt to change to CMake builds (#1864160) diff --git a/sources b/sources index 0719173..477a164 100644 --- a/sources +++ b/sources @@ -1,3 +1,3 @@ -SHA512 (2e24aed516bd5c836e11378bb457dd612aa868ed.tar.gz) = 68039ed293487e636dcbfc3cd8cd74d8f76ef196d8fc2cceb800a98ba55d6b348b7d9b302ef87d1f2186376174233ef2131d6ccb77b3b1817b4dc06a0fe37556 -SHA512 (42e35e61f352e527082521280d5ea3761f0dee50.tar.gz) = 4bb70a68b941d6f819ecb8c533b6eea7eaf4b9a878e96b13f3b057e7e40efba2442df2f9ab4f34cdceff51a5237ca50affec98092a42a1654be686422f7449cb +SHA512 (4484c46d9d1a2d10b8fc662923ad586daeedb04f.tar.gz) = dd839a0a38bc50653bfa8bc8d5583d3961dac8513c54a3f9c73a4c8ad6ecc48ed7242e1b9190a28813f822f682b4ad692a339e5b61aed803b27b94f4ae1ab802 +SHA512 (026aabaa659832804b01754aaadd2c0f420c68b6.tar.gz) = fe8644611e975c051ee6e7ad4871624fb45862d9b4a2fd62ea4283e76ad9804d91d585e2165915b09356f11f9dfb31c40dd9ce6a66d63c5032c8c62354960538 SHA512 (fec3683b971d9c3ef73f284f176672c44b448662.tar.gz) = ee46d21467f8bacb4e8be72f5dfcbb23c1964286e90b4b3d3bf67dbbf79a337968ac8a0042a8191e329a65398b20ea160aae3ae5ef20ee03ebae11c2083d7621 From 11b75b66ae54b46bf3ce46664943fa05a6fa9f97 Mon Sep 17 00:00:00 2001 From: Federico Gimenez Date: Fri, 15 Jan 2021 13:41:12 +0000 Subject: [PATCH 032/163] Remove fixed storage-driver Instead of configuring the docker daemon to use a fixed storage-driver remove the setting and let it decide which one to use. Trying to use the moby-engine package on a Fedora33 I was getting the error described here https://github.com/kubernetes-sigs/kind/issues/1988 because of the default btrfs filesystem, removing the storage-driver setting from docker's sysconfig fixes it. --- docker.sysconfig | 1 - 1 file changed, 1 deletion(-) diff --git a/docker.sysconfig b/docker.sysconfig index 24f1747..6ba9fd7 100644 --- a/docker.sysconfig +++ b/docker.sysconfig @@ -3,7 +3,6 @@ # Modify these options if you want to change the way the docker daemon runs OPTIONS="--selinux-enabled \ --log-driver=journald \ - --storage-driver=overlay2 \ --live-restore \ --default-ulimit nofile=1024:1024 \ --init-path /usr/libexec/docker/docker-init \ From 92391fb216c4e08493f258c846afb8042239eefb Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Tue, 26 Jan 2021 20:36:38 +0000 Subject: [PATCH 033/163] - Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- moby-engine.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/moby-engine.spec b/moby-engine.spec index dbcd827..3581ed3 100644 --- a/moby-engine.spec +++ b/moby-engine.spec @@ -30,7 +30,7 @@ Name: %{newname}-engine Version: 19.03.13 -Release: 1.ce.git%{shortcommit_moby}%{?dist} +Release: 2.ce.git%{shortcommit_moby}%{?dist} Summary: The open-source application container engine License: ASL 2.0 # no golang / go-md2man for ppc64 @@ -311,6 +311,9 @@ getent group %{service_name} >/dev/null || groupadd -r %{service_name} || : %{_datadir}/nano/Dockerfile.nanorc %changelog +* Tue Jan 26 2021 Fedora Release Engineering - 19.03.13-2.ce.git4484c46 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild + * Fri Oct 02 2020 Olivier Lemasle - 19.03.13-1.ce.git4484c46 - Update to upstream 19.03.13 (#1837641) From f84e28034deb54f422f1a04d9e5c604ed232a06b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Zbigniew=20J=C4=99drzejewski-Szmek?= Date: Tue, 2 Mar 2021 16:13:26 +0100 Subject: [PATCH 034/163] Rebuilt for updated systemd-rpm-macros See https://pagure.io/fesco/issue/2583. --- moby-engine.spec | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/moby-engine.spec b/moby-engine.spec index 3581ed3..43c0ea1 100644 --- a/moby-engine.spec +++ b/moby-engine.spec @@ -30,7 +30,7 @@ Name: %{newname}-engine Version: 19.03.13 -Release: 2.ce.git%{shortcommit_moby}%{?dist} +Release: 3.ce.git%{shortcommit_moby}%{?dist} Summary: The open-source application container engine License: ASL 2.0 # no golang / go-md2man for ppc64 @@ -311,6 +311,10 @@ getent group %{service_name} >/dev/null || groupadd -r %{service_name} || : %{_datadir}/nano/Dockerfile.nanorc %changelog +* 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. + * Tue Jan 26 2021 Fedora Release Engineering - 19.03.13-2.ce.git4484c46 - Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild From 37290ccb01de43c6bfecb87e93ccfbb9780fd6ab Mon Sep 17 00:00:00 2001 From: Olivier Lemasle Date: Sun, 14 Mar 2021 22:26:09 +0100 Subject: [PATCH 035/163] 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 From 7b349c21228f2a592f109f881e52a4a709953172 Mon Sep 17 00:00:00 2001 From: Olivier Lemasle Date: Sun, 14 Mar 2021 22:47:31 +0100 Subject: [PATCH 036/163] Add PR change to changelog --- moby-engine.spec | 1 + 1 file changed, 1 insertion(+) diff --git a/moby-engine.spec b/moby-engine.spec index 2565701..72aa97f 100644 --- a/moby-engine.spec +++ b/moby-engine.spec @@ -386,6 +386,7 @@ getent group %{service_name} >/dev/null || groupadd -r %{service_name} || : - 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 +- Remove fixed storage-driver (cf. https://src.fedoraproject.org/rpms/moby-engine/pull-request/6) * Tue Mar 02 2021 Zbigniew Jędrzejewski-Szmek - 19.03.13-3.ce.git4484c46 - Rebuilt for updated systemd-rpm-macros From 7fce04db5793cdc4acf6039d6ca6f3565ed8d099 Mon Sep 17 00:00:00 2001 From: Olivier Lemasle Date: Tue, 20 Apr 2021 23:40:53 +0200 Subject: [PATCH 037/163] Update to upstream 20.10.6 (#1948605) Re-bundle moby dependencies to fix gRPC issues with Swarm (https://github.com/coreos/fedora-coreos-tracker/issues/793) --- .gitignore | 2 + moby-engine.spec | 165 +++++++++++++++++++++++++++++++++++++++++++---- sources | 4 +- 3 files changed, 155 insertions(+), 16 deletions(-) diff --git a/.gitignore b/.gitignore index 37c43dc..10cacfc 100644 --- a/.gitignore +++ b/.gitignore @@ -15,3 +15,5 @@ /de40ad007797e0dcd8b7126f27bb87401d224240.tar.gz /moby-v20.10.5.tar.gz /cli-v20.10.5.tar.gz +/moby-v20.10.6.tar.gz +/cli-v20.10.6.tar.gz diff --git a/moby-engine.spec b/moby-engine.spec index 72aa97f..8ed6e7a 100644 --- a/moby-engine.spec +++ b/moby-engine.spec @@ -15,12 +15,12 @@ # moby %global git_moby https://github.com/%{newname}/%{newname} -%global commit_moby 363e9a88a11be517d9e8c65c998ff56f774eb4dc +%global commit_moby 8728dd246c3ab53105434eef8ffe997b6fd14dc6 %global shortcommit_moby %(c=%{commit_moby}; echo ${c:0:7}) # cli %global git_cli https://github.com/%{origname}/cli -%global commit_cli 55c4c88966a912ddb365e2d73a4969e700fc458f +%global commit_cli 370c28948e3c12dce3d1df60b6f184990618553f %global shortcommit_cli %(c=%{commit_cli}; echo ${c:0:7}) # tini @@ -29,7 +29,7 @@ %global shortcommit_tini %(c=%{commit_tini}; echo ${c:0:7}) Name: %{newname}-engine -Version: 20.10.5 +Version: 20.10.6 Release: 1%{?dist} Summary: The open-source application container engine License: ASL 2.0 @@ -42,7 +42,7 @@ Source3: %{service_name}.service Source4: %{service_name}.sysconfig URL: https://www.%{origname}.com -BuildRequires: golang-github-docker-devel +# BuildRequires: golang-github-docker-devel BuildRequires: golang-github-docker-libnetwork-devel BuildRequires: pkgconfig(libbtrfsutil) BuildRequires: pkgconfig(devmapper) @@ -91,12 +91,12 @@ Conflicts: %{origname}-ce Conflicts: %{origname}-ce-cli Conflicts: %{origname}-ee -# Bundled dependencies (docker/cli is still bundled with vendored dependencies) +# Bundled dependencies Provides: bundled(tini-static) +Provides: bundled(golang(github.com/docker/docker)) 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 @@ -165,7 +165,7 @@ Provides: bundled(golang(github.com/shurcooL/sanitized_anchor_name)) = 7bf 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/theupdateframework/notary)) = bf96a202a09a312ae005cd312fc06ff4d2c166ce 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 @@ -193,7 +193,133 @@ Provides: bundled(golang(k8s.io/klog)) = 4ad0115ba9e45c096d06a31d8dfb0e5bd Provides: bundled(golang(k8s.io/kube-openapi)) = 0270cf2f1c1d995d34b36019a6f65d58e6e33ad4 Provides: bundled(golang(k8s.io/utils)) = 69764acb6e8e900b7c05296c5d3c9c19545475f9 Provides: bundled(golang(sigs.k8s.io/yaml)) = fd68e9863619f6ec2fdd8625fe1f02e7c877e480 - +# grep -v -e '^$' -e '^#' moby/vendor.conf | sort | awk '{print "Provides: bundled(golang("$1")) = "$2}' +Provides: bundled(golang(cloud.google.com/go)) = ceeb313ad77b789a7fa5287b36a1d127b69b7093 +Provides: bundled(golang(code.cloudfoundry.org/clock)) = 02e53af36e6c978af692887ed449b74026d76fec +Provides: bundled(golang(github.com/armon/go-metrics)) = eb0af217e5e9747e41dd5303755356b62d28e3ec +Provides: bundled(golang(github.com/armon/go-radix)) = e39d623f12e8e41c7b5529e9a9dd67a1e2261f80 +Provides: bundled(golang(github.com/aws/aws-sdk-go)) = 2590bc875c54c9fda225d8e4e56a9d28d90c6a47 +Provides: bundled(golang(github.com/Azure/go-ansiterm)) = d6e3b3328b783f23731bc4d058875b0371ff8109 +Provides: bundled(golang(github.com/beorn7/perks)) = 37c8de3658fcb183f997c4e13e8337516ab753e6 +Provides: bundled(golang(github.com/bsphere/le_go)) = 7a984a84b5492ae539b79b62fb4a10afc63c7bcf +Provides: bundled(golang(github.com/BurntSushi/toml)) = 3012a1dbe2e4bd1391d42b32f0577cb7bbc7f005 +Provides: bundled(golang(github.com/cespare/xxhash/v2)) = d7df74196a9e781ede915320c11c378c1b2f3a1f +Provides: bundled(golang(github.com/cilium/ebpf)) = 1c8d4c9ef7759622653a1d319284a44652333b28 +Provides: bundled(golang(github.com/cloudflare/cfssl)) = 5d63dbd981b5c408effbb58c442d54761ff94fbd +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/fifo)) = 0724c46b320cf96bb172a0550c19a4b1fca4dacb +Provides: bundled(golang(github.com/containerd/go-runc)) = 16b287bc67d069a60fa48db15f330b790b74365b +Provides: bundled(golang(github.com/containerd/ttrpc)) = bfba540dc45464586c106b1f31c8547933c1eb41 +Provides: bundled(golang(github.com/containerd/typeurl)) = cd3ce7159eae562a4f60ceff37dada11a939d247 +Provides: bundled(golang(github.com/coreos/etcd)) = d57e8b8d97adfc4a6c224fe116714bf1a1f3beb9 +Provides: bundled(golang(github.com/coreos/go-semver)) = 8ab6407b697782a06568d4b7f1db25550ec2e4c6 +Provides: bundled(golang(github.com/coreos/go-systemd)) = 39ca1b05acc7ad1220e09f133283b8859a8b71ab +Provides: bundled(golang(github.com/coreos/go-systemd/v22)) = 2d78030078ef61b3cae27f42ad6d0e46db51b339 +Provides: bundled(golang(github.com/coreos/pkg)) = 3ac0863d7acf3bc44daf49afef8919af12f704ef +Provides: bundled(golang(github.com/creack/pty)) = 2a38352e8b4d7ab6c336eef107e42a55e72e7fbc +Provides: bundled(golang(github.com/cyphar/filepath-securejoin)) = a261ee33d7a517f054effbf451841abaafe3e0fd +Provides: bundled(golang(github.com/deckarep/golang-set)) = ef32fa3046d9f249d399f98ebaf9be944430fd1d +Provides: bundled(golang(github.com/docker/distribution)) = 0d3efadf0154c2b8a4e7b6621fff9809655cc580 +Provides: bundled(golang(github.com/docker/go-connections)) = 7395e3f8aa162843a74ed6d48e79627d9792ac55 +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/libkv)) = 458977154600b9f23984d9f4b82e79570b5ae12b +Provides: bundled(golang(github.com/docker/libnetwork)) = b3507428be5b458cb0e2b4086b13531fb0706e46 +Provides: bundled(golang(github.com/docker/libtrust)) = 9cbd2a1374f46905c68a4eb3694a130610adc62a +Provides: bundled(golang(github.com/docker/swarmkit)) = 17d8d4e4d8bdec33d386e6362d3537fa9493ba00 +Provides: bundled(golang(github.com/fernet/fernet-go)) = 9eac43b88a5efb8651d24de9b68e87567e029736 +Provides: bundled(golang(github.com/fluent/fluent-logger-golang)) = 7a6c9dcd7f14c2ed5d8c55c11b894e5455ee311b +Provides: bundled(golang(github.com/fsnotify/fsnotify)) = 45d7d09e39ef4ac08d493309fa031790c15bfe8a +Provides: bundled(golang(github.com/godbus/dbus/v5)) = 37bf87eef99d69c4f1d3528bd66e3a87dc201472 +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/gddo)) = 72a348e765d293ed6d1ded7b699591f14d6cd921 +Provides: bundled(golang(github.com/golang/groupcache)) = 869f871628b6baa9cfbc11732cdf6546b17c1298 +Provides: bundled(golang(github.com/golang/protobuf)) = 84668698ea25b64748563aa20726db66a6b8d299 +Provides: bundled(golang(github.com/googleapis/gax-go)) = bd5b16380fd03dc758d11cef74ba2e3bc8b0e8c2 +Provides: bundled(golang(github.com/google/certificate-transparency-go)) = 37a384cd035e722ea46e55029093e26687138edf +Provides: bundled(golang(github.com/google/go-cmp)) = 3af367b6b30c263d47e8895973edcca9a49cf029 +Provides: bundled(golang(github.com/google/shlex)) = e7afc7fbc51079733e9468cdfd1efcd7d196cd1d +Provides: bundled(golang(github.com/google/uuid)) = 0cd6bf5da1e1c83f8b45653022c74f71af0538a4 +Provides: bundled(golang(github.com/gorilla/mux)) = 98cb6bf42e086f6af920b965c38cacc07402d51b +Provides: bundled(golang(github.com/Graylog2/go-gelf)) = 1550ee647df0510058c9d67a45c56f18911d80b8 +Provides: bundled(golang(github.com/grpc-ecosystem/go-grpc-middleware)) = 3c51f7f332123e8be5a157c0802a228ac85bf9db +Provides: bundled(golang(github.com/grpc-ecosystem/go-grpc-prometheus)) = c225b8c3b01faf2899099b768856a9e916e5087b +Provides: bundled(golang(github.com/grpc-ecosystem/grpc-opentracing)) = 8e809c8a86450a29b90dcc9efbf062d0fe6d9746 +Provides: bundled(golang(github.com/hashicorp/consul)) = 9a9cc9341bb487651a0399e3fc5e1e8a42e62dd9 +Provides: bundled(golang(github.com/hashicorp/errwrap)) = 8a6fb523712970c966eefc6b39ed2c5e74880354 +Provides: bundled(golang(github.com/hashicorp/go-immutable-radix)) = 826af9ccf0feeee615d546d69b11f8e98da8c8f1 +Provides: bundled(golang(github.com/hashicorp/golang-lru)) = 7f827b33c0f158ec5dfbba01bb0b14a4541fd81d +Provides: bundled(golang(github.com/hashicorp/go-memdb)) = cb9a474f84cc5e41b273b20c6927680b2a8776ad +Provides: bundled(golang(github.com/hashicorp/go-msgpack)) = 71c2886f5a673a35f909803f38ece5810165097b +Provides: bundled(golang(github.com/hashicorp/go-multierror)) = 886a7fbe3eb1c874d46f623bfa70af45f425b3d1 +Provides: bundled(golang(github.com/hashicorp/go-sockaddr)) = c7188e74f6acae5a989bdc959aa779f8b9f42faf +Provides: bundled(golang(github.com/hashicorp/memberlist)) = 3d8438da9589e7b608a83ffac1ef8211486bcb7c +Provides: bundled(golang(github.com/hashicorp/serf)) = 598c54895cc5a7b1a24a398d635e8c0ea0959870 +Provides: bundled(golang(github.com/imdario/mergo)) = 1afb36080aec31e0d1528973ebe6721b191b0369 +Provides: bundled(golang(github.com/inconshreveable/mousetrap)) = 76626ae9c91c4f2a10f34cad8ce83ea42c93bb75 +Provides: bundled(golang(github.com/ishidawataru/sctp)) = 6e2cb1366111dcf547c13531e3a263a067715847 +Provides: bundled(golang(github.com/jmespath/go-jmespath)) = 2d053f87d1d7f9f48196ae04cf3daea4273d207d +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)) = 9dcb42f100215f8d375b4a9265e5bba009217a85 +Provides: bundled(golang(github.com/Microsoft/opengcs)) = a10967154e143a36014584a6f664344e3bb0aa64 +Provides: bundled(golang(github.com/miekg/dns)) = 6c0c4e6581f8e173cc562c8b3363ab984e4ae071 +Provides: bundled(golang(github.com/mistifyio/go-zfs)) = f784269be439d704d3dfa1906f45dd848fed2beb +Provides: bundled(golang(github.com/mitchellh/hashstructure)) = a38c50148365edc8df43c1580c48fb2b3a1e9cd7 +Provides: bundled(golang(github.com/moby/buildkit)) = 9065b18ba4633c75862befca8188de4338d9f94a +Provides: bundled(golang(github.com/moby/ipvs)) = 4566ccea0e08d68e9614c3e7a64a23b850c4bb35 +Provides: bundled(golang(github.com/moby/locker)) = 281af2d563954745bea9d1487c965f24d30742fe +Provides: bundled(golang(github.com/moby/sys)) = 1bc8673b57550ddf85262eb0fed0aac651a37dab +Provides: bundled(golang(github.com/moby/term)) = bea5bbe245bf407372d477f1361d2ff042d2f556 +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/opencontainers/runtime-spec)) = 4d89ac9fbff6c455f46a5bb59c6b1bb7184a5e43 +Provides: bundled(golang(github.com/opencontainers/selinux)) = 2f45b3796d18f1ab4c9fc0c888a98d0a0fd6e429 +Provides: bundled(golang(github.com/opentracing-contrib/go-stdlib)) = 8a6ff1ad1691a29e4f7b5d46604f97634997c8c4 +Provides: bundled(golang(github.com/opentracing/opentracing-go)) = d34af3eaa63c4d08ab54863a4bdd0daa45212e12 +Provides: bundled(golang(github.com/philhofer/fwd)) = bb6d471dc95d4fe11e432687f8b70ff496cf3136 +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/RackSec/srslog)) = a4725f04ec91af1a91b380da679d6e0c2f061e59 +Provides: bundled(golang(github.com/samuel/go-zookeeper)) = d0e0d8e11f318e000a8cc434616d69e329edc374 +Provides: bundled(golang(github.com/sean-/seed)) = e2103e2c35297fb7e17febb81e49b312087a2372 +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/syndtr/gocapability)) = 42c35b4376354fd554efc7ad35e0b7f94e3a0ffb +Provides: bundled(golang(github.com/tchap/go-patricia)) = a7f0089c6f496e8e70402f61733606daa326cac5 +Provides: bundled(golang(github.com/tinylib/msgp)) = af6442a0fcf6e2a1b824f70dd0c734f01e817751 +Provides: bundled(golang(github.com/tonistiigi/fsutil)) = 0834f99b7b85462efb69b4f571a4fa3ca7da5ac9 +Provides: bundled(golang(github.com/tonistiigi/units)) = 6950e57a87eaf136bbe44ef2ec8e75b9e3569de2 +Provides: bundled(golang(github.com/ugorji/go)) = b4c50a2b199d93b13dc15e78929cfb23bfdf21ab +Provides: bundled(golang(github.com/vbatts/tar-split)) = 620714a4c508c880ac1bdda9c8370a2b19af1a55 +Provides: bundled(golang(github.com/vishvananda/netlink)) = f049be6f391489d3f374498fe0c8df8449258372 +Provides: bundled(golang(github.com/vishvananda/netns)) = db3c7e526aae966c4ccfa6c8189b693d6ac5d202 +Provides: bundled(golang(github.com/willf/bitset)) = 559910e8471e48d76d9e5a1ba15842dee77ad45d +Provides: bundled(golang(go.etcd.io/bbolt)) = 232d8fc87f50244f9c808f4745759e08a304c029 +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/text)) = 23ae387dee1f90d29a23c0e87ee0b46038fbed0e +Provides: bundled(golang(golang.org/x/time)) = 555d28b269f0569763d25dbe1a237ae74c6bcc82 +Provides: bundled(golang(google.golang.org/api)) = dec2ee309f5b09fc59bc40676447c15736284d78 +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(gotest.tools/v3)) = 568bc57cc5c19a2ef85e5749870b49a4cc2ab54d %description Docker is an open source project to build, ship and run any application as a @@ -266,13 +392,19 @@ mkdir -p _build # build engine ( - 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)'" + mkdir -p src/github.com/%{service_name} + ln -fns ../../.. src/github.com/%{service_name}/%{service_name} + export GOPATH="${PWD}" + export GO111MODULE=off + # 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 + # %%gobuild -o _build/%%{service_name}d github.com/%%{service_name}/%%{service_name}/cmd/dockerd + VERSION=%{version} DOCKER_GITCOMMIT=%{shortcommit_moby} bash -x hack/make.sh dynbinary + mv bundles/dynbinary-daemon/dockerd-%{version} _build/dockerd ) # build cli @@ -380,6 +512,11 @@ getent group %{service_name} >/dev/null || groupadd -r %{service_name} || : %{_datadir}/nano/Dockerfile.nanorc %changelog +* Tue Apr 20 2021 Olivier Lemasle - 20.10.6-1 +- Update to upstream 20.10.6 (#1948605) +- Re-bundle moby dependencies to fix gRPC issues with Swarm + (https://github.com/coreos/fedora-coreos-tracker/issues/793) + * 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 diff --git a/sources b/sources index 1812968..d39b506 100644 --- a/sources +++ b/sources @@ -1,3 +1,3 @@ -SHA512 (moby-v20.10.5.tar.gz) = 620a5345d99be16b4c6ba7321e91e4896128f7d638dfe2220554a6cadeb78b21dd3003cff6db60ed5ffd671ea243b310b21cc1123543b0e0cbfa93eec2900973 -SHA512 (cli-v20.10.5.tar.gz) = 868e19fa834993bbd20a0d28a57f364287f39434355ccf90e63f3ead8d55fe488ac3bdab3f85230bfbede318b93513536f36da131fc17c27763a5375b4e0c636 +SHA512 (moby-v20.10.6.tar.gz) = ade6307fe31a3b8f144898ab9c4f2db965965294f15e313b0080ce7aa8bf3296f6f34912b45926ac8c5e74eaf475eef869072878123d27aa432e955f594a94ab +SHA512 (cli-v20.10.6.tar.gz) = 6b0ed4c756418cd38f9e5d614910a5b4fc3b2bc286f7e69950e031c5c571c705d7b7ce11cb5a7e94814cbb44fd830921a568f30ef30d783ef129c050c999666b SHA512 (de40ad007797e0dcd8b7126f27bb87401d224240.tar.gz) = 6e21fbcc8ab0daf2f2ac407f8d85373d2873d4b1e7d010056e4dd7071183fe1ede9dadf116c520e68a6226d5eb9d5ede383729327630600ed85080c1586bf3bb From e5e773326bf0ffa1bfb4d403529a3893180f91b2 Mon Sep 17 00:00:00 2001 From: Lokesh Mandvekar Date: Tue, 4 May 2021 10:35:30 -0400 Subject: [PATCH 038/163] Conflict with podman-docker The podman-docker package provides the same manpages as docker because of which it conflicts with moby-engine. This leads to tests./check-conflicts-* gating test failures. https://docs.fedoraproject.org/en-US/ci/generic_tests/#_check_conflicts Sample: https://osci-jenkins-1.ci.fedoraproject.org/job/fedora-ci/job/rpmdeplint-pipeline/job/master/18145/testReport/(root)/tests/_check_conflicts_x86_64/ This commit should fix check_conflicts test. Signed-off-by: Lokesh Mandvekar --- moby-engine.spec | 1 + 1 file changed, 1 insertion(+) diff --git a/moby-engine.spec b/moby-engine.spec index 8ed6e7a..5061b50 100644 --- a/moby-engine.spec +++ b/moby-engine.spec @@ -90,6 +90,7 @@ Conflicts: %{origname}-engine-cs Conflicts: %{origname}-ce Conflicts: %{origname}-ce-cli Conflicts: %{origname}-ee +Conflicts: podman-%{origname} # Bundled dependencies Provides: bundled(tini-static) From 77b5b207d2a687685c265c3aa21e756fbffca4ea Mon Sep 17 00:00:00 2001 From: Olivier Lemasle Date: Tue, 4 May 2021 23:07:26 +0200 Subject: [PATCH 039/163] New build + changelog --- moby-engine.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/moby-engine.spec b/moby-engine.spec index 5061b50..e3306ac 100644 --- a/moby-engine.spec +++ b/moby-engine.spec @@ -30,7 +30,7 @@ Name: %{newname}-engine Version: 20.10.6 -Release: 1%{?dist} +Release: 2%{?dist} Summary: The open-source application container engine License: ASL 2.0 # no golang / go-md2man for ppc64 @@ -513,6 +513,9 @@ getent group %{service_name} >/dev/null || groupadd -r %{service_name} || : %{_datadir}/nano/Dockerfile.nanorc %changelog +* Tue May 04 2021 Olivier Lemasle - 20.10.6-2 +- Add conflict with podman-docker + * Tue Apr 20 2021 Olivier Lemasle - 20.10.6-1 - Update to upstream 20.10.6 (#1948605) - Re-bundle moby dependencies to fix gRPC issues with Swarm From 6d566dced22788de5bda5d92bb5bb8ada6db6b86 Mon Sep 17 00:00:00 2001 From: Olivier Lemasle Date: Fri, 16 Jul 2021 12:33:54 +0200 Subject: [PATCH 040/163] Update to upstream 20.10.7 (fixes rhbz#1967390) --- .gitignore | 2 ++ moby-engine.spec | 19 +++++++++++-------- sources | 4 ++-- 3 files changed, 15 insertions(+), 10 deletions(-) diff --git a/.gitignore b/.gitignore index 10cacfc..33344bd 100644 --- a/.gitignore +++ b/.gitignore @@ -17,3 +17,5 @@ /cli-v20.10.5.tar.gz /moby-v20.10.6.tar.gz /cli-v20.10.6.tar.gz +/moby-v20.10.7.tar.gz +/cli-v20.10.7.tar.gz diff --git a/moby-engine.spec b/moby-engine.spec index e3306ac..e8a353d 100644 --- a/moby-engine.spec +++ b/moby-engine.spec @@ -15,12 +15,12 @@ # moby %global git_moby https://github.com/%{newname}/%{newname} -%global commit_moby 8728dd246c3ab53105434eef8ffe997b6fd14dc6 +%global commit_moby b0f5bc36fea9dfb9672e1e9b1278ebab797b9ee0 %global shortcommit_moby %(c=%{commit_moby}; echo ${c:0:7}) # cli %global git_cli https://github.com/%{origname}/cli -%global commit_cli 370c28948e3c12dce3d1df60b6f184990618553f +%global commit_cli f0df35096d5f5e6b559b42c7fde6c65a2909f7c5 %global shortcommit_cli %(c=%{commit_cli}; echo ${c:0:7}) # tini @@ -29,8 +29,8 @@ %global shortcommit_tini %(c=%{commit_tini}; echo ${c:0:7}) Name: %{newname}-engine -Version: 20.10.6 -Release: 2%{?dist} +Version: 20.10.7 +Release: 1%{?dist} Summary: The open-source application container engine License: ASL 2.0 # no golang / go-md2man for ppc64 @@ -229,7 +229,7 @@ Provides: bundled(golang(github.com/docker/go-events)) = e31b211e4f1cd09aa Provides: bundled(golang(github.com/docker/go-metrics)) = b619b3592b65de4f087d9f16863a7e6ff905973c Provides: bundled(golang(github.com/docker/go-units)) = 519db1ee28dcc9fd2474ae59fca29a810482bfb1 Provides: bundled(golang(github.com/docker/libkv)) = 458977154600b9f23984d9f4b82e79570b5ae12b -Provides: bundled(golang(github.com/docker/libnetwork)) = b3507428be5b458cb0e2b4086b13531fb0706e46 +Provides: bundled(golang(github.com/docker/libnetwork)) = 64b7a4574d1426139437d20e81c0b6d391130ec8 Provides: bundled(golang(github.com/docker/libtrust)) = 9cbd2a1374f46905c68a4eb3694a130610adc62a Provides: bundled(golang(github.com/docker/swarmkit)) = 17d8d4e4d8bdec33d386e6362d3537fa9493ba00 Provides: bundled(golang(github.com/fernet/fernet-go)) = 9eac43b88a5efb8651d24de9b68e87567e029736 @@ -264,16 +264,16 @@ Provides: bundled(golang(github.com/hashicorp/memberlist)) = 3d8438da9589e Provides: bundled(golang(github.com/hashicorp/serf)) = 598c54895cc5a7b1a24a398d635e8c0ea0959870 Provides: bundled(golang(github.com/imdario/mergo)) = 1afb36080aec31e0d1528973ebe6721b191b0369 Provides: bundled(golang(github.com/inconshreveable/mousetrap)) = 76626ae9c91c4f2a10f34cad8ce83ea42c93bb75 -Provides: bundled(golang(github.com/ishidawataru/sctp)) = 6e2cb1366111dcf547c13531e3a263a067715847 +Provides: bundled(golang(github.com/ishidawataru/sctp)) = f2269e66cdee387bd321445d5d300893449805be Provides: bundled(golang(github.com/jmespath/go-jmespath)) = 2d053f87d1d7f9f48196ae04cf3daea4273d207d 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)) = 9dcb42f100215f8d375b4a9265e5bba009217a85 +Provides: bundled(golang(github.com/Microsoft/hcsshim)) = 89a9a3b524264d34985f1d48793ab2b2d2e430f6 Provides: bundled(golang(github.com/Microsoft/opengcs)) = a10967154e143a36014584a6f664344e3bb0aa64 Provides: bundled(golang(github.com/miekg/dns)) = 6c0c4e6581f8e173cc562c8b3363ab984e4ae071 Provides: bundled(golang(github.com/mistifyio/go-zfs)) = f784269be439d704d3dfa1906f45dd848fed2beb Provides: bundled(golang(github.com/mitchellh/hashstructure)) = a38c50148365edc8df43c1580c48fb2b3a1e9cd7 -Provides: bundled(golang(github.com/moby/buildkit)) = 9065b18ba4633c75862befca8188de4338d9f94a +Provides: bundled(golang(github.com/moby/buildkit)) = 244e8cde639f71a05a1a2e0670bd88e0206ce55c Provides: bundled(golang(github.com/moby/ipvs)) = 4566ccea0e08d68e9614c3e7a64a23b850c4bb35 Provides: bundled(golang(github.com/moby/locker)) = 281af2d563954745bea9d1487c965f24d30742fe Provides: bundled(golang(github.com/moby/sys)) = 1bc8673b57550ddf85262eb0fed0aac651a37dab @@ -513,6 +513,9 @@ getent group %{service_name} >/dev/null || groupadd -r %{service_name} || : %{_datadir}/nano/Dockerfile.nanorc %changelog +* Fri Jul 16 2021 Olivier Lemasle - 20.10.7-1 +- Update to upstream 20.10.7 (fixes rhbz#1967390) + * Tue May 04 2021 Olivier Lemasle - 20.10.6-2 - Add conflict with podman-docker diff --git a/sources b/sources index d39b506..01e911a 100644 --- a/sources +++ b/sources @@ -1,3 +1,3 @@ -SHA512 (moby-v20.10.6.tar.gz) = ade6307fe31a3b8f144898ab9c4f2db965965294f15e313b0080ce7aa8bf3296f6f34912b45926ac8c5e74eaf475eef869072878123d27aa432e955f594a94ab -SHA512 (cli-v20.10.6.tar.gz) = 6b0ed4c756418cd38f9e5d614910a5b4fc3b2bc286f7e69950e031c5c571c705d7b7ce11cb5a7e94814cbb44fd830921a568f30ef30d783ef129c050c999666b +SHA512 (moby-v20.10.7.tar.gz) = 2341faa3ebb903d74fa434712fce45e7acf0423710b97cdca11e3999db2819c4385d9a7fb3850925592f20f02c6261edbade6c9d6a2fefbc32f05a6b44ec3073 +SHA512 (cli-v20.10.7.tar.gz) = 4523ae70cb27d848da119070171af2eb84e974ac39d70be4feee105e37c949487c7f72a9bc30c32ce71bffb0787e27b7b9194ce5a8aeae57bdfeb3f2d730010f SHA512 (de40ad007797e0dcd8b7126f27bb87401d224240.tar.gz) = 6e21fbcc8ab0daf2f2ac407f8d85373d2873d4b1e7d010056e4dd7071183fe1ede9dadf116c520e68a6226d5eb9d5ede383729327630600ed85080c1586bf3bb From a3f1c82193be40cfb45cf34f963d61ad722e1405 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 22 Jul 2021 15:09:33 +0000 Subject: [PATCH 041/163] - Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- moby-engine.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/moby-engine.spec b/moby-engine.spec index e8a353d..01fc4bd 100644 --- a/moby-engine.spec +++ b/moby-engine.spec @@ -30,7 +30,7 @@ Name: %{newname}-engine Version: 20.10.7 -Release: 1%{?dist} +Release: 2%{?dist} Summary: The open-source application container engine License: ASL 2.0 # no golang / go-md2man for ppc64 @@ -513,6 +513,9 @@ getent group %{service_name} >/dev/null || groupadd -r %{service_name} || : %{_datadir}/nano/Dockerfile.nanorc %changelog +* Thu Jul 22 2021 Fedora Release Engineering - 20.10.7-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild + * Fri Jul 16 2021 Olivier Lemasle - 20.10.7-1 - Update to upstream 20.10.7 (fixes rhbz#1967390) From 8cf7eb1912c1f176c6ad59f6a6e3ed6295fdba3d Mon Sep 17 00:00:00 2001 From: Dusty Mabe Date: Thu, 22 Jul 2021 01:59:53 +0000 Subject: [PATCH 042/163] Remove `Requires(post)` on firewalld-filesystem. The firewalld zone was dropped in 37290cc. The `%{firewalld_reload}` macro (provided by firewalld-filesystem is used in the macro but it gets encoded in the RPM at build time so it only needs to be a buildrequires, which it is already. Also I'll note that the macro properly handles firewalld not being installed: ``` [core@localhost ~]$ rpm -E '%{firewalld_reload}' test -f /usr/bin/firewall-cmd && firewall-cmd --reload --quiet || : ``` So we should be good to go. --- moby-engine.spec | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/moby-engine.spec b/moby-engine.spec index 01fc4bd..030ec64 100644 --- a/moby-engine.spec +++ b/moby-engine.spec @@ -30,7 +30,7 @@ Name: %{newname}-engine Version: 20.10.7 -Release: 2%{?dist} +Release: 3%{?dist} Summary: The open-source application container engine License: ASL 2.0 # no golang / go-md2man for ppc64 @@ -69,8 +69,6 @@ Requires: pigz Requires: runc Requires: containerd -Requires(post): firewalld-filesystem - # Resolves: rhbz#1165615 Requires: device-mapper-libs >= 1.02.90-1 @@ -513,6 +511,9 @@ getent group %{service_name} >/dev/null || groupadd -r %{service_name} || : %{_datadir}/nano/Dockerfile.nanorc %changelog +* Sun Aug 15 2021 Dusty Mabe - 20.10.7-3 +- Remove `Requires(post)` on firewalld-filesystem. + * Thu Jul 22 2021 Fedora Release Engineering - 20.10.7-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild From ec7f551035f0052178e2cb0ada0fb62f43aa1330 Mon Sep 17 00:00:00 2001 From: Olivier Lemasle Date: Sun, 15 Aug 2021 23:38:38 +0200 Subject: [PATCH 043/163] Update to upstream 20.10.8 (fixes rhbz#1990148) Fix seccomp support (fixes rhbz#1986092) --- .gitignore | 2 ++ moby-engine.spec | 34 +++++++++++++++++++--------------- sources | 4 ++-- 3 files changed, 23 insertions(+), 17 deletions(-) diff --git a/.gitignore b/.gitignore index 33344bd..c7f8f51 100644 --- a/.gitignore +++ b/.gitignore @@ -19,3 +19,5 @@ /cli-v20.10.6.tar.gz /moby-v20.10.7.tar.gz /cli-v20.10.7.tar.gz +/cli-v20.10.8.tar.gz +/moby-v20.10.8.tar.gz diff --git a/moby-engine.spec b/moby-engine.spec index 030ec64..6401b2e 100644 --- a/moby-engine.spec +++ b/moby-engine.spec @@ -15,12 +15,12 @@ # moby %global git_moby https://github.com/%{newname}/%{newname} -%global commit_moby b0f5bc36fea9dfb9672e1e9b1278ebab797b9ee0 +%global commit_moby 75249d88bc107a122b503f6a50e89c994331867c %global shortcommit_moby %(c=%{commit_moby}; echo ${c:0:7}) # cli %global git_cli https://github.com/%{origname}/cli -%global commit_cli f0df35096d5f5e6b559b42c7fde6c65a2909f7c5 +%global commit_cli 3967b7d28e15a020e4ee344283128ead633b3e0c %global shortcommit_cli %(c=%{commit_cli}; echo ${c:0:7}) # tini @@ -29,8 +29,8 @@ %global shortcommit_tini %(c=%{commit_tini}; echo ${c:0:7}) Name: %{newname}-engine -Version: 20.10.7 -Release: 3%{?dist} +Version: 20.10.8 +Release: 1%{?dist} Summary: The open-source application container engine License: ASL 2.0 # no golang / go-md2man for ppc64 @@ -96,7 +96,7 @@ Provides: bundled(golang(github.com/docker/docker)) 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/Azure/go-ansiterm)) = d6e3b3328b783f23731bc4d058875b0371ff8109 +Provides: bundled(golang(github.com/Azure/go-ansiterm)) = d185dfc1b5a126116ea5a19e148e29d16b4574c9 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 @@ -105,19 +105,19 @@ Provides: bundled(golang(github.com/containerd/containerd)) = 0edc412565dc 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/cpuguy83/go-md2man/v2)) = b1ec32e02fe539480dc03e3bf381c20066e7c6cc 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/docker)) = b0f5bc36fea9dfb9672e1e9b1278ebab797b9ee0 +Provides: bundled(golang(github.com/docker/docker-credential-helpers)) = fc9290adbcf1594e78910e2f0334090eaee0e1ee 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/docker/swarmkit)) = 17d8d4e4d8bdec33d386e6362d3537fa9493ba00 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 @@ -146,7 +146,7 @@ Provides: bundled(golang(github.com/miekg/pkcs11)) = 210dc1e16747c5ba98a03 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/moby/term)) = 3f7ff695adc6a35abc925370dd0a4dafb48ec64d 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 @@ -159,8 +159,7 @@ Provides: bundled(golang(github.com/prometheus/client_golang)) = 6edbbd9e5 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/russross/blackfriday/v2)) = 4c9bf9512682b995722660a4196c0013228e2049 Provides: bundled(golang(github.com/sirupsen/logrus)) = 6699a89a232f3db797f2e280639854bbc4b89725 Provides: bundled(golang(github.com/spf13/cobra)) = 86f8bfd7fef868a174e1b606783bd7f5c82ddf8f Provides: bundled(golang(github.com/spf13/pflag)) = 2e9d26c8c37aae03e3f9d4e90b7116f5accb7cab @@ -229,7 +228,7 @@ Provides: bundled(golang(github.com/docker/go-units)) = 519db1ee28dcc9fd24 Provides: bundled(golang(github.com/docker/libkv)) = 458977154600b9f23984d9f4b82e79570b5ae12b Provides: bundled(golang(github.com/docker/libnetwork)) = 64b7a4574d1426139437d20e81c0b6d391130ec8 Provides: bundled(golang(github.com/docker/libtrust)) = 9cbd2a1374f46905c68a4eb3694a130610adc62a -Provides: bundled(golang(github.com/docker/swarmkit)) = 17d8d4e4d8bdec33d386e6362d3537fa9493ba00 +Provides: bundled(golang(github.com/docker/swarmkit)) = c9afb5fd44bb419bae719f400f31671712bcb99e Provides: bundled(golang(github.com/fernet/fernet-go)) = 9eac43b88a5efb8651d24de9b68e87567e029736 Provides: bundled(golang(github.com/fluent/fluent-logger-golang)) = 7a6c9dcd7f14c2ed5d8c55c11b894e5455ee311b Provides: bundled(golang(github.com/fsnotify/fsnotify)) = 45d7d09e39ef4ac08d493309fa031790c15bfe8a @@ -266,7 +265,7 @@ Provides: bundled(golang(github.com/ishidawataru/sctp)) = f2269e66cdee387b Provides: bundled(golang(github.com/jmespath/go-jmespath)) = 2d053f87d1d7f9f48196ae04cf3daea4273d207d 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)) = 89a9a3b524264d34985f1d48793ab2b2d2e430f6 +Provides: bundled(golang(github.com/Microsoft/hcsshim)) = 64a2b71405dacf76c95600f4c756a991ad09cf7c Provides: bundled(golang(github.com/Microsoft/opengcs)) = a10967154e143a36014584a6f664344e3bb0aa64 Provides: bundled(golang(github.com/miekg/dns)) = 6c0c4e6581f8e173cc562c8b3363ab984e4ae071 Provides: bundled(golang(github.com/mistifyio/go-zfs)) = f784269be439d704d3dfa1906f45dd848fed2beb @@ -320,6 +319,7 @@ Provides: bundled(golang(google.golang.org/grpc)) = f495f5b15ae7ccda3b38c5 Provides: bundled(golang(go.opencensus.io)) = d835ff86be02193d324330acdb7d65546b05f814 Provides: bundled(golang(gotest.tools/v3)) = 568bc57cc5c19a2ef85e5749870b49a4cc2ab54d + %description Docker is an open source project to build, ship and run any application as a lightweight container. @@ -400,7 +400,7 @@ mkdir -p _build # 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" + export DOCKER_BUILDTAGS="seccomp selinux journald" # %%gobuild -o _build/%%{service_name}d github.com/%%{service_name}/%%{service_name}/cmd/dockerd VERSION=%{version} DOCKER_GITCOMMIT=%{shortcommit_moby} bash -x hack/make.sh dynbinary mv bundles/dynbinary-daemon/dockerd-%{version} _build/dockerd @@ -511,6 +511,10 @@ getent group %{service_name} >/dev/null || groupadd -r %{service_name} || : %{_datadir}/nano/Dockerfile.nanorc %changelog +* Sun Aug 15 2021 Olivier Lemasle - 20.10.8-1 +- Update to upstream 20.10.8 (fixes rhbz#1990148) +- Fix seccomp support (fixes rhbz#1986092) + * Sun Aug 15 2021 Dusty Mabe - 20.10.7-3 - Remove `Requires(post)` on firewalld-filesystem. diff --git a/sources b/sources index 01e911a..9dea826 100644 --- a/sources +++ b/sources @@ -1,3 +1,3 @@ -SHA512 (moby-v20.10.7.tar.gz) = 2341faa3ebb903d74fa434712fce45e7acf0423710b97cdca11e3999db2819c4385d9a7fb3850925592f20f02c6261edbade6c9d6a2fefbc32f05a6b44ec3073 -SHA512 (cli-v20.10.7.tar.gz) = 4523ae70cb27d848da119070171af2eb84e974ac39d70be4feee105e37c949487c7f72a9bc30c32ce71bffb0787e27b7b9194ce5a8aeae57bdfeb3f2d730010f +SHA512 (cli-v20.10.8.tar.gz) = 60e9e623180d3cafd8bd6458d02574274871f94e88a0fa461e2200520717e837371a1b5d7fab6c9c4591e64807ab6f560e0756a9cfb1c1c8c9624b1f653346d0 +SHA512 (moby-v20.10.8.tar.gz) = 17c0519c8938227c578e5fe37689dd5a362b9673fabe06f98145b6fd5ae99e099a304c5706a84df30a2810855987fd694ac9cae7574023710fd1d99b0ca1aaf8 SHA512 (de40ad007797e0dcd8b7126f27bb87401d224240.tar.gz) = 6e21fbcc8ab0daf2f2ac407f8d85373d2873d4b1e7d010056e4dd7071183fe1ede9dadf116c520e68a6226d5eb9d5ede383729327630600ed85080c1586bf3bb From 43e5a693710613f72a4517b6620fa3efafefa943 Mon Sep 17 00:00:00 2001 From: Maxwell G Date: Fri, 8 Oct 2021 22:08:17 -0500 Subject: [PATCH 044/163] Update to 20.10.9 (fixes rhbz#2010508) --- .gitignore | 2 ++ moby-engine.spec | 9 ++++++--- sources | 4 ++-- 3 files changed, 10 insertions(+), 5 deletions(-) diff --git a/.gitignore b/.gitignore index c7f8f51..ee75fd4 100644 --- a/.gitignore +++ b/.gitignore @@ -21,3 +21,5 @@ /cli-v20.10.7.tar.gz /cli-v20.10.8.tar.gz /moby-v20.10.8.tar.gz +/cli-v20.10.9.tar.gz +/moby-v20.10.9.tar.gz diff --git a/moby-engine.spec b/moby-engine.spec index 6401b2e..74dc6b0 100644 --- a/moby-engine.spec +++ b/moby-engine.spec @@ -15,12 +15,12 @@ # moby %global git_moby https://github.com/%{newname}/%{newname} -%global commit_moby 75249d88bc107a122b503f6a50e89c994331867c +%global commit_moby 79ea9d3080181d755855d5924d0f4f116faa9463 %global shortcommit_moby %(c=%{commit_moby}; echo ${c:0:7}) # cli %global git_cli https://github.com/%{origname}/cli -%global commit_cli 3967b7d28e15a020e4ee344283128ead633b3e0c +%global commit_cli c2ea9bc90bacf19bdbe37fd13eec8772432aca99 %global shortcommit_cli %(c=%{commit_cli}; echo ${c:0:7}) # tini @@ -29,7 +29,7 @@ %global shortcommit_tini %(c=%{commit_tini}; echo ${c:0:7}) Name: %{newname}-engine -Version: 20.10.8 +Version: 20.10.9 Release: 1%{?dist} Summary: The open-source application container engine License: ASL 2.0 @@ -511,6 +511,9 @@ getent group %{service_name} >/dev/null || groupadd -r %{service_name} || : %{_datadir}/nano/Dockerfile.nanorc %changelog +* Fri Oct 08 2021 Maxwell G - 20.10.9-1 +- Update to 20.10.9 (fixes rhbz#2010508) + * Sun Aug 15 2021 Olivier Lemasle - 20.10.8-1 - Update to upstream 20.10.8 (fixes rhbz#1990148) - Fix seccomp support (fixes rhbz#1986092) diff --git a/sources b/sources index 9dea826..4817765 100644 --- a/sources +++ b/sources @@ -1,3 +1,3 @@ -SHA512 (cli-v20.10.8.tar.gz) = 60e9e623180d3cafd8bd6458d02574274871f94e88a0fa461e2200520717e837371a1b5d7fab6c9c4591e64807ab6f560e0756a9cfb1c1c8c9624b1f653346d0 -SHA512 (moby-v20.10.8.tar.gz) = 17c0519c8938227c578e5fe37689dd5a362b9673fabe06f98145b6fd5ae99e099a304c5706a84df30a2810855987fd694ac9cae7574023710fd1d99b0ca1aaf8 +SHA512 (cli-v20.10.9.tar.gz) = 0a9bd36c139bb5e1cd4a975913aa5429ffce8c746d2104aa2a54d937c67073ddaa2a8a5e93d71d2d435459af58168de0e7e3a44fd452da535f3995738da206df SHA512 (de40ad007797e0dcd8b7126f27bb87401d224240.tar.gz) = 6e21fbcc8ab0daf2f2ac407f8d85373d2873d4b1e7d010056e4dd7071183fe1ede9dadf116c520e68a6226d5eb9d5ede383729327630600ed85080c1586bf3bb +SHA512 (moby-v20.10.9.tar.gz) = e4ae9e37633c821892e929e7a5f9dab652fe17f348a24cd37778bc4bfc33d99cdb347e2f575966364a37664dcfa83d1500f2bff7d0b0398a890f2039155a0c0c From 1bcb63bf878cb0a8f0316ba344186433a9ce857d Mon Sep 17 00:00:00 2001 From: Maxwell G Date: Fri, 8 Oct 2021 22:08:44 -0500 Subject: [PATCH 045/163] Patch seccomp policy to fix clone3() issue This commit applies https://github.com/moby/moby/pull/42836 patch to fix Docker seccomp policy blocking clone3(). This fixes rhbz#2011523 and rhbz#1988199. --- ...for-clone3-syscall-in-default-policy.patch | 189 ++++++++++++++++++ moby-engine.spec | 7 +- 2 files changed, 195 insertions(+), 1 deletion(-) create mode 100644 0001-seccomp-add-support-for-clone3-syscall-in-default-policy.patch diff --git a/0001-seccomp-add-support-for-clone3-syscall-in-default-policy.patch b/0001-seccomp-add-support-for-clone3-syscall-in-default-policy.patch new file mode 100644 index 0000000..9d98430 --- /dev/null +++ b/0001-seccomp-add-support-for-clone3-syscall-in-default-policy.patch @@ -0,0 +1,189 @@ +From 567c01f6d157cf6c1f39d68e9ca62e76d7834558 Mon Sep 17 00:00:00 2001 +From: Tianon Gravi +Date: Thu, 9 Sep 2021 11:31:30 -0700 +Subject: [PATCH] seccomp: add support for "clone3" syscall in default policy +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +This is a backport of 9f6b562dd12ef7b1f9e2f8e6f2ab6477790a6594, adapted to avoid the refactoring that happened in d92739713c633c155c0f3d8065c8278b1d8a44e7. + +Original commit message is as follows: + +> If no seccomp policy is requested, then the built-in default policy in +> dockerd applies. This has no rule for "clone3" defined, nor any default +> errno defined. So when runc receives the config it attempts to determine +> a default errno, using logic defined in its commit: +> +> opencontainers/runc@7a8d716 +> +> As explained in the above commit message, runc uses a heuristic to +> decide which errno to return by default: +> +> [quote] +> The solution applied here is to prepend a "stub" filter which returns +> -ENOSYS if the requested syscall has a larger syscall number than any +> syscall mentioned in the filter. The reason for this specific rule is +> that syscall numbers are (roughly) allocated sequentially and thus newer +> syscalls will (usually) have a larger syscall number -- thus causing our +> filters to produce -ENOSYS if the filter was written before the syscall +> existed. +> [/quote] +> +> Unfortunately clone3 appears to one of the edge cases that does not +> result in use of ENOSYS, instead ending up with the historical EPERM +> errno. +> +> Latest glibc (2.33.9000, in Fedora 35 rawhide) will attempt to use +> clone3 by default. If it sees ENOSYS then it will automatically +> fallback to using clone. Any other errno is treated as a fatal +> error. Thus when docker seccomp policy triggers EPERM from clone3, +> no fallback occurs and programs are thus unable to spawn threads. +> +> The clone3 syscall is much more complicated than clone, most notably its +> flags are not exposed as a directly argument any more. Instead they are +> hidden inside a struct. This means that seccomp filters are unable to +> apply policy based on values seen in flags. Thus we can't directly +> replicate the current "clone" filtering for "clone3". We can at least +> ensure "clone3" returns ENOSYS errno, to trigger fallback to "clone" +> at which point we can filter on flags. + +Signed-off-by: Tianon Gravi +Co-authored-by: Daniel P. Berrangé +--- + profiles/seccomp/default.json | 16 ++++++++++++++++ + profiles/seccomp/default_linux.go | 13 +++++++++++++ + profiles/seccomp/seccomp.go | 1 + + profiles/seccomp/seccomp_linux.go | 28 ++++++++++++---------------- + 4 files changed, 42 insertions(+), 16 deletions(-) + +diff --git a/profiles/seccomp/default.json b/profiles/seccomp/default.json +index 4213799ddb5..ee5e04f781a 100644 +--- a/profiles/seccomp/default.json ++++ b/profiles/seccomp/default.json +@@ -591,6 +591,7 @@ + "names": [ + "bpf", + "clone", ++ "clone3", + "fanotify_init", + "fsconfig", + "fsmount", +@@ -670,6 +671,21 @@ + ] + } + }, ++ { ++ "names": [ ++ "clone3" ++ ], ++ "action": "SCMP_ACT_ERRNO", ++ "errnoRet": 38, ++ "args": [], ++ "comment": "", ++ "includes": {}, ++ "excludes": { ++ "caps": [ ++ "CAP_SYS_ADMIN" ++ ] ++ } ++ }, + { + "names": [ + "reboot" +diff --git a/profiles/seccomp/default_linux.go b/profiles/seccomp/default_linux.go +index 879eb88c64f..fb593f336f7 100644 +--- a/profiles/seccomp/default_linux.go ++++ b/profiles/seccomp/default_linux.go +@@ -42,6 +42,7 @@ func arches() []Architecture { + + // DefaultProfile defines the allowed syscalls for the default seccomp profile. + func DefaultProfile() *Seccomp { ++ nosys := uint(unix.ENOSYS) + syscalls := []*Syscall{ + { + Names: []string{ +@@ -522,6 +523,7 @@ func DefaultProfile() *Seccomp { + Names: []string{ + "bpf", + "clone", ++ "clone3", + "fanotify_init", + "fsconfig", + "fsmount", +@@ -587,6 +589,17 @@ func DefaultProfile() *Seccomp { + Caps: []string{"CAP_SYS_ADMIN"}, + }, + }, ++ { ++ Names: []string{ ++ "clone3", ++ }, ++ Action: specs.ActErrno, ++ ErrnoRet: &nosys, ++ Args: []*specs.LinuxSeccompArg{}, ++ Excludes: Filter{ ++ Caps: []string{"CAP_SYS_ADMIN"}, ++ }, ++ }, + { + Names: []string{ + "reboot", +diff --git a/profiles/seccomp/seccomp.go b/profiles/seccomp/seccomp.go +index d2a21cddc4b..9edec72db54 100644 +--- a/profiles/seccomp/seccomp.go ++++ b/profiles/seccomp/seccomp.go +@@ -45,6 +45,7 @@ type Syscall struct { + Name string `json:"name,omitempty"` + Names []string `json:"names,omitempty"` + Action specs.LinuxSeccompAction `json:"action"` ++ ErrnoRet *uint `json:"errnoRet,omitempty"` + Args []*specs.LinuxSeccompArg `json:"args"` + Comment string `json:"comment"` + Includes Filter `json:"includes"` +diff --git a/profiles/seccomp/seccomp_linux.go b/profiles/seccomp/seccomp_linux.go +index 566f173acd3..e35e242cd50 100644 +--- a/profiles/seccomp/seccomp_linux.go ++++ b/profiles/seccomp/seccomp_linux.go +@@ -150,29 +150,25 @@ Loop: + } + } + ++ newCall := specs.LinuxSyscall{ ++ Action: call.Action, ++ ErrnoRet: call.ErrnoRet, ++ } + if call.Name != "" && len(call.Names) != 0 { + return nil, errors.New("'name' and 'names' were specified in the seccomp profile, use either 'name' or 'names'") + } +- + if call.Name != "" { +- newConfig.Syscalls = append(newConfig.Syscalls, createSpecsSyscall([]string{call.Name}, call.Action, call.Args)) ++ newCall.Names = []string{call.Name} + } else { +- newConfig.Syscalls = append(newConfig.Syscalls, createSpecsSyscall(call.Names, call.Action, call.Args)) ++ newCall.Names = call.Names ++ } ++ // Loop through all the arguments of the syscall and convert them ++ for _, arg := range call.Args { ++ newCall.Args = append(newCall.Args, *arg) + } +- } +- +- return newConfig, nil +-} + +-func createSpecsSyscall(names []string, action specs.LinuxSeccompAction, args []*specs.LinuxSeccompArg) specs.LinuxSyscall { +- newCall := specs.LinuxSyscall{ +- Names: names, +- Action: action, ++ newConfig.Syscalls = append(newConfig.Syscalls, newCall) + } + +- // Loop through all the arguments of the syscall and convert them +- for _, arg := range args { +- newCall.Args = append(newCall.Args, *arg) +- } +- return newCall ++ return newConfig, nil + } diff --git a/moby-engine.spec b/moby-engine.spec index 74dc6b0..bf7c348 100644 --- a/moby-engine.spec +++ b/moby-engine.spec @@ -40,6 +40,10 @@ 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 +# Apply https://github.com/moby/moby/pull/42836 patch to fix Docker seccomp +# policy blocking clone3(). Also see rhbz#2011523 and rhbz#1988199. +# This patch should be part of the next release, so we can remove it then. +Patch0: 0001-seccomp-add-support-for-clone3-syscall-in-default-policy.patch URL: https://www.%{origname}.com # BuildRequires: golang-github-docker-devel @@ -362,7 +366,7 @@ Requires: nano This package installs %{summary}. %prep -%autosetup -n moby-%{version} +%autosetup -p1 -n moby-%{version} # untar cli tar zxf %{SOURCE1} @@ -513,6 +517,7 @@ getent group %{service_name} >/dev/null || groupadd -r %{service_name} || : %changelog * Fri Oct 08 2021 Maxwell G - 20.10.9-1 - Update to 20.10.9 (fixes rhbz#2010508) +- Patch seccomp policy to fix clone3() issue (fixes rhbz#2011523 and rhbz#1988199) * Sun Aug 15 2021 Olivier Lemasle - 20.10.8-1 - Update to upstream 20.10.8 (fixes rhbz#1990148) From 2594e06f6c94dc98e68a092451e664ef693b9a82 Mon Sep 17 00:00:00 2001 From: Maxwell G Date: Fri, 29 Oct 2021 18:32:56 -0500 Subject: [PATCH 046/163] Update to 20.10.10 (fixes rhbz#2015385) - Update to 20.10.10 (fixes rhbz#2015385) - Update virtual provides Signed-off-by: Maxwell G --- .gitignore | 2 + ...for-clone3-syscall-in-default-policy.patch | 189 ------------------ moby-engine.spec | 18 +- sources | 4 +- 4 files changed, 13 insertions(+), 200 deletions(-) delete mode 100644 0001-seccomp-add-support-for-clone3-syscall-in-default-policy.patch diff --git a/.gitignore b/.gitignore index ee75fd4..9321e58 100644 --- a/.gitignore +++ b/.gitignore @@ -23,3 +23,5 @@ /moby-v20.10.8.tar.gz /cli-v20.10.9.tar.gz /moby-v20.10.9.tar.gz +/cli-v20.10.10.tar.gz +moby-v20.10.10.tar.gz diff --git a/0001-seccomp-add-support-for-clone3-syscall-in-default-policy.patch b/0001-seccomp-add-support-for-clone3-syscall-in-default-policy.patch deleted file mode 100644 index 9d98430..0000000 --- a/0001-seccomp-add-support-for-clone3-syscall-in-default-policy.patch +++ /dev/null @@ -1,189 +0,0 @@ -From 567c01f6d157cf6c1f39d68e9ca62e76d7834558 Mon Sep 17 00:00:00 2001 -From: Tianon Gravi -Date: Thu, 9 Sep 2021 11:31:30 -0700 -Subject: [PATCH] seccomp: add support for "clone3" syscall in default policy -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -This is a backport of 9f6b562dd12ef7b1f9e2f8e6f2ab6477790a6594, adapted to avoid the refactoring that happened in d92739713c633c155c0f3d8065c8278b1d8a44e7. - -Original commit message is as follows: - -> If no seccomp policy is requested, then the built-in default policy in -> dockerd applies. This has no rule for "clone3" defined, nor any default -> errno defined. So when runc receives the config it attempts to determine -> a default errno, using logic defined in its commit: -> -> opencontainers/runc@7a8d716 -> -> As explained in the above commit message, runc uses a heuristic to -> decide which errno to return by default: -> -> [quote] -> The solution applied here is to prepend a "stub" filter which returns -> -ENOSYS if the requested syscall has a larger syscall number than any -> syscall mentioned in the filter. The reason for this specific rule is -> that syscall numbers are (roughly) allocated sequentially and thus newer -> syscalls will (usually) have a larger syscall number -- thus causing our -> filters to produce -ENOSYS if the filter was written before the syscall -> existed. -> [/quote] -> -> Unfortunately clone3 appears to one of the edge cases that does not -> result in use of ENOSYS, instead ending up with the historical EPERM -> errno. -> -> Latest glibc (2.33.9000, in Fedora 35 rawhide) will attempt to use -> clone3 by default. If it sees ENOSYS then it will automatically -> fallback to using clone. Any other errno is treated as a fatal -> error. Thus when docker seccomp policy triggers EPERM from clone3, -> no fallback occurs and programs are thus unable to spawn threads. -> -> The clone3 syscall is much more complicated than clone, most notably its -> flags are not exposed as a directly argument any more. Instead they are -> hidden inside a struct. This means that seccomp filters are unable to -> apply policy based on values seen in flags. Thus we can't directly -> replicate the current "clone" filtering for "clone3". We can at least -> ensure "clone3" returns ENOSYS errno, to trigger fallback to "clone" -> at which point we can filter on flags. - -Signed-off-by: Tianon Gravi -Co-authored-by: Daniel P. Berrangé ---- - profiles/seccomp/default.json | 16 ++++++++++++++++ - profiles/seccomp/default_linux.go | 13 +++++++++++++ - profiles/seccomp/seccomp.go | 1 + - profiles/seccomp/seccomp_linux.go | 28 ++++++++++++---------------- - 4 files changed, 42 insertions(+), 16 deletions(-) - -diff --git a/profiles/seccomp/default.json b/profiles/seccomp/default.json -index 4213799ddb5..ee5e04f781a 100644 ---- a/profiles/seccomp/default.json -+++ b/profiles/seccomp/default.json -@@ -591,6 +591,7 @@ - "names": [ - "bpf", - "clone", -+ "clone3", - "fanotify_init", - "fsconfig", - "fsmount", -@@ -670,6 +671,21 @@ - ] - } - }, -+ { -+ "names": [ -+ "clone3" -+ ], -+ "action": "SCMP_ACT_ERRNO", -+ "errnoRet": 38, -+ "args": [], -+ "comment": "", -+ "includes": {}, -+ "excludes": { -+ "caps": [ -+ "CAP_SYS_ADMIN" -+ ] -+ } -+ }, - { - "names": [ - "reboot" -diff --git a/profiles/seccomp/default_linux.go b/profiles/seccomp/default_linux.go -index 879eb88c64f..fb593f336f7 100644 ---- a/profiles/seccomp/default_linux.go -+++ b/profiles/seccomp/default_linux.go -@@ -42,6 +42,7 @@ func arches() []Architecture { - - // DefaultProfile defines the allowed syscalls for the default seccomp profile. - func DefaultProfile() *Seccomp { -+ nosys := uint(unix.ENOSYS) - syscalls := []*Syscall{ - { - Names: []string{ -@@ -522,6 +523,7 @@ func DefaultProfile() *Seccomp { - Names: []string{ - "bpf", - "clone", -+ "clone3", - "fanotify_init", - "fsconfig", - "fsmount", -@@ -587,6 +589,17 @@ func DefaultProfile() *Seccomp { - Caps: []string{"CAP_SYS_ADMIN"}, - }, - }, -+ { -+ Names: []string{ -+ "clone3", -+ }, -+ Action: specs.ActErrno, -+ ErrnoRet: &nosys, -+ Args: []*specs.LinuxSeccompArg{}, -+ Excludes: Filter{ -+ Caps: []string{"CAP_SYS_ADMIN"}, -+ }, -+ }, - { - Names: []string{ - "reboot", -diff --git a/profiles/seccomp/seccomp.go b/profiles/seccomp/seccomp.go -index d2a21cddc4b..9edec72db54 100644 ---- a/profiles/seccomp/seccomp.go -+++ b/profiles/seccomp/seccomp.go -@@ -45,6 +45,7 @@ type Syscall struct { - Name string `json:"name,omitempty"` - Names []string `json:"names,omitempty"` - Action specs.LinuxSeccompAction `json:"action"` -+ ErrnoRet *uint `json:"errnoRet,omitempty"` - Args []*specs.LinuxSeccompArg `json:"args"` - Comment string `json:"comment"` - Includes Filter `json:"includes"` -diff --git a/profiles/seccomp/seccomp_linux.go b/profiles/seccomp/seccomp_linux.go -index 566f173acd3..e35e242cd50 100644 ---- a/profiles/seccomp/seccomp_linux.go -+++ b/profiles/seccomp/seccomp_linux.go -@@ -150,29 +150,25 @@ Loop: - } - } - -+ newCall := specs.LinuxSyscall{ -+ Action: call.Action, -+ ErrnoRet: call.ErrnoRet, -+ } - if call.Name != "" && len(call.Names) != 0 { - return nil, errors.New("'name' and 'names' were specified in the seccomp profile, use either 'name' or 'names'") - } -- - if call.Name != "" { -- newConfig.Syscalls = append(newConfig.Syscalls, createSpecsSyscall([]string{call.Name}, call.Action, call.Args)) -+ newCall.Names = []string{call.Name} - } else { -- newConfig.Syscalls = append(newConfig.Syscalls, createSpecsSyscall(call.Names, call.Action, call.Args)) -+ newCall.Names = call.Names -+ } -+ // Loop through all the arguments of the syscall and convert them -+ for _, arg := range call.Args { -+ newCall.Args = append(newCall.Args, *arg) - } -- } -- -- return newConfig, nil --} - --func createSpecsSyscall(names []string, action specs.LinuxSeccompAction, args []*specs.LinuxSeccompArg) specs.LinuxSyscall { -- newCall := specs.LinuxSyscall{ -- Names: names, -- Action: action, -+ newConfig.Syscalls = append(newConfig.Syscalls, newCall) - } - -- // Loop through all the arguments of the syscall and convert them -- for _, arg := range args { -- newCall.Args = append(newCall.Args, *arg) -- } -- return newCall -+ return newConfig, nil - } diff --git a/moby-engine.spec b/moby-engine.spec index bf7c348..6910a1a 100644 --- a/moby-engine.spec +++ b/moby-engine.spec @@ -15,12 +15,12 @@ # moby %global git_moby https://github.com/%{newname}/%{newname} -%global commit_moby 79ea9d3080181d755855d5924d0f4f116faa9463 +%global commit_moby e2f740de442bac52b280bc485a3ca5b31567d938 %global shortcommit_moby %(c=%{commit_moby}; echo ${c:0:7}) # cli %global git_cli https://github.com/%{origname}/cli -%global commit_cli c2ea9bc90bacf19bdbe37fd13eec8772432aca99 +%global commit_cli 485636f4b90ed5a91a1f403e65ffced469c641a %global shortcommit_cli %(c=%{commit_cli}; echo ${c:0:7}) # tini @@ -29,7 +29,7 @@ %global shortcommit_tini %(c=%{commit_tini}; echo ${c:0:7}) Name: %{newname}-engine -Version: 20.10.9 +Version: 20.10.10 Release: 1%{?dist} Summary: The open-source application container engine License: ASL 2.0 @@ -40,10 +40,6 @@ 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 -# Apply https://github.com/moby/moby/pull/42836 patch to fix Docker seccomp -# policy blocking clone3(). Also see rhbz#2011523 and rhbz#1988199. -# This patch should be part of the next release, so we can remove it then. -Patch0: 0001-seccomp-add-support-for-clone3-syscall-in-default-policy.patch URL: https://www.%{origname}.com # BuildRequires: golang-github-docker-devel @@ -121,7 +117,7 @@ Provides: bundled(golang(github.com/docker/go)) = d30aec9fd63c35133f8f79c3 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)) = 17d8d4e4d8bdec33d386e6362d3537fa9493ba00 +Provides: bundled(golang(github.com/docker/swarmkit)) = 286f4575a2d2853c1574e1be10eb1a2450692dfc 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 @@ -144,7 +140,7 @@ Provides: bundled(golang(github.com/inconshreveable/mousetrap)) = 76626ae9 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/go-winio)) = 7e149e8c70409f36773c1b2cf3447a7ab7697368 Provides: bundled(golang(github.com/Microsoft/hcsshim)) = 5bc557dd210ff2caf615e6e22d398123de77fc11 Provides: bundled(golang(github.com/miekg/pkcs11)) = 210dc1e16747c5ba98a03bcbcf728c38086ea357 Provides: bundled(golang(github.com/mitchellh/mapstructure)) = d16e9488127408e67948eb43b6d3fbb9f222da10 @@ -515,6 +511,10 @@ getent group %{service_name} >/dev/null || groupadd -r %{service_name} || : %{_datadir}/nano/Dockerfile.nanorc %changelog +* Fri Oct 29 2021 Maxwell G - 20.10.10-1 +- Update to 20.10.10 (fixes rhbz#2015385) +- Update virtual provides + * Fri Oct 08 2021 Maxwell G - 20.10.9-1 - Update to 20.10.9 (fixes rhbz#2010508) - Patch seccomp policy to fix clone3() issue (fixes rhbz#2011523 and rhbz#1988199) diff --git a/sources b/sources index 4817765..00aaacb 100644 --- a/sources +++ b/sources @@ -1,3 +1,3 @@ -SHA512 (cli-v20.10.9.tar.gz) = 0a9bd36c139bb5e1cd4a975913aa5429ffce8c746d2104aa2a54d937c67073ddaa2a8a5e93d71d2d435459af58168de0e7e3a44fd452da535f3995738da206df +SHA512 (cli-v20.10.10.tar.gz) = 27760167b3a582bd0b1e4fbb98e0c45424d8bd58932efdf39cf5a9a33f1e44ffd37fa145fa04502cbfe15cd369fcfe19fbd28f40c4fe43167be62ab2ce328a46 SHA512 (de40ad007797e0dcd8b7126f27bb87401d224240.tar.gz) = 6e21fbcc8ab0daf2f2ac407f8d85373d2873d4b1e7d010056e4dd7071183fe1ede9dadf116c520e68a6226d5eb9d5ede383729327630600ed85080c1586bf3bb -SHA512 (moby-v20.10.9.tar.gz) = e4ae9e37633c821892e929e7a5f9dab652fe17f348a24cd37778bc4bfc33d99cdb347e2f575966364a37664dcfa83d1500f2bff7d0b0398a890f2039155a0c0c +SHA512 (moby-v20.10.10.tar.gz) = 7232d9709b40d46b6e6c7ab9e224380af49d2144be6275ca567ac8d9986bb7acf4ecd8784a4868dbaac353342d2f20b5483866ce4e23a73816d3eb50375d226a From 89faf8baf28fe83ef1ed1271929a1dc48d0f6399 Mon Sep 17 00:00:00 2001 From: Olivier Lemasle Date: Mon, 22 Nov 2021 23:40:24 +0100 Subject: [PATCH 047/163] Update to upstream 20.10.11 (fixes rhbz#2024384) Mitigates CVE-2021-41190 (fixes rhbz#2024940) --- .gitignore | 2 ++ moby-engine.spec | 22 +++++++++++++--------- sources | 4 ++-- 3 files changed, 17 insertions(+), 11 deletions(-) diff --git a/.gitignore b/.gitignore index 9321e58..ed1fc24 100644 --- a/.gitignore +++ b/.gitignore @@ -25,3 +25,5 @@ /moby-v20.10.9.tar.gz /cli-v20.10.10.tar.gz moby-v20.10.10.tar.gz +/cli-v20.10.11.tar.gz +/moby-v20.10.11.tar.gz diff --git a/moby-engine.spec b/moby-engine.spec index 6910a1a..2575f08 100644 --- a/moby-engine.spec +++ b/moby-engine.spec @@ -29,7 +29,7 @@ %global shortcommit_tini %(c=%{commit_tini}; echo ${c:0:7}) Name: %{newname}-engine -Version: 20.10.10 +Version: 20.10.11 Release: 1%{?dist} Summary: The open-source application container engine License: ASL 2.0 @@ -117,7 +117,7 @@ Provides: bundled(golang(github.com/docker/go)) = d30aec9fd63c35133f8f79c3 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)) = 286f4575a2d2853c1574e1be10eb1a2450692dfc +Provides: bundled(golang(github.com/docker/swarmkit)) = 17d8d4e4d8bdec33d386e6362d3537fa9493ba00 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 @@ -140,7 +140,7 @@ Provides: bundled(golang(github.com/inconshreveable/mousetrap)) = 76626ae9 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)) = 7e149e8c70409f36773c1b2cf3447a7ab7697368 +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 @@ -206,7 +206,7 @@ Provides: bundled(golang(github.com/cilium/ebpf)) = 1c8d4c9ef7759622653a1d Provides: bundled(golang(github.com/cloudflare/cfssl)) = 5d63dbd981b5c408effbb58c442d54761ff94fbd 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/containerd)) = e048c115a3a89caf63941d363858e207c28bccd6 Provides: bundled(golang(github.com/containerd/continuity)) = efbc4488d8fe1bdc16bde3b2d2990d9b3a899165 Provides: bundled(golang(github.com/containerd/fifo)) = 0724c46b320cf96bb172a0550c19a4b1fca4dacb Provides: bundled(golang(github.com/containerd/go-runc)) = 16b287bc67d069a60fa48db15f330b790b74365b @@ -220,7 +220,7 @@ Provides: bundled(golang(github.com/coreos/pkg)) = 3ac0863d7acf3bc44daf49a Provides: bundled(golang(github.com/creack/pty)) = 2a38352e8b4d7ab6c336eef107e42a55e72e7fbc Provides: bundled(golang(github.com/cyphar/filepath-securejoin)) = a261ee33d7a517f054effbf451841abaafe3e0fd Provides: bundled(golang(github.com/deckarep/golang-set)) = ef32fa3046d9f249d399f98ebaf9be944430fd1d -Provides: bundled(golang(github.com/docker/distribution)) = 0d3efadf0154c2b8a4e7b6621fff9809655cc580 +Provides: bundled(golang(github.com/docker/distribution)) = 58f99e93b767ebacbf8e62a9074844712d31a177 Provides: bundled(golang(github.com/docker/go-connections)) = 7395e3f8aa162843a74ed6d48e79627d9792ac55 Provides: bundled(golang(github.com/docker/go-events)) = e31b211e4f1cd09aa76fe4ac244571fab96ae47f Provides: bundled(golang(github.com/docker/go-metrics)) = b619b3592b65de4f087d9f16863a7e6ff905973c @@ -228,7 +228,7 @@ Provides: bundled(golang(github.com/docker/go-units)) = 519db1ee28dcc9fd24 Provides: bundled(golang(github.com/docker/libkv)) = 458977154600b9f23984d9f4b82e79570b5ae12b Provides: bundled(golang(github.com/docker/libnetwork)) = 64b7a4574d1426139437d20e81c0b6d391130ec8 Provides: bundled(golang(github.com/docker/libtrust)) = 9cbd2a1374f46905c68a4eb3694a130610adc62a -Provides: bundled(golang(github.com/docker/swarmkit)) = c9afb5fd44bb419bae719f400f31671712bcb99e +Provides: bundled(golang(github.com/docker/swarmkit)) = 286f4575a2d2853c1574e1be10eb1a2450692dfc Provides: bundled(golang(github.com/fernet/fernet-go)) = 9eac43b88a5efb8651d24de9b68e87567e029736 Provides: bundled(golang(github.com/fluent/fluent-logger-golang)) = 7a6c9dcd7f14c2ed5d8c55c11b894e5455ee311b Provides: bundled(golang(github.com/fsnotify/fsnotify)) = 45d7d09e39ef4ac08d493309fa031790c15bfe8a @@ -264,20 +264,20 @@ Provides: bundled(golang(github.com/inconshreveable/mousetrap)) = 76626ae9 Provides: bundled(golang(github.com/ishidawataru/sctp)) = f2269e66cdee387bd321445d5d300893449805be Provides: bundled(golang(github.com/jmespath/go-jmespath)) = 2d053f87d1d7f9f48196ae04cf3daea4273d207d 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/go-winio)) = 7e149e8c70409f36773c1b2cf3447a7ab7697368 Provides: bundled(golang(github.com/Microsoft/hcsshim)) = 64a2b71405dacf76c95600f4c756a991ad09cf7c Provides: bundled(golang(github.com/Microsoft/opengcs)) = a10967154e143a36014584a6f664344e3bb0aa64 Provides: bundled(golang(github.com/miekg/dns)) = 6c0c4e6581f8e173cc562c8b3363ab984e4ae071 Provides: bundled(golang(github.com/mistifyio/go-zfs)) = f784269be439d704d3dfa1906f45dd848fed2beb Provides: bundled(golang(github.com/mitchellh/hashstructure)) = a38c50148365edc8df43c1580c48fb2b3a1e9cd7 -Provides: bundled(golang(github.com/moby/buildkit)) = 244e8cde639f71a05a1a2e0670bd88e0206ce55c +Provides: bundled(golang(github.com/moby/buildkit)) = bc07b2b81b1c6a62d29981ac564b16a15ce2bfa7 Provides: bundled(golang(github.com/moby/ipvs)) = 4566ccea0e08d68e9614c3e7a64a23b850c4bb35 Provides: bundled(golang(github.com/moby/locker)) = 281af2d563954745bea9d1487c965f24d30742fe Provides: bundled(golang(github.com/moby/sys)) = 1bc8673b57550ddf85262eb0fed0aac651a37dab Provides: bundled(golang(github.com/moby/term)) = bea5bbe245bf407372d477f1361d2ff042d2f556 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/image-spec)) = 67d2d5658fe0476ab9bf414cec164077ebff3920 Provides: bundled(golang(github.com/opencontainers/runc)) = ff819c7e9184c13b7c2607fe6c30ae19403a7aff Provides: bundled(golang(github.com/opencontainers/runtime-spec)) = 4d89ac9fbff6c455f46a5bb59c6b1bb7184a5e43 Provides: bundled(golang(github.com/opencontainers/selinux)) = 2f45b3796d18f1ab4c9fc0c888a98d0a0fd6e429 @@ -511,6 +511,10 @@ getent group %{service_name} >/dev/null || groupadd -r %{service_name} || : %{_datadir}/nano/Dockerfile.nanorc %changelog +* Mon Nov 22 2021 Olivier Lemasle - 20.10-11-1 +- Update to upstream 20.10.11 (fixes rhbz#2024384) +- Mitigates CVE-2021-41190 (fixes rhbz#2024940) + * Fri Oct 29 2021 Maxwell G - 20.10.10-1 - Update to 20.10.10 (fixes rhbz#2015385) - Update virtual provides diff --git a/sources b/sources index 00aaacb..a195a6c 100644 --- a/sources +++ b/sources @@ -1,3 +1,3 @@ -SHA512 (cli-v20.10.10.tar.gz) = 27760167b3a582bd0b1e4fbb98e0c45424d8bd58932efdf39cf5a9a33f1e44ffd37fa145fa04502cbfe15cd369fcfe19fbd28f40c4fe43167be62ab2ce328a46 +SHA512 (cli-v20.10.11.tar.gz) = c0bd1ab77b6e8ac1b6fb094bb51ed488e0ed3ed6ead3181b9f761fcce6e4901b90a34e779a90365731e65765877a502399be2dd1af95293209b846fa69dee3b8 SHA512 (de40ad007797e0dcd8b7126f27bb87401d224240.tar.gz) = 6e21fbcc8ab0daf2f2ac407f8d85373d2873d4b1e7d010056e4dd7071183fe1ede9dadf116c520e68a6226d5eb9d5ede383729327630600ed85080c1586bf3bb -SHA512 (moby-v20.10.10.tar.gz) = 7232d9709b40d46b6e6c7ab9e224380af49d2144be6275ca567ac8d9986bb7acf4ecd8784a4868dbaac353342d2f20b5483866ce4e23a73816d3eb50375d226a +SHA512 (moby-v20.10.11.tar.gz) = ac947e882abb02d52aea4aecb5dcfef6e23c86aadf98b49e3312ca3079dac7a01d6c936c0a4e51b3561def926ae50b4c5587063b8c58cac5c5de3c5e7985b120 From 098d8c1e7f0f206ceb2a5a401a003f69bfad321b Mon Sep 17 00:00:00 2001 From: Maxwell G Date: Mon, 10 Jan 2022 23:34:05 -0600 Subject: [PATCH 048/163] Update to 20.10.12. Fixes rhbz#2032534. Install zsh completions to the correct directory. Fixes rhbz#2038888. Signed-off-by: Maxwell G --- .gitignore | 2 ++ moby-engine.spec | 18 ++++++++++-------- sources | 4 ++-- 3 files changed, 14 insertions(+), 10 deletions(-) diff --git a/.gitignore b/.gitignore index ed1fc24..46ba8e8 100644 --- a/.gitignore +++ b/.gitignore @@ -27,3 +27,5 @@ moby-v20.10.10.tar.gz /cli-v20.10.11.tar.gz /moby-v20.10.11.tar.gz +/cli-v20.10.12.tar.gz +/moby-v20.10.12.tar.gz diff --git a/moby-engine.spec b/moby-engine.spec index 2575f08..e54c060 100644 --- a/moby-engine.spec +++ b/moby-engine.spec @@ -29,7 +29,7 @@ %global shortcommit_tini %(c=%{commit_tini}; echo ${c:0:7}) Name: %{newname}-engine -Version: 20.10.11 +Version: 20.10.12 Release: 1%{?dist} Summary: The open-source application container engine License: ASL 2.0 @@ -42,8 +42,8 @@ Source3: %{service_name}.service Source4: %{service_name}.sysconfig URL: https://www.%{origname}.com -# BuildRequires: golang-github-docker-devel -BuildRequires: golang-github-docker-libnetwork-devel +# BuildRequires: golang(github.com/docker/docker) +BuildRequires: golang(github.com/docker/libnetwork) BuildRequires: pkgconfig(libbtrfsutil) BuildRequires: pkgconfig(devmapper) BuildRequires: golang @@ -447,10 +447,10 @@ install -p -m 644 %{SOURCE4} %{buildroot}%{_sysconfdir}/sysconfig/%{service_name # add bash, zsh, and fish completions install -dp %{buildroot}%{_datadir}/bash-completion/completions -install -dp %{buildroot}%{_datadir}/zsh/vendor-completions +install -dp %{buildroot}%{_datadir}/zsh/site-functions install -dp %{buildroot}%{_datadir}/fish/vendor_completions.d 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/zsh/_%{service_name} %{buildroot}%{_datadir}/zsh/site-functions/_%{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 @@ -499,11 +499,9 @@ getent group %{service_name} >/dev/null || groupadd -r %{service_name} || : %{_mandir}/man8/* %files zsh-completion -%dir %{_datadir}/zsh/vendor-completions/ -%{_datadir}/zsh/vendor-completions/_%{service_name} +%{_datadir}/zsh/site-functions/_%{service_name} %files fish-completion -%dir %{_datadir}/fish/vendor_completions.d %{_datadir}/fish/vendor_completions.d/%{service_name}.fish %files nano @@ -511,6 +509,10 @@ getent group %{service_name} >/dev/null || groupadd -r %{service_name} || : %{_datadir}/nano/Dockerfile.nanorc %changelog +* Tue Jan 11 2022 Maxwell G - 20.10.12-1 +- Update to 20.10.12. Fixes rhbz#2032534. +- Install zsh completions to the correct directory. Fixes rhbz#2038888. + * Mon Nov 22 2021 Olivier Lemasle - 20.10-11-1 - Update to upstream 20.10.11 (fixes rhbz#2024384) - Mitigates CVE-2021-41190 (fixes rhbz#2024940) diff --git a/sources b/sources index a195a6c..82474c0 100644 --- a/sources +++ b/sources @@ -1,3 +1,3 @@ -SHA512 (cli-v20.10.11.tar.gz) = c0bd1ab77b6e8ac1b6fb094bb51ed488e0ed3ed6ead3181b9f761fcce6e4901b90a34e779a90365731e65765877a502399be2dd1af95293209b846fa69dee3b8 +SHA512 (cli-v20.10.12.tar.gz) = ac7c997f5751f2e34b9bcb9f026d3d0c2cd58c32a13e9255536b0eb0d7eabd81c42f2d608c0fe7725322b619f2360818b08379e847d598dd0bec570602ad224f SHA512 (de40ad007797e0dcd8b7126f27bb87401d224240.tar.gz) = 6e21fbcc8ab0daf2f2ac407f8d85373d2873d4b1e7d010056e4dd7071183fe1ede9dadf116c520e68a6226d5eb9d5ede383729327630600ed85080c1586bf3bb -SHA512 (moby-v20.10.11.tar.gz) = ac947e882abb02d52aea4aecb5dcfef6e23c86aadf98b49e3312ca3079dac7a01d6c936c0a4e51b3561def926ae50b4c5587063b8c58cac5c5de3c5e7985b120 +SHA512 (moby-v20.10.12.tar.gz) = f4122c8cbc67e6b7703856dc76d6f15d7fab1b2001d4916b89958d5319c16d8b8445881841ef4804e8d47d64694184aec1be93e22d7baceb021c4a99c2c03753 From e33b768788c06852f6a86af30a2711b0527e60e6 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 20 Jan 2022 20:10:55 +0000 Subject: [PATCH 049/163] - Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- moby-engine.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/moby-engine.spec b/moby-engine.spec index e54c060..3029b32 100644 --- a/moby-engine.spec +++ b/moby-engine.spec @@ -30,7 +30,7 @@ Name: %{newname}-engine Version: 20.10.12 -Release: 1%{?dist} +Release: 2%{?dist} Summary: The open-source application container engine License: ASL 2.0 # no golang / go-md2man for ppc64 @@ -509,6 +509,9 @@ getent group %{service_name} >/dev/null || groupadd -r %{service_name} || : %{_datadir}/nano/Dockerfile.nanorc %changelog +* Thu Jan 20 2022 Fedora Release Engineering - 20.10.12-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild + * Tue Jan 11 2022 Maxwell G - 20.10.12-1 - Update to 20.10.12. Fixes rhbz#2032534. - Install zsh completions to the correct directory. Fixes rhbz#2038888. From 3596b9c63566049d48696bffdc906cb6ef761a92 Mon Sep 17 00:00:00 2001 From: Maxwell G Date: Sun, 30 Jan 2022 21:00:55 -0600 Subject: [PATCH 050/163] Fixes FTBFS. Closes rhbz#2046748. Use %gobuild instead of Makefile to build binaries Add explanatory comments. Normalize install commands Make compliant with SourceURL Guidelines Remove no longer necessary `ExcludeArch: ppc64`. --- .gitignore | 3 ++ moby-engine.spec | 111 +++++++++++++++++++++++++---------------------- sources | 6 +-- 3 files changed, 66 insertions(+), 54 deletions(-) diff --git a/.gitignore b/.gitignore index 46ba8e8..41df84d 100644 --- a/.gitignore +++ b/.gitignore @@ -29,3 +29,6 @@ moby-v20.10.10.tar.gz /moby-v20.10.11.tar.gz /cli-v20.10.12.tar.gz /moby-v20.10.12.tar.gz +/cli-20.10.12.tar.gz +/moby-20.10.12.tar.gz +/tini-de40ad0.tar.gz diff --git a/moby-engine.spec b/moby-engine.spec index 3029b32..9d79ad0 100644 --- a/moby-engine.spec +++ b/moby-engine.spec @@ -14,12 +14,14 @@ %global service_name %{origname} # moby -%global git_moby https://github.com/%{newname}/%{newname} +%global goipath_moby github.com/%{service_name}/%{service_name} +%global git_moby https://%{goipath_moby} %global commit_moby e2f740de442bac52b280bc485a3ca5b31567d938 %global shortcommit_moby %(c=%{commit_moby}; echo ${c:0:7}) # cli -%global git_cli https://github.com/%{origname}/cli +%global goipath_cli github.com/%{origname}/cli +%global git_cli https://%{goipath_cli} %global commit_cli 485636f4b90ed5a91a1f403e65ffced469c641a %global shortcommit_cli %(c=%{commit_cli}; echo ${c:0:7}) @@ -30,14 +32,12 @@ Name: %{newname}-engine Version: 20.10.12 -Release: 2%{?dist} +Release: 3%{?dist} Summary: The open-source application container engine License: ASL 2.0 -# no golang / go-md2man for ppc64 -ExcludeArch: ppc64 -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 +Source0: %{git_moby}/archive/v%{version}/moby-%{version}.tar.gz +Source1: %{git_cli}/archive/v%{version}/cli-%{version}.tar.gz +Source2: %{git_tini}/archive/%{commit_tini}/tini-%{shortcommit_tini}.tar.gz Source3: %{service_name}.service Source4: %{service_name}.sysconfig URL: https://www.%{origname}.com @@ -373,95 +373,96 @@ sed -i '/env bash/d' cli-%{version}/contrib/completion/bash/docker tar zxf %{SOURCE2} %build -export GOPATH="/usr/share/gocode" -mkdir -p _build +mkdir -p _build/bin # build docker-proxy / libnetwork ( - export LDFLAGS="-linkmode=external" - %gobuild -o _build/%{service_name}-proxy github.com/%{service_name}/libnetwork/cmd/proxy + + # Build binary using `golang-github-docker-libnetwork-devel` + # (github.com/docker/libnetwork) installed in system GOPATH. + export GOPATH="%{_datadir}/gocode" + %gobuild -o _build/bin/%{service_name}-proxy github.com/%{service_name}/libnetwork/cmd/proxy ) -# build tini +# build tini (installed as %%{service_name}-init) ( cd tini-%{commit_tini} %cmake . make tini-static -C "%{__cmake_builddir}" ) +%global buildtime %(date --utc --date="@${SOURCE_DATE_EPOCH:-$(date +%s)}" +"%Y-%m-%dT%H:%M:%SZ") # build engine ( mkdir -p src/github.com/%{service_name} - ln -fns ../../.. src/github.com/%{service_name}/%{service_name} + # Link source and vendored deps into local GOPATH. + ln -fns ../../.. src/%{goipath_moby} + # Build using source and vendored deps in local GOPATH. export GOPATH="${PWD}" export GO111MODULE=off - # 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 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=%{buildtime}'" export DOCKER_BUILDTAGS="seccomp selinux journald" - # %%gobuild -o _build/%%{service_name}d github.com/%%{service_name}/%%{service_name}/cmd/dockerd - VERSION=%{version} DOCKER_GITCOMMIT=%{shortcommit_moby} bash -x hack/make.sh dynbinary - mv bundles/dynbinary-daemon/dockerd-%{version} _build/dockerd + %gobuild -o _build/bin/%{service_name}d %{goipath_moby}/cmd/%{service_name}d + # VERSION=%%{version} DOCKER_GITCOMMIT=%%{shortcommit_moby} bash sh dynbinary + # mv bundles/dynbinary-daemon/dockerd-%{version} _build/bin/dockerd ) # build 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 + # Link source and vendored deps into local GOPATH. + ln -fns ../../.. src/%{goipath_cli} + # export DISABLE_WARN_OUTSIDE_CONTAINER=1 + # Build using source and vendored deps in local GOPATH. export GOPATH="${PWD}" export GO111MODULE=off - make VERSION=%{version} GITCOMMIT=%{shortcommit_cli} dynbinary + export LDFLAGS="\ + -w \ + -X \"github.com/docker/cli/cli/version.GitCommit=%{shortcommit_cli}\" \ + -X \"github.com/docker/cli/cli/version.BuildTime=%{buildtime}\" \ + -X \"github.com/docker/cli/cli/version.Version=%{version}\" \ + " + %gobuild -o ../_build/bin/%{service_name} %{goipath_cli}/cmd/%{service_name} + # make VERSION=%%{version} GITCOMMIT=%%{shortcommit_cli} dynbinary man/md2man-all.sh ) %install -install -dp %{buildroot}%{_bindir} -install -dp %{buildroot}%{_libexecdir}/%{service_name} - # install binary -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 -Dpm 755 _build/bin/%{service_name} _build/bin/%{service_name}d -t %{buildroot}%{_bindir}/ # install proxy -install -p -m 755 _build/%{service_name}-proxy %{buildroot}%{_libexecdir}/%{service_name}/%{service_name}-proxy +install -Dpm 755 _build/bin/%{service_name}-proxy -t %{buildroot}%{_libexecdir}/%{service_name}/ # install tini -install -p -m 755 tini-%{commit_tini}/%{__cmake_builddir}/tini-static %{buildroot}%{_libexecdir}/%{service_name}/%{service_name}-init +install -Dpm 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 contrib/udev/80-%{service_name}.rules %{buildroot}%{_usr}/lib/udev/rules.d/80-%{service_name}.rules +install -Dpm 644 contrib/udev/80-%{service_name}.rules -t %{buildroot}%{_usr}/lib/udev/rules.d/ # add init scripts -install -dp %{buildroot}%{_unitdir} -install -p -m 644 %{SOURCE3} %{buildroot}%{_unitdir} -install -p -m 644 contrib/init/systemd/docker.socket %{buildroot}%{_unitdir} +install -Dpm 644 %{SOURCE3} contrib/init/systemd/docker.socket -t %{buildroot}%{_unitdir}/ # for additional args -install -dp %{buildroot}%{_sysconfdir}/sysconfig -install -p -m 644 %{SOURCE4} %{buildroot}%{_sysconfdir}/sysconfig/%{service_name} +install -Dpm 644 %{SOURCE4} %{buildroot}%{_sysconfdir}/sysconfig/%{service_name} # add bash, zsh, and fish completions -install -dp %{buildroot}%{_datadir}/bash-completion/completions -install -dp %{buildroot}%{_datadir}/zsh/site-functions -install -dp %{buildroot}%{_datadir}/fish/vendor_completions.d -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/site-functions/_%{service_name} -install -p -m 644 cli-%{version}/contrib/completion/fish/%{service_name}.fish %{buildroot}%{_datadir}/fish/vendor_completions.d/%{service_name}.fish +install -Dpm 644 cli-%{version}/contrib/completion/bash/%{service_name} -t %{buildroot}%{_datadir}/bash-completion/completions/ +install -Dpm 644 cli-%{version}/contrib/completion/zsh/_%{service_name} -t %{buildroot}%{_datadir}/zsh/site-functions/ +install -Dpm 644 cli-%{version}/contrib/completion/fish/%{service_name}.fish -t %{buildroot}%{_datadir}/fish/vendor_completions.d/ # install manpages -install -dp %{buildroot}%{_mandir}/man{1,5,8} -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 +install -Dpm 644 cli-%{version}/man/man1/*.1 -t %{buildroot}%{_mandir}/man1/ +install -Dpm 644 cli-%{version}/man/man5/*.5 -t %{buildroot}%{_mandir}/man5/ +install -Dpm 644 cli-%{version}/man/man8/*.8 -t %{buildroot}%{_mandir}/man8/ # add nano files -install -dp %{buildroot}%{_datadir}/nano -install -p -m 644 contrib/syntax/nano/Dockerfile.nanorc %{buildroot}%{_datadir}/nano/Dockerfile.nanorc +install -Dpm 644 contrib/syntax/nano/Dockerfile.nanorc -t %{buildroot}%{_datadir}/nano/ for cli_file in LICENSE MAINTAINERS NOTICE README.md; do cp "cli-%{version}/$cli_file" "cli-$cli_file" @@ -509,6 +510,14 @@ getent group %{service_name} >/dev/null || groupadd -r %{service_name} || : %{_datadir}/nano/Dockerfile.nanorc %changelog +* Mon Jan 31 2022 Maxwell G - 20.10.12-3 +- Fixes FTBFS. Closes rhbz#2046748. +- Use %%gobuild instead of Makefile to build binaries +- Add explanatory comments. +- Normalize install commands +- Make compliant with SourceURL Guidelines +- Remove no longer necessary `ExcludeArch: ppc64`. + * Thu Jan 20 2022 Fedora Release Engineering - 20.10.12-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild diff --git a/sources b/sources index 82474c0..0067477 100644 --- a/sources +++ b/sources @@ -1,3 +1,3 @@ -SHA512 (cli-v20.10.12.tar.gz) = ac7c997f5751f2e34b9bcb9f026d3d0c2cd58c32a13e9255536b0eb0d7eabd81c42f2d608c0fe7725322b619f2360818b08379e847d598dd0bec570602ad224f -SHA512 (de40ad007797e0dcd8b7126f27bb87401d224240.tar.gz) = 6e21fbcc8ab0daf2f2ac407f8d85373d2873d4b1e7d010056e4dd7071183fe1ede9dadf116c520e68a6226d5eb9d5ede383729327630600ed85080c1586bf3bb -SHA512 (moby-v20.10.12.tar.gz) = f4122c8cbc67e6b7703856dc76d6f15d7fab1b2001d4916b89958d5319c16d8b8445881841ef4804e8d47d64694184aec1be93e22d7baceb021c4a99c2c03753 +SHA512 (cli-20.10.12.tar.gz) = ac7c997f5751f2e34b9bcb9f026d3d0c2cd58c32a13e9255536b0eb0d7eabd81c42f2d608c0fe7725322b619f2360818b08379e847d598dd0bec570602ad224f +SHA512 (moby-20.10.12.tar.gz) = f4122c8cbc67e6b7703856dc76d6f15d7fab1b2001d4916b89958d5319c16d8b8445881841ef4804e8d47d64694184aec1be93e22d7baceb021c4a99c2c03753 +SHA512 (tini-de40ad0.tar.gz) = 6e21fbcc8ab0daf2f2ac407f8d85373d2873d4b1e7d010056e4dd7071183fe1ede9dadf116c520e68a6226d5eb9d5ede383729327630600ed85080c1586bf3bb From 679b9ebc3edacc1387d53658eb584573fe97213d Mon Sep 17 00:00:00 2001 From: Maxwell G Date: Mon, 11 Apr 2022 18:11:23 -0500 Subject: [PATCH 051/163] Move provides for bundled deps into a separate file --- moby-engine.spec | 232 +--------------------------------------------- provides.spec.inc | 228 +++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 231 insertions(+), 229 deletions(-) create mode 100644 provides.spec.inc diff --git a/moby-engine.spec b/moby-engine.spec index 9d79ad0..2f39a6b 100644 --- a/moby-engine.spec +++ b/moby-engine.spec @@ -40,6 +40,8 @@ Source1: %{git_cli}/archive/v%{version}/cli-%{version}.tar.gz Source2: %{git_tini}/archive/%{commit_tini}/tini-%{shortcommit_tini}.tar.gz Source3: %{service_name}.service Source4: %{service_name}.sysconfig +# Seperate file containing virtual provides for bundled deps that's %%include'd in the specfile. +Source5: provides.spec.inc URL: https://www.%{origname}.com # BuildRequires: golang(github.com/docker/docker) @@ -90,235 +92,7 @@ Conflicts: %{origname}-ce-cli Conflicts: %{origname}-ee Conflicts: podman-%{origname} -# Bundled dependencies -Provides: bundled(tini-static) -Provides: bundled(golang(github.com/docker/docker)) -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/Azure/go-ansiterm)) = d185dfc1b5a126116ea5a19e148e29d16b4574c9 -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)) = b1ec32e02fe539480dc03e3bf381c20066e7c6cc -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)) = b0f5bc36fea9dfb9672e1e9b1278ebab797b9ee0 -Provides: bundled(golang(github.com/docker/docker-credential-helpers)) = fc9290adbcf1594e78910e2f0334090eaee0e1ee -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)) = 17d8d4e4d8bdec33d386e6362d3537fa9493ba00 -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)) = 3f7ff695adc6a35abc925370dd0a4dafb48ec64d -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)) = 4c9bf9512682b995722660a4196c0013228e2049 -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)) = bf96a202a09a312ae005cd312fc06ff4d2c166ce -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 -# grep -v -e '^$' -e '^#' moby/vendor.conf | sort | awk '{print "Provides: bundled(golang("$1")) = "$2}' -Provides: bundled(golang(cloud.google.com/go)) = ceeb313ad77b789a7fa5287b36a1d127b69b7093 -Provides: bundled(golang(code.cloudfoundry.org/clock)) = 02e53af36e6c978af692887ed449b74026d76fec -Provides: bundled(golang(github.com/armon/go-metrics)) = eb0af217e5e9747e41dd5303755356b62d28e3ec -Provides: bundled(golang(github.com/armon/go-radix)) = e39d623f12e8e41c7b5529e9a9dd67a1e2261f80 -Provides: bundled(golang(github.com/aws/aws-sdk-go)) = 2590bc875c54c9fda225d8e4e56a9d28d90c6a47 -Provides: bundled(golang(github.com/Azure/go-ansiterm)) = d6e3b3328b783f23731bc4d058875b0371ff8109 -Provides: bundled(golang(github.com/beorn7/perks)) = 37c8de3658fcb183f997c4e13e8337516ab753e6 -Provides: bundled(golang(github.com/bsphere/le_go)) = 7a984a84b5492ae539b79b62fb4a10afc63c7bcf -Provides: bundled(golang(github.com/BurntSushi/toml)) = 3012a1dbe2e4bd1391d42b32f0577cb7bbc7f005 -Provides: bundled(golang(github.com/cespare/xxhash/v2)) = d7df74196a9e781ede915320c11c378c1b2f3a1f -Provides: bundled(golang(github.com/cilium/ebpf)) = 1c8d4c9ef7759622653a1d319284a44652333b28 -Provides: bundled(golang(github.com/cloudflare/cfssl)) = 5d63dbd981b5c408effbb58c442d54761ff94fbd -Provides: bundled(golang(github.com/containerd/cgroups)) = 0b889c03f102012f1d93a97ddd3ef71cd6f4f510 -Provides: bundled(golang(github.com/containerd/console)) = 5d7e1412f07b502a01029ea20e20e0d2be31fa7c -Provides: bundled(golang(github.com/containerd/containerd)) = e048c115a3a89caf63941d363858e207c28bccd6 -Provides: bundled(golang(github.com/containerd/continuity)) = efbc4488d8fe1bdc16bde3b2d2990d9b3a899165 -Provides: bundled(golang(github.com/containerd/fifo)) = 0724c46b320cf96bb172a0550c19a4b1fca4dacb -Provides: bundled(golang(github.com/containerd/go-runc)) = 16b287bc67d069a60fa48db15f330b790b74365b -Provides: bundled(golang(github.com/containerd/ttrpc)) = bfba540dc45464586c106b1f31c8547933c1eb41 -Provides: bundled(golang(github.com/containerd/typeurl)) = cd3ce7159eae562a4f60ceff37dada11a939d247 -Provides: bundled(golang(github.com/coreos/etcd)) = d57e8b8d97adfc4a6c224fe116714bf1a1f3beb9 -Provides: bundled(golang(github.com/coreos/go-semver)) = 8ab6407b697782a06568d4b7f1db25550ec2e4c6 -Provides: bundled(golang(github.com/coreos/go-systemd)) = 39ca1b05acc7ad1220e09f133283b8859a8b71ab -Provides: bundled(golang(github.com/coreos/go-systemd/v22)) = 2d78030078ef61b3cae27f42ad6d0e46db51b339 -Provides: bundled(golang(github.com/coreos/pkg)) = 3ac0863d7acf3bc44daf49afef8919af12f704ef -Provides: bundled(golang(github.com/creack/pty)) = 2a38352e8b4d7ab6c336eef107e42a55e72e7fbc -Provides: bundled(golang(github.com/cyphar/filepath-securejoin)) = a261ee33d7a517f054effbf451841abaafe3e0fd -Provides: bundled(golang(github.com/deckarep/golang-set)) = ef32fa3046d9f249d399f98ebaf9be944430fd1d -Provides: bundled(golang(github.com/docker/distribution)) = 58f99e93b767ebacbf8e62a9074844712d31a177 -Provides: bundled(golang(github.com/docker/go-connections)) = 7395e3f8aa162843a74ed6d48e79627d9792ac55 -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/libkv)) = 458977154600b9f23984d9f4b82e79570b5ae12b -Provides: bundled(golang(github.com/docker/libnetwork)) = 64b7a4574d1426139437d20e81c0b6d391130ec8 -Provides: bundled(golang(github.com/docker/libtrust)) = 9cbd2a1374f46905c68a4eb3694a130610adc62a -Provides: bundled(golang(github.com/docker/swarmkit)) = 286f4575a2d2853c1574e1be10eb1a2450692dfc -Provides: bundled(golang(github.com/fernet/fernet-go)) = 9eac43b88a5efb8651d24de9b68e87567e029736 -Provides: bundled(golang(github.com/fluent/fluent-logger-golang)) = 7a6c9dcd7f14c2ed5d8c55c11b894e5455ee311b -Provides: bundled(golang(github.com/fsnotify/fsnotify)) = 45d7d09e39ef4ac08d493309fa031790c15bfe8a -Provides: bundled(golang(github.com/godbus/dbus/v5)) = 37bf87eef99d69c4f1d3528bd66e3a87dc201472 -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/gddo)) = 72a348e765d293ed6d1ded7b699591f14d6cd921 -Provides: bundled(golang(github.com/golang/groupcache)) = 869f871628b6baa9cfbc11732cdf6546b17c1298 -Provides: bundled(golang(github.com/golang/protobuf)) = 84668698ea25b64748563aa20726db66a6b8d299 -Provides: bundled(golang(github.com/googleapis/gax-go)) = bd5b16380fd03dc758d11cef74ba2e3bc8b0e8c2 -Provides: bundled(golang(github.com/google/certificate-transparency-go)) = 37a384cd035e722ea46e55029093e26687138edf -Provides: bundled(golang(github.com/google/go-cmp)) = 3af367b6b30c263d47e8895973edcca9a49cf029 -Provides: bundled(golang(github.com/google/shlex)) = e7afc7fbc51079733e9468cdfd1efcd7d196cd1d -Provides: bundled(golang(github.com/google/uuid)) = 0cd6bf5da1e1c83f8b45653022c74f71af0538a4 -Provides: bundled(golang(github.com/gorilla/mux)) = 98cb6bf42e086f6af920b965c38cacc07402d51b -Provides: bundled(golang(github.com/Graylog2/go-gelf)) = 1550ee647df0510058c9d67a45c56f18911d80b8 -Provides: bundled(golang(github.com/grpc-ecosystem/go-grpc-middleware)) = 3c51f7f332123e8be5a157c0802a228ac85bf9db -Provides: bundled(golang(github.com/grpc-ecosystem/go-grpc-prometheus)) = c225b8c3b01faf2899099b768856a9e916e5087b -Provides: bundled(golang(github.com/grpc-ecosystem/grpc-opentracing)) = 8e809c8a86450a29b90dcc9efbf062d0fe6d9746 -Provides: bundled(golang(github.com/hashicorp/consul)) = 9a9cc9341bb487651a0399e3fc5e1e8a42e62dd9 -Provides: bundled(golang(github.com/hashicorp/errwrap)) = 8a6fb523712970c966eefc6b39ed2c5e74880354 -Provides: bundled(golang(github.com/hashicorp/go-immutable-radix)) = 826af9ccf0feeee615d546d69b11f8e98da8c8f1 -Provides: bundled(golang(github.com/hashicorp/golang-lru)) = 7f827b33c0f158ec5dfbba01bb0b14a4541fd81d -Provides: bundled(golang(github.com/hashicorp/go-memdb)) = cb9a474f84cc5e41b273b20c6927680b2a8776ad -Provides: bundled(golang(github.com/hashicorp/go-msgpack)) = 71c2886f5a673a35f909803f38ece5810165097b -Provides: bundled(golang(github.com/hashicorp/go-multierror)) = 886a7fbe3eb1c874d46f623bfa70af45f425b3d1 -Provides: bundled(golang(github.com/hashicorp/go-sockaddr)) = c7188e74f6acae5a989bdc959aa779f8b9f42faf -Provides: bundled(golang(github.com/hashicorp/memberlist)) = 3d8438da9589e7b608a83ffac1ef8211486bcb7c -Provides: bundled(golang(github.com/hashicorp/serf)) = 598c54895cc5a7b1a24a398d635e8c0ea0959870 -Provides: bundled(golang(github.com/imdario/mergo)) = 1afb36080aec31e0d1528973ebe6721b191b0369 -Provides: bundled(golang(github.com/inconshreveable/mousetrap)) = 76626ae9c91c4f2a10f34cad8ce83ea42c93bb75 -Provides: bundled(golang(github.com/ishidawataru/sctp)) = f2269e66cdee387bd321445d5d300893449805be -Provides: bundled(golang(github.com/jmespath/go-jmespath)) = 2d053f87d1d7f9f48196ae04cf3daea4273d207d -Provides: bundled(golang(github.com/matttproud/golang_protobuf_extensions)) = c12348ce28de40eed0136aa2b644d0ee0650e56c -Provides: bundled(golang(github.com/Microsoft/go-winio)) = 7e149e8c70409f36773c1b2cf3447a7ab7697368 -Provides: bundled(golang(github.com/Microsoft/hcsshim)) = 64a2b71405dacf76c95600f4c756a991ad09cf7c -Provides: bundled(golang(github.com/Microsoft/opengcs)) = a10967154e143a36014584a6f664344e3bb0aa64 -Provides: bundled(golang(github.com/miekg/dns)) = 6c0c4e6581f8e173cc562c8b3363ab984e4ae071 -Provides: bundled(golang(github.com/mistifyio/go-zfs)) = f784269be439d704d3dfa1906f45dd848fed2beb -Provides: bundled(golang(github.com/mitchellh/hashstructure)) = a38c50148365edc8df43c1580c48fb2b3a1e9cd7 -Provides: bundled(golang(github.com/moby/buildkit)) = bc07b2b81b1c6a62d29981ac564b16a15ce2bfa7 -Provides: bundled(golang(github.com/moby/ipvs)) = 4566ccea0e08d68e9614c3e7a64a23b850c4bb35 -Provides: bundled(golang(github.com/moby/locker)) = 281af2d563954745bea9d1487c965f24d30742fe -Provides: bundled(golang(github.com/moby/sys)) = 1bc8673b57550ddf85262eb0fed0aac651a37dab -Provides: bundled(golang(github.com/moby/term)) = bea5bbe245bf407372d477f1361d2ff042d2f556 -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)) = 67d2d5658fe0476ab9bf414cec164077ebff3920 -Provides: bundled(golang(github.com/opencontainers/runc)) = ff819c7e9184c13b7c2607fe6c30ae19403a7aff -Provides: bundled(golang(github.com/opencontainers/runtime-spec)) = 4d89ac9fbff6c455f46a5bb59c6b1bb7184a5e43 -Provides: bundled(golang(github.com/opencontainers/selinux)) = 2f45b3796d18f1ab4c9fc0c888a98d0a0fd6e429 -Provides: bundled(golang(github.com/opentracing-contrib/go-stdlib)) = 8a6ff1ad1691a29e4f7b5d46604f97634997c8c4 -Provides: bundled(golang(github.com/opentracing/opentracing-go)) = d34af3eaa63c4d08ab54863a4bdd0daa45212e12 -Provides: bundled(golang(github.com/philhofer/fwd)) = bb6d471dc95d4fe11e432687f8b70ff496cf3136 -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/RackSec/srslog)) = a4725f04ec91af1a91b380da679d6e0c2f061e59 -Provides: bundled(golang(github.com/samuel/go-zookeeper)) = d0e0d8e11f318e000a8cc434616d69e329edc374 -Provides: bundled(golang(github.com/sean-/seed)) = e2103e2c35297fb7e17febb81e49b312087a2372 -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/syndtr/gocapability)) = 42c35b4376354fd554efc7ad35e0b7f94e3a0ffb -Provides: bundled(golang(github.com/tchap/go-patricia)) = a7f0089c6f496e8e70402f61733606daa326cac5 -Provides: bundled(golang(github.com/tinylib/msgp)) = af6442a0fcf6e2a1b824f70dd0c734f01e817751 -Provides: bundled(golang(github.com/tonistiigi/fsutil)) = 0834f99b7b85462efb69b4f571a4fa3ca7da5ac9 -Provides: bundled(golang(github.com/tonistiigi/units)) = 6950e57a87eaf136bbe44ef2ec8e75b9e3569de2 -Provides: bundled(golang(github.com/ugorji/go)) = b4c50a2b199d93b13dc15e78929cfb23bfdf21ab -Provides: bundled(golang(github.com/vbatts/tar-split)) = 620714a4c508c880ac1bdda9c8370a2b19af1a55 -Provides: bundled(golang(github.com/vishvananda/netlink)) = f049be6f391489d3f374498fe0c8df8449258372 -Provides: bundled(golang(github.com/vishvananda/netns)) = db3c7e526aae966c4ccfa6c8189b693d6ac5d202 -Provides: bundled(golang(github.com/willf/bitset)) = 559910e8471e48d76d9e5a1ba15842dee77ad45d -Provides: bundled(golang(go.etcd.io/bbolt)) = 232d8fc87f50244f9c808f4745759e08a304c029 -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/text)) = 23ae387dee1f90d29a23c0e87ee0b46038fbed0e -Provides: bundled(golang(golang.org/x/time)) = 555d28b269f0569763d25dbe1a237ae74c6bcc82 -Provides: bundled(golang(google.golang.org/api)) = dec2ee309f5b09fc59bc40676447c15736284d78 -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(gotest.tools/v3)) = 568bc57cc5c19a2ef85e5749870b49a4cc2ab54d - +%include %{SOURCE5} %description Docker is an open source project to build, ship and run any application as a diff --git a/provides.spec.inc b/provides.spec.inc new file mode 100644 index 0000000..1a3cd04 --- /dev/null +++ b/provides.spec.inc @@ -0,0 +1,228 @@ +# Bundled dependencies +Provides: bundled(tini-static) +Provides: bundled(golang(github.com/docker/docker)) +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/Azure/go-ansiterm)) = d185dfc1b5a126116ea5a19e148e29d16b4574c9 +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)) = b1ec32e02fe539480dc03e3bf381c20066e7c6cc +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)) = b0f5bc36fea9dfb9672e1e9b1278ebab797b9ee0 +Provides: bundled(golang(github.com/docker/docker-credential-helpers)) = fc9290adbcf1594e78910e2f0334090eaee0e1ee +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)) = 17d8d4e4d8bdec33d386e6362d3537fa9493ba00 +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)) = 3f7ff695adc6a35abc925370dd0a4dafb48ec64d +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)) = 4c9bf9512682b995722660a4196c0013228e2049 +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)) = bf96a202a09a312ae005cd312fc06ff4d2c166ce +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 +# grep -v -e '^$' -e '^#' moby/vendor.conf | sort | awk '{print "Provides: bundled(golang("$1")) = "$2}' +Provides: bundled(golang(cloud.google.com/go)) = ceeb313ad77b789a7fa5287b36a1d127b69b7093 +Provides: bundled(golang(code.cloudfoundry.org/clock)) = 02e53af36e6c978af692887ed449b74026d76fec +Provides: bundled(golang(github.com/armon/go-metrics)) = eb0af217e5e9747e41dd5303755356b62d28e3ec +Provides: bundled(golang(github.com/armon/go-radix)) = e39d623f12e8e41c7b5529e9a9dd67a1e2261f80 +Provides: bundled(golang(github.com/aws/aws-sdk-go)) = 2590bc875c54c9fda225d8e4e56a9d28d90c6a47 +Provides: bundled(golang(github.com/Azure/go-ansiterm)) = d6e3b3328b783f23731bc4d058875b0371ff8109 +Provides: bundled(golang(github.com/beorn7/perks)) = 37c8de3658fcb183f997c4e13e8337516ab753e6 +Provides: bundled(golang(github.com/bsphere/le_go)) = 7a984a84b5492ae539b79b62fb4a10afc63c7bcf +Provides: bundled(golang(github.com/BurntSushi/toml)) = 3012a1dbe2e4bd1391d42b32f0577cb7bbc7f005 +Provides: bundled(golang(github.com/cespare/xxhash/v2)) = d7df74196a9e781ede915320c11c378c1b2f3a1f +Provides: bundled(golang(github.com/cilium/ebpf)) = 1c8d4c9ef7759622653a1d319284a44652333b28 +Provides: bundled(golang(github.com/cloudflare/cfssl)) = 5d63dbd981b5c408effbb58c442d54761ff94fbd +Provides: bundled(golang(github.com/containerd/cgroups)) = 0b889c03f102012f1d93a97ddd3ef71cd6f4f510 +Provides: bundled(golang(github.com/containerd/console)) = 5d7e1412f07b502a01029ea20e20e0d2be31fa7c +Provides: bundled(golang(github.com/containerd/containerd)) = e048c115a3a89caf63941d363858e207c28bccd6 +Provides: bundled(golang(github.com/containerd/continuity)) = efbc4488d8fe1bdc16bde3b2d2990d9b3a899165 +Provides: bundled(golang(github.com/containerd/fifo)) = 0724c46b320cf96bb172a0550c19a4b1fca4dacb +Provides: bundled(golang(github.com/containerd/go-runc)) = 16b287bc67d069a60fa48db15f330b790b74365b +Provides: bundled(golang(github.com/containerd/ttrpc)) = bfba540dc45464586c106b1f31c8547933c1eb41 +Provides: bundled(golang(github.com/containerd/typeurl)) = cd3ce7159eae562a4f60ceff37dada11a939d247 +Provides: bundled(golang(github.com/coreos/etcd)) = d57e8b8d97adfc4a6c224fe116714bf1a1f3beb9 +Provides: bundled(golang(github.com/coreos/go-semver)) = 8ab6407b697782a06568d4b7f1db25550ec2e4c6 +Provides: bundled(golang(github.com/coreos/go-systemd)) = 39ca1b05acc7ad1220e09f133283b8859a8b71ab +Provides: bundled(golang(github.com/coreos/go-systemd/v22)) = 2d78030078ef61b3cae27f42ad6d0e46db51b339 +Provides: bundled(golang(github.com/coreos/pkg)) = 3ac0863d7acf3bc44daf49afef8919af12f704ef +Provides: bundled(golang(github.com/creack/pty)) = 2a38352e8b4d7ab6c336eef107e42a55e72e7fbc +Provides: bundled(golang(github.com/cyphar/filepath-securejoin)) = a261ee33d7a517f054effbf451841abaafe3e0fd +Provides: bundled(golang(github.com/deckarep/golang-set)) = ef32fa3046d9f249d399f98ebaf9be944430fd1d +Provides: bundled(golang(github.com/docker/distribution)) = 58f99e93b767ebacbf8e62a9074844712d31a177 +Provides: bundled(golang(github.com/docker/go-connections)) = 7395e3f8aa162843a74ed6d48e79627d9792ac55 +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/libkv)) = 458977154600b9f23984d9f4b82e79570b5ae12b +Provides: bundled(golang(github.com/docker/libnetwork)) = 64b7a4574d1426139437d20e81c0b6d391130ec8 +Provides: bundled(golang(github.com/docker/libtrust)) = 9cbd2a1374f46905c68a4eb3694a130610adc62a +Provides: bundled(golang(github.com/docker/swarmkit)) = 286f4575a2d2853c1574e1be10eb1a2450692dfc +Provides: bundled(golang(github.com/fernet/fernet-go)) = 9eac43b88a5efb8651d24de9b68e87567e029736 +Provides: bundled(golang(github.com/fluent/fluent-logger-golang)) = 7a6c9dcd7f14c2ed5d8c55c11b894e5455ee311b +Provides: bundled(golang(github.com/fsnotify/fsnotify)) = 45d7d09e39ef4ac08d493309fa031790c15bfe8a +Provides: bundled(golang(github.com/godbus/dbus/v5)) = 37bf87eef99d69c4f1d3528bd66e3a87dc201472 +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/gddo)) = 72a348e765d293ed6d1ded7b699591f14d6cd921 +Provides: bundled(golang(github.com/golang/groupcache)) = 869f871628b6baa9cfbc11732cdf6546b17c1298 +Provides: bundled(golang(github.com/golang/protobuf)) = 84668698ea25b64748563aa20726db66a6b8d299 +Provides: bundled(golang(github.com/googleapis/gax-go)) = bd5b16380fd03dc758d11cef74ba2e3bc8b0e8c2 +Provides: bundled(golang(github.com/google/certificate-transparency-go)) = 37a384cd035e722ea46e55029093e26687138edf +Provides: bundled(golang(github.com/google/go-cmp)) = 3af367b6b30c263d47e8895973edcca9a49cf029 +Provides: bundled(golang(github.com/google/shlex)) = e7afc7fbc51079733e9468cdfd1efcd7d196cd1d +Provides: bundled(golang(github.com/google/uuid)) = 0cd6bf5da1e1c83f8b45653022c74f71af0538a4 +Provides: bundled(golang(github.com/gorilla/mux)) = 98cb6bf42e086f6af920b965c38cacc07402d51b +Provides: bundled(golang(github.com/Graylog2/go-gelf)) = 1550ee647df0510058c9d67a45c56f18911d80b8 +Provides: bundled(golang(github.com/grpc-ecosystem/go-grpc-middleware)) = 3c51f7f332123e8be5a157c0802a228ac85bf9db +Provides: bundled(golang(github.com/grpc-ecosystem/go-grpc-prometheus)) = c225b8c3b01faf2899099b768856a9e916e5087b +Provides: bundled(golang(github.com/grpc-ecosystem/grpc-opentracing)) = 8e809c8a86450a29b90dcc9efbf062d0fe6d9746 +Provides: bundled(golang(github.com/hashicorp/consul)) = 9a9cc9341bb487651a0399e3fc5e1e8a42e62dd9 +Provides: bundled(golang(github.com/hashicorp/errwrap)) = 8a6fb523712970c966eefc6b39ed2c5e74880354 +Provides: bundled(golang(github.com/hashicorp/go-immutable-radix)) = 826af9ccf0feeee615d546d69b11f8e98da8c8f1 +Provides: bundled(golang(github.com/hashicorp/golang-lru)) = 7f827b33c0f158ec5dfbba01bb0b14a4541fd81d +Provides: bundled(golang(github.com/hashicorp/go-memdb)) = cb9a474f84cc5e41b273b20c6927680b2a8776ad +Provides: bundled(golang(github.com/hashicorp/go-msgpack)) = 71c2886f5a673a35f909803f38ece5810165097b +Provides: bundled(golang(github.com/hashicorp/go-multierror)) = 886a7fbe3eb1c874d46f623bfa70af45f425b3d1 +Provides: bundled(golang(github.com/hashicorp/go-sockaddr)) = c7188e74f6acae5a989bdc959aa779f8b9f42faf +Provides: bundled(golang(github.com/hashicorp/memberlist)) = 3d8438da9589e7b608a83ffac1ef8211486bcb7c +Provides: bundled(golang(github.com/hashicorp/serf)) = 598c54895cc5a7b1a24a398d635e8c0ea0959870 +Provides: bundled(golang(github.com/imdario/mergo)) = 1afb36080aec31e0d1528973ebe6721b191b0369 +Provides: bundled(golang(github.com/inconshreveable/mousetrap)) = 76626ae9c91c4f2a10f34cad8ce83ea42c93bb75 +Provides: bundled(golang(github.com/ishidawataru/sctp)) = f2269e66cdee387bd321445d5d300893449805be +Provides: bundled(golang(github.com/jmespath/go-jmespath)) = 2d053f87d1d7f9f48196ae04cf3daea4273d207d +Provides: bundled(golang(github.com/matttproud/golang_protobuf_extensions)) = c12348ce28de40eed0136aa2b644d0ee0650e56c +Provides: bundled(golang(github.com/Microsoft/go-winio)) = 7e149e8c70409f36773c1b2cf3447a7ab7697368 +Provides: bundled(golang(github.com/Microsoft/hcsshim)) = 64a2b71405dacf76c95600f4c756a991ad09cf7c +Provides: bundled(golang(github.com/Microsoft/opengcs)) = a10967154e143a36014584a6f664344e3bb0aa64 +Provides: bundled(golang(github.com/miekg/dns)) = 6c0c4e6581f8e173cc562c8b3363ab984e4ae071 +Provides: bundled(golang(github.com/mistifyio/go-zfs)) = f784269be439d704d3dfa1906f45dd848fed2beb +Provides: bundled(golang(github.com/mitchellh/hashstructure)) = a38c50148365edc8df43c1580c48fb2b3a1e9cd7 +Provides: bundled(golang(github.com/moby/buildkit)) = bc07b2b81b1c6a62d29981ac564b16a15ce2bfa7 +Provides: bundled(golang(github.com/moby/ipvs)) = 4566ccea0e08d68e9614c3e7a64a23b850c4bb35 +Provides: bundled(golang(github.com/moby/locker)) = 281af2d563954745bea9d1487c965f24d30742fe +Provides: bundled(golang(github.com/moby/sys)) = 1bc8673b57550ddf85262eb0fed0aac651a37dab +Provides: bundled(golang(github.com/moby/term)) = bea5bbe245bf407372d477f1361d2ff042d2f556 +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)) = 67d2d5658fe0476ab9bf414cec164077ebff3920 +Provides: bundled(golang(github.com/opencontainers/runc)) = ff819c7e9184c13b7c2607fe6c30ae19403a7aff +Provides: bundled(golang(github.com/opencontainers/runtime-spec)) = 4d89ac9fbff6c455f46a5bb59c6b1bb7184a5e43 +Provides: bundled(golang(github.com/opencontainers/selinux)) = 2f45b3796d18f1ab4c9fc0c888a98d0a0fd6e429 +Provides: bundled(golang(github.com/opentracing-contrib/go-stdlib)) = 8a6ff1ad1691a29e4f7b5d46604f97634997c8c4 +Provides: bundled(golang(github.com/opentracing/opentracing-go)) = d34af3eaa63c4d08ab54863a4bdd0daa45212e12 +Provides: bundled(golang(github.com/philhofer/fwd)) = bb6d471dc95d4fe11e432687f8b70ff496cf3136 +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/RackSec/srslog)) = a4725f04ec91af1a91b380da679d6e0c2f061e59 +Provides: bundled(golang(github.com/samuel/go-zookeeper)) = d0e0d8e11f318e000a8cc434616d69e329edc374 +Provides: bundled(golang(github.com/sean-/seed)) = e2103e2c35297fb7e17febb81e49b312087a2372 +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/syndtr/gocapability)) = 42c35b4376354fd554efc7ad35e0b7f94e3a0ffb +Provides: bundled(golang(github.com/tchap/go-patricia)) = a7f0089c6f496e8e70402f61733606daa326cac5 +Provides: bundled(golang(github.com/tinylib/msgp)) = af6442a0fcf6e2a1b824f70dd0c734f01e817751 +Provides: bundled(golang(github.com/tonistiigi/fsutil)) = 0834f99b7b85462efb69b4f571a4fa3ca7da5ac9 +Provides: bundled(golang(github.com/tonistiigi/units)) = 6950e57a87eaf136bbe44ef2ec8e75b9e3569de2 +Provides: bundled(golang(github.com/ugorji/go)) = b4c50a2b199d93b13dc15e78929cfb23bfdf21ab +Provides: bundled(golang(github.com/vbatts/tar-split)) = 620714a4c508c880ac1bdda9c8370a2b19af1a55 +Provides: bundled(golang(github.com/vishvananda/netlink)) = f049be6f391489d3f374498fe0c8df8449258372 +Provides: bundled(golang(github.com/vishvananda/netns)) = db3c7e526aae966c4ccfa6c8189b693d6ac5d202 +Provides: bundled(golang(github.com/willf/bitset)) = 559910e8471e48d76d9e5a1ba15842dee77ad45d +Provides: bundled(golang(go.etcd.io/bbolt)) = 232d8fc87f50244f9c808f4745759e08a304c029 +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/text)) = 23ae387dee1f90d29a23c0e87ee0b46038fbed0e +Provides: bundled(golang(golang.org/x/time)) = 555d28b269f0569763d25dbe1a237ae74c6bcc82 +Provides: bundled(golang(google.golang.org/api)) = dec2ee309f5b09fc59bc40676447c15736284d78 +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(gotest.tools/v3)) = 568bc57cc5c19a2ef85e5749870b49a4cc2ab54d From 278973ba05de9dc1d7c73c52f7e1afa5741a68fe Mon Sep 17 00:00:00 2001 From: Maxwell G Date: Mon, 11 Apr 2022 19:01:54 -0500 Subject: [PATCH 052/163] Add script to generate bundled deps --- update.sh | 27 +++++++++++++++++++++++++++ 1 file changed, 27 insertions(+) create mode 100755 update.sh diff --git a/update.sh b/update.sh new file mode 100755 index 0000000..5481dba --- /dev/null +++ b/update.sh @@ -0,0 +1,27 @@ +#!/usr/bin/env bash +# SPDX-FileCopyrightText: 2022 Maxwell G (@gotmax23) +# SPDX-License-Identifier: MIT + +set -euo pipefail + +if command -v update.sh && [ "$#" -gt 0 ]; then + update.sh "$@" +fi + +version="$(rpmspec -q --srpm --qf '%{version}\n' *.spec)" + +cat << EOF > provides.spec.inc +# Bundled dependencies +Provides: bundled(tini-static) +Provides: bundled(golang(github.com/docker/docker)) +Provides: bundled(golang(github.com/docker/cli)) +# grep -v -e '^$' -e '^#' cli-${version}/vendor.conf | sort | awk '{print "Provides: bundled(golang("\$1")) = "\$2}' +EOF + +grep -v -e '^$' -e '^#' "cli-${version}/vendor.conf" | sort | awk '{print "Provides: bundled(golang("$1")) = "$2}' >> provides.spec.inc + +cat << EOF >> provides.spec.inc +# grep -v -e '^$' -e '^#' moby-${version}/vendor.conf | sort | awk '{print "Provides: bundled(golang("\$1")) = "\$2}' +EOF + +grep -v -e '^$' -e '^#' "moby-${version}/vendor.conf" | sort | awk '{print "Provides: bundled(golang("$1")) = "$2}' >> provides.spec.inc From 5a5cf68cadad062c89f775f2347643b8ec30b3ed Mon Sep 17 00:00:00 2001 From: Maxwell G Date: Mon, 11 Apr 2022 18:07:31 -0500 Subject: [PATCH 053/163] Update to 20.10.14. Fixes rhbz#2063052. Mitigate CVE-2022-24769. --- .gitignore | 2 ++ moby-engine.spec | 8 ++++++-- provides.spec.inc | 19 ++++++++++--------- sources | 4 ++-- 4 files changed, 20 insertions(+), 13 deletions(-) diff --git a/.gitignore b/.gitignore index 41df84d..6a47021 100644 --- a/.gitignore +++ b/.gitignore @@ -32,3 +32,5 @@ moby-v20.10.10.tar.gz /cli-20.10.12.tar.gz /moby-20.10.12.tar.gz /tini-de40ad0.tar.gz +/cli-20.10.14.tar.gz +/moby-20.10.14.tar.gz diff --git a/moby-engine.spec b/moby-engine.spec index 2f39a6b..d95f5db 100644 --- a/moby-engine.spec +++ b/moby-engine.spec @@ -31,8 +31,8 @@ %global shortcommit_tini %(c=%{commit_tini}; echo ${c:0:7}) Name: %{newname}-engine -Version: 20.10.12 -Release: 3%{?dist} +Version: 20.10.14 +Release: 1%{?dist} Summary: The open-source application container engine License: ASL 2.0 Source0: %{git_moby}/archive/v%{version}/moby-%{version}.tar.gz @@ -284,6 +284,10 @@ getent group %{service_name} >/dev/null || groupadd -r %{service_name} || : %{_datadir}/nano/Dockerfile.nanorc %changelog +* Mon Apr 11 2022 Maxwell G - 20.10.14-1 +- Update to 20.10.14. Fixes rhbz#2063052. +- Mitigate CVE-2022-24769. + * Mon Jan 31 2022 Maxwell G - 20.10.12-3 - Fixes FTBFS. Closes rhbz#2046748. - Use %%gobuild instead of Makefile to build binaries diff --git a/provides.spec.inc b/provides.spec.inc index 1a3cd04..6356210 100644 --- a/provides.spec.inc +++ b/provides.spec.inc @@ -2,7 +2,7 @@ Provides: bundled(tini-static) Provides: bundled(golang(github.com/docker/docker)) Provides: bundled(golang(github.com/docker/cli)) -# grep -v -e '^$' -e '^#' cli/vendor.conf | sort | awk '{print "Provides: bundled(golang("$1")) = "$2}' +# grep -v -e '^$' -e '^#' cli-20.10.14/vendor.conf | sort | awk '{print "Provides: bundled(golang("$1")) = "$2}' Provides: bundled(golang(cloud.google.com/go)) = ceeb313ad77b789a7fa5287b36a1d127b69b7093 Provides: bundled(golang(github.com/Azure/go-ansiterm)) = d185dfc1b5a126116ea5a19e148e29d16b4574c9 Provides: bundled(golang(github.com/beorn7/perks)) = 37c8de3658fcb183f997c4e13e8337516ab753e6 @@ -16,7 +16,7 @@ Provides: bundled(golang(github.com/coreos/etcd)) = d57e8b8d97adfc4a6c224f Provides: bundled(golang(github.com/cpuguy83/go-md2man/v2)) = b1ec32e02fe539480dc03e3bf381c20066e7c6cc 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/compose-on-kubernetes)) = 1f9b5b8cb6aca13deee947511801cf89447c1bfe Provides: bundled(golang(github.com/docker/distribution)) = 0d3efadf0154c2b8a4e7b6621fff9809655cc580 Provides: bundled(golang(github.com/docker/docker)) = b0f5bc36fea9dfb9672e1e9b1278ebab797b9ee0 Provides: bundled(golang(github.com/docker/docker-credential-helpers)) = fc9290adbcf1594e78910e2f0334090eaee0e1ee @@ -31,7 +31,6 @@ Provides: bundled(golang(github.com/fvbommel/sortorder)) = 26fad50c6b32a30 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 @@ -99,7 +98,7 @@ Provides: bundled(golang(k8s.io/klog)) = 4ad0115ba9e45c096d06a31d8dfb0e5bd Provides: bundled(golang(k8s.io/kube-openapi)) = 0270cf2f1c1d995d34b36019a6f65d58e6e33ad4 Provides: bundled(golang(k8s.io/utils)) = 69764acb6e8e900b7c05296c5d3c9c19545475f9 Provides: bundled(golang(sigs.k8s.io/yaml)) = fd68e9863619f6ec2fdd8625fe1f02e7c877e480 -# grep -v -e '^$' -e '^#' moby/vendor.conf | sort | awk '{print "Provides: bundled(golang("$1")) = "$2}' +# grep -v -e '^$' -e '^#' moby-20.10.14/vendor.conf | sort | awk '{print "Provides: bundled(golang("$1")) = "$2}' Provides: bundled(golang(cloud.google.com/go)) = ceeb313ad77b789a7fa5287b36a1d127b69b7093 Provides: bundled(golang(code.cloudfoundry.org/clock)) = 02e53af36e6c978af692887ed449b74026d76fec Provides: bundled(golang(github.com/armon/go-metrics)) = eb0af217e5e9747e41dd5303755356b62d28e3ec @@ -114,13 +113,13 @@ Provides: bundled(golang(github.com/cilium/ebpf)) = 1c8d4c9ef7759622653a1d Provides: bundled(golang(github.com/cloudflare/cfssl)) = 5d63dbd981b5c408effbb58c442d54761ff94fbd Provides: bundled(golang(github.com/containerd/cgroups)) = 0b889c03f102012f1d93a97ddd3ef71cd6f4f510 Provides: bundled(golang(github.com/containerd/console)) = 5d7e1412f07b502a01029ea20e20e0d2be31fa7c -Provides: bundled(golang(github.com/containerd/containerd)) = e048c115a3a89caf63941d363858e207c28bccd6 +Provides: bundled(golang(github.com/containerd/containerd)) = 7cfa023d95d37076d5ab035003d4839f4b6ba791 Provides: bundled(golang(github.com/containerd/continuity)) = efbc4488d8fe1bdc16bde3b2d2990d9b3a899165 Provides: bundled(golang(github.com/containerd/fifo)) = 0724c46b320cf96bb172a0550c19a4b1fca4dacb Provides: bundled(golang(github.com/containerd/go-runc)) = 16b287bc67d069a60fa48db15f330b790b74365b Provides: bundled(golang(github.com/containerd/ttrpc)) = bfba540dc45464586c106b1f31c8547933c1eb41 Provides: bundled(golang(github.com/containerd/typeurl)) = cd3ce7159eae562a4f60ceff37dada11a939d247 -Provides: bundled(golang(github.com/coreos/etcd)) = d57e8b8d97adfc4a6c224fe116714bf1a1f3beb9 +Provides: bundled(golang(github.com/coreos/etcd)) = 973882f697a8db3d59815bf132c6c506434334bd Provides: bundled(golang(github.com/coreos/go-semver)) = 8ab6407b697782a06568d4b7f1db25550ec2e4c6 Provides: bundled(golang(github.com/coreos/go-systemd)) = 39ca1b05acc7ad1220e09f133283b8859a8b71ab Provides: bundled(golang(github.com/coreos/go-systemd/v22)) = 2d78030078ef61b3cae27f42ad6d0e46db51b339 @@ -128,7 +127,7 @@ Provides: bundled(golang(github.com/coreos/pkg)) = 3ac0863d7acf3bc44daf49a Provides: bundled(golang(github.com/creack/pty)) = 2a38352e8b4d7ab6c336eef107e42a55e72e7fbc Provides: bundled(golang(github.com/cyphar/filepath-securejoin)) = a261ee33d7a517f054effbf451841abaafe3e0fd Provides: bundled(golang(github.com/deckarep/golang-set)) = ef32fa3046d9f249d399f98ebaf9be944430fd1d -Provides: bundled(golang(github.com/docker/distribution)) = 58f99e93b767ebacbf8e62a9074844712d31a177 +Provides: bundled(golang(github.com/docker/distribution)) = dcf66392d606f50bf3a9286dcb4bdcdfb7c0e83a Provides: bundled(golang(github.com/docker/go-connections)) = 7395e3f8aa162843a74ed6d48e79627d9792ac55 Provides: bundled(golang(github.com/docker/go-events)) = e31b211e4f1cd09aa76fe4ac244571fab96ae47f Provides: bundled(golang(github.com/docker/go-metrics)) = b619b3592b65de4f087d9f16863a7e6ff905973c @@ -138,7 +137,7 @@ Provides: bundled(golang(github.com/docker/libnetwork)) = 64b7a4574d142613 Provides: bundled(golang(github.com/docker/libtrust)) = 9cbd2a1374f46905c68a4eb3694a130610adc62a Provides: bundled(golang(github.com/docker/swarmkit)) = 286f4575a2d2853c1574e1be10eb1a2450692dfc Provides: bundled(golang(github.com/fernet/fernet-go)) = 9eac43b88a5efb8651d24de9b68e87567e029736 -Provides: bundled(golang(github.com/fluent/fluent-logger-golang)) = 7a6c9dcd7f14c2ed5d8c55c11b894e5455ee311b +Provides: bundled(golang(github.com/fluent/fluent-logger-golang)) = 0b652e850a9140d0b1db6390d8925d0601e952db Provides: bundled(golang(github.com/fsnotify/fsnotify)) = 45d7d09e39ef4ac08d493309fa031790c15bfe8a Provides: bundled(golang(github.com/godbus/dbus/v5)) = 37bf87eef99d69c4f1d3528bd66e3a87dc201472 Provides: bundled(golang(github.com/gofrs/flock)) = 6caa7350c26b838538005fae7dbee4e69d9398db @@ -171,6 +170,7 @@ Provides: bundled(golang(github.com/imdario/mergo)) = 1afb36080aec31e0d152 Provides: bundled(golang(github.com/inconshreveable/mousetrap)) = 76626ae9c91c4f2a10f34cad8ce83ea42c93bb75 Provides: bundled(golang(github.com/ishidawataru/sctp)) = f2269e66cdee387bd321445d5d300893449805be Provides: bundled(golang(github.com/jmespath/go-jmespath)) = 2d053f87d1d7f9f48196ae04cf3daea4273d207d +Provides: bundled(golang(github.com/json-iterator/go)) = a1ca0830781e007c66b225121d2cdb3a649421f6 Provides: bundled(golang(github.com/matttproud/golang_protobuf_extensions)) = c12348ce28de40eed0136aa2b644d0ee0650e56c Provides: bundled(golang(github.com/Microsoft/go-winio)) = 7e149e8c70409f36773c1b2cf3447a7ab7697368 Provides: bundled(golang(github.com/Microsoft/hcsshim)) = 64a2b71405dacf76c95600f4c756a991ad09cf7c @@ -183,6 +183,8 @@ Provides: bundled(golang(github.com/moby/ipvs)) = 4566ccea0e08d68e9614c3e7 Provides: bundled(golang(github.com/moby/locker)) = 281af2d563954745bea9d1487c965f24d30742fe 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)) = 94122c33edd36123c84d5368cfb2b69df93a0ec8 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)) = 67d2d5658fe0476ab9bf414cec164077ebff3920 @@ -208,7 +210,6 @@ Provides: bundled(golang(github.com/tchap/go-patricia)) = a7f0089c6f496e8e Provides: bundled(golang(github.com/tinylib/msgp)) = af6442a0fcf6e2a1b824f70dd0c734f01e817751 Provides: bundled(golang(github.com/tonistiigi/fsutil)) = 0834f99b7b85462efb69b4f571a4fa3ca7da5ac9 Provides: bundled(golang(github.com/tonistiigi/units)) = 6950e57a87eaf136bbe44ef2ec8e75b9e3569de2 -Provides: bundled(golang(github.com/ugorji/go)) = b4c50a2b199d93b13dc15e78929cfb23bfdf21ab Provides: bundled(golang(github.com/vbatts/tar-split)) = 620714a4c508c880ac1bdda9c8370a2b19af1a55 Provides: bundled(golang(github.com/vishvananda/netlink)) = f049be6f391489d3f374498fe0c8df8449258372 Provides: bundled(golang(github.com/vishvananda/netns)) = db3c7e526aae966c4ccfa6c8189b693d6ac5d202 diff --git a/sources b/sources index 0067477..7313a2a 100644 --- a/sources +++ b/sources @@ -1,3 +1,3 @@ -SHA512 (cli-20.10.12.tar.gz) = ac7c997f5751f2e34b9bcb9f026d3d0c2cd58c32a13e9255536b0eb0d7eabd81c42f2d608c0fe7725322b619f2360818b08379e847d598dd0bec570602ad224f -SHA512 (moby-20.10.12.tar.gz) = f4122c8cbc67e6b7703856dc76d6f15d7fab1b2001d4916b89958d5319c16d8b8445881841ef4804e8d47d64694184aec1be93e22d7baceb021c4a99c2c03753 +SHA512 (cli-20.10.14.tar.gz) = f8b7f1040eccd404e39ec33bcef8bb8423636b0695af65f84c0612e77223844892d219f82cfbb99ccd5326e228f8af27be1870d90ebace77810ea5fce9f86e4a +SHA512 (moby-20.10.14.tar.gz) = 94ee555337aaf96bb95ce8cbe8fe1d9c8b87fcd4f256d2af5082fc47915f7576882929c1211ef7fba0c754097bdef5e6df59abbdf77456d3babe139f4353ed21 SHA512 (tini-de40ad0.tar.gz) = 6e21fbcc8ab0daf2f2ac407f8d85373d2873d4b1e7d010056e4dd7071183fe1ede9dadf116c520e68a6226d5eb9d5ede383729327630600ed85080c1586bf3bb From b1b323b058cd8552134a0667f6127318d36dfe5e Mon Sep 17 00:00:00 2001 From: Maxwell G Date: Sat, 16 Apr 2022 19:51:19 +0300 Subject: [PATCH 054/163] Fix cmake invocation --- moby-engine.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/moby-engine.spec b/moby-engine.spec index d95f5db..e7b5438 100644 --- a/moby-engine.spec +++ b/moby-engine.spec @@ -161,7 +161,7 @@ mkdir -p _build/bin # build tini (installed as %%{service_name}-init) ( cd tini-%{commit_tini} - %cmake . + %cmake make tini-static -C "%{__cmake_builddir}" ) From 9edfbc28efd8387f1625c7fb5ca402ce504dd3cb Mon Sep 17 00:00:00 2001 From: Maxwell G Date: Sun, 8 May 2022 15:14:10 -0500 Subject: [PATCH 055/163] Fix update.sh --- update.sh | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/update.sh b/update.sh index 5481dba..59fb062 100755 --- a/update.sh +++ b/update.sh @@ -8,6 +8,8 @@ if command -v update.sh && [ "$#" -gt 0 ]; then update.sh "$@" fi +fedpkg prep + version="$(rpmspec -q --srpm --qf '%{version}\n' *.spec)" cat << EOF > provides.spec.inc @@ -18,10 +20,15 @@ Provides: bundled(golang(github.com/docker/cli)) # grep -v -e '^$' -e '^#' cli-${version}/vendor.conf | sort | awk '{print "Provides: bundled(golang("\$1")) = "\$2}' EOF -grep -v -e '^$' -e '^#' "cli-${version}/vendor.conf" | sort | awk '{print "Provides: bundled(golang("$1")) = "$2}' >> provides.spec.inc +grep -v -e '^$' -e '^#' "moby-${version}/cli-${version}/vendor.conf" | sort | awk '{print "Provides: bundled(golang("$1")) = "$2}' >> provides.spec.inc cat << EOF >> provides.spec.inc # grep -v -e '^$' -e '^#' moby-${version}/vendor.conf | sort | awk '{print "Provides: bundled(golang("\$1")) = "\$2}' EOF grep -v -e '^$' -e '^#' "moby-${version}/vendor.conf" | sort | awk '{print "Provides: bundled(golang("$1")) = "$2}' >> provides.spec.inc + +if command -v update.sh && [ "$#" -gt 0 ]; then + git add --update + git commit --gpgsign --amend --no-edit +fi From c088e16e434124bba15c9f10d7620c1973823fa7 Mon Sep 17 00:00:00 2001 From: Maxwell G Date: Sun, 8 May 2022 15:14:34 -0500 Subject: [PATCH 056/163] Update to 20.10.15 (rhbz#2082501). Fix BUILDTAGS (rhbz#2082924). Make non-binary subpackages noarch. --- .gitignore | 2 ++ moby-engine.spec | 20 ++++++++++++++++---- provides.spec.inc | 18 +++++++++--------- sources | 4 ++-- 4 files changed, 29 insertions(+), 15 deletions(-) diff --git a/.gitignore b/.gitignore index 6a47021..3783ab1 100644 --- a/.gitignore +++ b/.gitignore @@ -34,3 +34,5 @@ moby-v20.10.10.tar.gz /tini-de40ad0.tar.gz /cli-20.10.14.tar.gz /moby-20.10.14.tar.gz +/cli-20.10.15.tar.gz +/moby-20.10.15.tar.gz diff --git a/moby-engine.spec b/moby-engine.spec index e7b5438..161a63f 100644 --- a/moby-engine.spec +++ b/moby-engine.spec @@ -31,7 +31,7 @@ %global shortcommit_tini %(c=%{commit_tini}; echo ${c:0:7}) Name: %{newname}-engine -Version: 20.10.14 +Version: 20.10.15 Release: 1%{?dist} Summary: The open-source application container engine License: ASL 2.0 @@ -107,6 +107,7 @@ depending on a particular stack or provider. %package fish-completion Summary: Fish completion files for %{name} +BuildArch: noarch Requires: %{name} = %{version}-%{release} Requires: fish Conflicts: %{service_name}-fish-completion @@ -118,6 +119,7 @@ This package installs %{summary}. %package zsh-completion Summary: Zsh completion files for %{name} +BuildArch: noarch Requires: %{name} = %{version}-%{release} Requires: zsh Conflicts: %{service_name}-zsh-completion @@ -129,6 +131,7 @@ This package installs %{summary}. %package nano Summary: GNU nano syntax highlighting files for Moby +BuildArch: noarch Requires: %{name} = %{version}-%{release} Requires: nano @@ -136,15 +139,15 @@ Requires: nano This package installs %{summary}. %prep -%autosetup -p1 -n moby-%{version} +%setup -q -a 1 -a 2 -n moby-%{version} # untar cli -tar zxf %{SOURCE1} +#setup -q -T -D -a 1 -n moby-%{version} # correct rpmlint errors for bash completion sed -i '/env bash/d' cli-%{version}/contrib/completion/bash/docker # untar tini -tar zxf %{SOURCE2} +#setup -q -T -D -a 2 -n moby-%{version} %build mkdir -p _build/bin @@ -180,6 +183,8 @@ mkdir -p _build/bin export LDFLAGS+=" -X github.com/docker/docker/dockerversion.IAmStatic=false" export LDFLAGS+=" -X 'github.com/docker/docker/dockerversion.BuildTime=%{buildtime}'" export DOCKER_BUILDTAGS="seccomp selinux journald" + export BUILDTAGS="${DOCKER_BUILDTAGS}" + export GOBUILDTAGS="${BUILDTAGS}" %gobuild -o _build/bin/%{service_name}d %{goipath_moby}/cmd/%{service_name}d # VERSION=%%{version} DOCKER_GITCOMMIT=%%{shortcommit_moby} bash sh dynbinary # mv bundles/dynbinary-daemon/dockerd-%{version} _build/bin/dockerd @@ -201,6 +206,8 @@ mkdir -p _build/bin -X \"github.com/docker/cli/cli/version.BuildTime=%{buildtime}\" \ -X \"github.com/docker/cli/cli/version.Version=%{version}\" \ " + export BUILDTAGS="pkcs11" + export GOBUILDTAGS="${BUILDTAGS}" %gobuild -o ../_build/bin/%{service_name} %{goipath_cli}/cmd/%{service_name} # make VERSION=%%{version} GITCOMMIT=%%{shortcommit_cli} dynbinary man/md2man-all.sh @@ -284,6 +291,11 @@ getent group %{service_name} >/dev/null || groupadd -r %{service_name} || : %{_datadir}/nano/Dockerfile.nanorc %changelog +* Sat May 07 2022 Maxwell G - 20.10.15-1 +- Update to 20.10.15 (rhbz#2082501). +- Fix BUILDTAGS (rhbz#2082924). +- Make non-binary subpackages noarch. + * Mon Apr 11 2022 Maxwell G - 20.10.14-1 - Update to 20.10.14. Fixes rhbz#2063052. - Mitigate CVE-2022-24769. diff --git a/provides.spec.inc b/provides.spec.inc index 6356210..2049406 100644 --- a/provides.spec.inc +++ b/provides.spec.inc @@ -2,7 +2,7 @@ Provides: bundled(tini-static) Provides: bundled(golang(github.com/docker/docker)) Provides: bundled(golang(github.com/docker/cli)) -# grep -v -e '^$' -e '^#' cli-20.10.14/vendor.conf | sort | awk '{print "Provides: bundled(golang("$1")) = "$2}' +# grep -v -e '^$' -e '^#' cli-20.10.15/vendor.conf | sort | awk '{print "Provides: bundled(golang("$1")) = "$2}' Provides: bundled(golang(cloud.google.com/go)) = ceeb313ad77b789a7fa5287b36a1d127b69b7093 Provides: bundled(golang(github.com/Azure/go-ansiterm)) = d185dfc1b5a126116ea5a19e148e29d16b4574c9 Provides: bundled(golang(github.com/beorn7/perks)) = 37c8de3658fcb183f997c4e13e8337516ab753e6 @@ -17,8 +17,8 @@ Provides: bundled(golang(github.com/cpuguy83/go-md2man/v2)) = b1ec32e02fe5 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)) = 1f9b5b8cb6aca13deee947511801cf89447c1bfe -Provides: bundled(golang(github.com/docker/distribution)) = 0d3efadf0154c2b8a4e7b6621fff9809655cc580 -Provides: bundled(golang(github.com/docker/docker)) = b0f5bc36fea9dfb9672e1e9b1278ebab797b9ee0 +Provides: bundled(golang(github.com/docker/distribution)) = b5ca020cfbe998e5af3457fda087444cf5116496 +Provides: bundled(golang(github.com/docker/docker)) = 87a90dc786bda134c9eb02adbae2c6a7342fb7f6 Provides: bundled(golang(github.com/docker/docker-credential-helpers)) = fc9290adbcf1594e78910e2f0334090eaee0e1ee Provides: bundled(golang(github.com/docker/go-connections)) = 7395e3f8aa162843a74ed6d48e79627d9792ac55 Provides: bundled(golang(github.com/docker/go)) = d30aec9fd63c35133f8f79c3412ad91a3b08be06 @@ -58,7 +58,7 @@ Provides: bundled(golang(github.com/modern-go/concurrent)) = bacd9c7ef1dd9 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/image-spec)) = 67d2d5658fe0476ab9bf414cec164077ebff3920 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 @@ -98,7 +98,7 @@ Provides: bundled(golang(k8s.io/klog)) = 4ad0115ba9e45c096d06a31d8dfb0e5bd Provides: bundled(golang(k8s.io/kube-openapi)) = 0270cf2f1c1d995d34b36019a6f65d58e6e33ad4 Provides: bundled(golang(k8s.io/utils)) = 69764acb6e8e900b7c05296c5d3c9c19545475f9 Provides: bundled(golang(sigs.k8s.io/yaml)) = fd68e9863619f6ec2fdd8625fe1f02e7c877e480 -# grep -v -e '^$' -e '^#' moby-20.10.14/vendor.conf | sort | awk '{print "Provides: bundled(golang("$1")) = "$2}' +# grep -v -e '^$' -e '^#' moby-20.10.15/vendor.conf | sort | awk '{print "Provides: bundled(golang("$1")) = "$2}' Provides: bundled(golang(cloud.google.com/go)) = ceeb313ad77b789a7fa5287b36a1d127b69b7093 Provides: bundled(golang(code.cloudfoundry.org/clock)) = 02e53af36e6c978af692887ed449b74026d76fec Provides: bundled(golang(github.com/armon/go-metrics)) = eb0af217e5e9747e41dd5303755356b62d28e3ec @@ -127,15 +127,15 @@ Provides: bundled(golang(github.com/coreos/pkg)) = 3ac0863d7acf3bc44daf49a Provides: bundled(golang(github.com/creack/pty)) = 2a38352e8b4d7ab6c336eef107e42a55e72e7fbc Provides: bundled(golang(github.com/cyphar/filepath-securejoin)) = a261ee33d7a517f054effbf451841abaafe3e0fd Provides: bundled(golang(github.com/deckarep/golang-set)) = ef32fa3046d9f249d399f98ebaf9be944430fd1d -Provides: bundled(golang(github.com/docker/distribution)) = dcf66392d606f50bf3a9286dcb4bdcdfb7c0e83a +Provides: bundled(golang(github.com/docker/distribution)) = b5ca020cfbe998e5af3457fda087444cf5116496 Provides: bundled(golang(github.com/docker/go-connections)) = 7395e3f8aa162843a74ed6d48e79627d9792ac55 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/libkv)) = 458977154600b9f23984d9f4b82e79570b5ae12b -Provides: bundled(golang(github.com/docker/libnetwork)) = 64b7a4574d1426139437d20e81c0b6d391130ec8 +Provides: bundled(golang(github.com/docker/libnetwork)) = 339b972b464ee3d401b5788b2af9e31d09d6b7da Provides: bundled(golang(github.com/docker/libtrust)) = 9cbd2a1374f46905c68a4eb3694a130610adc62a -Provides: bundled(golang(github.com/docker/swarmkit)) = 286f4575a2d2853c1574e1be10eb1a2450692dfc +Provides: bundled(golang(github.com/docker/swarmkit)) = cf1e0f8d95ee37ea1f9a5f8a54c73c1e0fa58a54 Provides: bundled(golang(github.com/fernet/fernet-go)) = 9eac43b88a5efb8651d24de9b68e87567e029736 Provides: bundled(golang(github.com/fluent/fluent-logger-golang)) = 0b652e850a9140d0b1db6390d8925d0601e952db Provides: bundled(golang(github.com/fsnotify/fsnotify)) = 45d7d09e39ef4ac08d493309fa031790c15bfe8a @@ -219,7 +219,7 @@ Provides: bundled(golang(golang.org/x/crypto)) = c1f2f97bffc9c53fc40a1a28a 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/sys)) = 63515b42dcdf9544f4e6a02fd7632793fde2f72d Provides: bundled(golang(golang.org/x/text)) = 23ae387dee1f90d29a23c0e87ee0b46038fbed0e Provides: bundled(golang(golang.org/x/time)) = 555d28b269f0569763d25dbe1a237ae74c6bcc82 Provides: bundled(golang(google.golang.org/api)) = dec2ee309f5b09fc59bc40676447c15736284d78 diff --git a/sources b/sources index 7313a2a..6b0d2f8 100644 --- a/sources +++ b/sources @@ -1,3 +1,3 @@ -SHA512 (cli-20.10.14.tar.gz) = f8b7f1040eccd404e39ec33bcef8bb8423636b0695af65f84c0612e77223844892d219f82cfbb99ccd5326e228f8af27be1870d90ebace77810ea5fce9f86e4a -SHA512 (moby-20.10.14.tar.gz) = 94ee555337aaf96bb95ce8cbe8fe1d9c8b87fcd4f256d2af5082fc47915f7576882929c1211ef7fba0c754097bdef5e6df59abbdf77456d3babe139f4353ed21 +SHA512 (cli-20.10.15.tar.gz) = ccf405129f4447af9b73d068d47ffc13deb2711bed24a53122f762d7a12bd4716cf74ac069b0597e4931a18842c5d0bbd6a7f28ec1331873b83e4bd575da3a2c +SHA512 (moby-20.10.15.tar.gz) = df827e6c5695a32cbafedc0cd77df3f86a4b9a4f6f54403896d4360a172e319e0bb5bc8f26688e62d8540089c32630fc2407ddb25a3e70dea25ed134f4bdf955 SHA512 (tini-de40ad0.tar.gz) = 6e21fbcc8ab0daf2f2ac407f8d85373d2873d4b1e7d010056e4dd7071183fe1ede9dadf116c520e68a6226d5eb9d5ede383729327630600ed85080c1586bf3bb From 642119b4ac379be093ad6e313b83a625154c02a7 Mon Sep 17 00:00:00 2001 From: Maxwell G Date: Sun, 8 May 2022 15:26:03 -0500 Subject: [PATCH 057/163] Update commit hashes. --- moby-engine.spec | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) diff --git a/moby-engine.spec b/moby-engine.spec index 161a63f..5835bc2 100644 --- a/moby-engine.spec +++ b/moby-engine.spec @@ -16,13 +16,13 @@ # moby %global goipath_moby github.com/%{service_name}/%{service_name} %global git_moby https://%{goipath_moby} -%global commit_moby e2f740de442bac52b280bc485a3ca5b31567d938 +%global commit_moby 4433bf67ba0a3f686ffffce04d0709135e0b37eb %global shortcommit_moby %(c=%{commit_moby}; echo ${c:0:7}) # cli %global goipath_cli github.com/%{origname}/cli %global git_cli https://%{goipath_cli} -%global commit_cli 485636f4b90ed5a91a1f403e65ffced469c641a +%global commit_cli fd82621d35d2d9662854c8351976d5cc1e4186ce %global shortcommit_cli %(c=%{commit_cli}; echo ${c:0:7}) # tini @@ -141,13 +141,9 @@ This package installs %{summary}. %prep %setup -q -a 1 -a 2 -n moby-%{version} -# untar cli -#setup -q -T -D -a 1 -n moby-%{version} # correct rpmlint errors for bash completion sed -i '/env bash/d' cli-%{version}/contrib/completion/bash/docker -# untar tini -#setup -q -T -D -a 2 -n moby-%{version} %build mkdir -p _build/bin From aec27ef308a272d4e0d0fd83390499e078dc95a3 Mon Sep 17 00:00:00 2001 From: Maxwell G Date: Thu, 12 May 2022 20:34:45 -0500 Subject: [PATCH 058/163] Update to 20.10.16. --- .gitignore | 2 ++ moby-engine.spec | 9 ++++++--- provides.spec.inc | 12 ++++++------ sources | 4 ++-- update.sh | 2 +- 5 files changed, 17 insertions(+), 12 deletions(-) diff --git a/.gitignore b/.gitignore index 3783ab1..ad44ba4 100644 --- a/.gitignore +++ b/.gitignore @@ -36,3 +36,5 @@ moby-v20.10.10.tar.gz /moby-20.10.14.tar.gz /cli-20.10.15.tar.gz /moby-20.10.15.tar.gz +/cli-20.10.16.tar.gz +/moby-20.10.16.tar.gz diff --git a/moby-engine.spec b/moby-engine.spec index 5835bc2..227f160 100644 --- a/moby-engine.spec +++ b/moby-engine.spec @@ -16,13 +16,13 @@ # moby %global goipath_moby github.com/%{service_name}/%{service_name} %global git_moby https://%{goipath_moby} -%global commit_moby 4433bf67ba0a3f686ffffce04d0709135e0b37eb +%global commit_moby f756502055d2e36a84f2068e6620bea5ecf09058 %global shortcommit_moby %(c=%{commit_moby}; echo ${c:0:7}) # cli %global goipath_cli github.com/%{origname}/cli %global git_cli https://%{goipath_cli} -%global commit_cli fd82621d35d2d9662854c8351976d5cc1e4186ce +%global commit_cli aa7e414fdcb23a66e8fabbef0a560ef1769eace5 %global shortcommit_cli %(c=%{commit_cli}; echo ${c:0:7}) # tini @@ -31,7 +31,7 @@ %global shortcommit_tini %(c=%{commit_tini}; echo ${c:0:7}) Name: %{newname}-engine -Version: 20.10.15 +Version: 20.10.16 Release: 1%{?dist} Summary: The open-source application container engine License: ASL 2.0 @@ -287,6 +287,9 @@ getent group %{service_name} >/dev/null || groupadd -r %{service_name} || : %{_datadir}/nano/Dockerfile.nanorc %changelog +* Fri May 13 2022 Maxwell G - 20.10.16-1 +- Update to 20.10.16. + * Sat May 07 2022 Maxwell G - 20.10.15-1 - Update to 20.10.15 (rhbz#2082501). - Fix BUILDTAGS (rhbz#2082924). diff --git a/provides.spec.inc b/provides.spec.inc index 2049406..3d5d915 100644 --- a/provides.spec.inc +++ b/provides.spec.inc @@ -2,7 +2,7 @@ Provides: bundled(tini-static) Provides: bundled(golang(github.com/docker/docker)) Provides: bundled(golang(github.com/docker/cli)) -# grep -v -e '^$' -e '^#' cli-20.10.15/vendor.conf | sort | awk '{print "Provides: bundled(golang("$1")) = "$2}' +# grep -v -e '^$' -e '^#' cli-20.10.16/vendor.conf | sort | awk '{print "Provides: bundled(golang("$1")) = "$2}' Provides: bundled(golang(cloud.google.com/go)) = ceeb313ad77b789a7fa5287b36a1d127b69b7093 Provides: bundled(golang(github.com/Azure/go-ansiterm)) = d185dfc1b5a126116ea5a19e148e29d16b4574c9 Provides: bundled(golang(github.com/beorn7/perks)) = 37c8de3658fcb183f997c4e13e8337516ab753e6 @@ -81,7 +81,7 @@ Provides: bundled(golang(golang.org/x/crypto)) = c1f2f97bffc9c53fc40a1a28a 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/sys)) = 33da011f77ade50ff5b6a6fb4a9a1e6d6b285809 Provides: bundled(golang(golang.org/x/term)) = f5c789dd3221ff39d752ac54467d762de7cfbec6 Provides: bundled(golang(golang.org/x/text)) = 23ae387dee1f90d29a23c0e87ee0b46038fbed0e Provides: bundled(golang(golang.org/x/time)) = 555d28b269f0569763d25dbe1a237ae74c6bcc82 @@ -98,7 +98,7 @@ Provides: bundled(golang(k8s.io/klog)) = 4ad0115ba9e45c096d06a31d8dfb0e5bd Provides: bundled(golang(k8s.io/kube-openapi)) = 0270cf2f1c1d995d34b36019a6f65d58e6e33ad4 Provides: bundled(golang(k8s.io/utils)) = 69764acb6e8e900b7c05296c5d3c9c19545475f9 Provides: bundled(golang(sigs.k8s.io/yaml)) = fd68e9863619f6ec2fdd8625fe1f02e7c877e480 -# grep -v -e '^$' -e '^#' moby-20.10.15/vendor.conf | sort | awk '{print "Provides: bundled(golang("$1")) = "$2}' +# grep -v -e '^$' -e '^#' moby-20.10.16/vendor.conf | sort | awk '{print "Provides: bundled(golang("$1")) = "$2}' Provides: bundled(golang(cloud.google.com/go)) = ceeb313ad77b789a7fa5287b36a1d127b69b7093 Provides: bundled(golang(code.cloudfoundry.org/clock)) = 02e53af36e6c978af692887ed449b74026d76fec Provides: bundled(golang(github.com/armon/go-metrics)) = eb0af217e5e9747e41dd5303755356b62d28e3ec @@ -109,9 +109,9 @@ Provides: bundled(golang(github.com/beorn7/perks)) = 37c8de3658fcb183f997c Provides: bundled(golang(github.com/bsphere/le_go)) = 7a984a84b5492ae539b79b62fb4a10afc63c7bcf Provides: bundled(golang(github.com/BurntSushi/toml)) = 3012a1dbe2e4bd1391d42b32f0577cb7bbc7f005 Provides: bundled(golang(github.com/cespare/xxhash/v2)) = d7df74196a9e781ede915320c11c378c1b2f3a1f -Provides: bundled(golang(github.com/cilium/ebpf)) = 1c8d4c9ef7759622653a1d319284a44652333b28 +Provides: bundled(golang(github.com/cilium/ebpf)) = 32458a752e0bcbc670691625f84e7ef6aef5655d Provides: bundled(golang(github.com/cloudflare/cfssl)) = 5d63dbd981b5c408effbb58c442d54761ff94fbd -Provides: bundled(golang(github.com/containerd/cgroups)) = 0b889c03f102012f1d93a97ddd3ef71cd6f4f510 +Provides: bundled(golang(github.com/containerd/cgroups)) = b9de8a2212026c07cec67baf3323f1fc0121e048 Provides: bundled(golang(github.com/containerd/console)) = 5d7e1412f07b502a01029ea20e20e0d2be31fa7c Provides: bundled(golang(github.com/containerd/containerd)) = 7cfa023d95d37076d5ab035003d4839f4b6ba791 Provides: bundled(golang(github.com/containerd/continuity)) = efbc4488d8fe1bdc16bde3b2d2990d9b3a899165 @@ -219,7 +219,7 @@ Provides: bundled(golang(golang.org/x/crypto)) = c1f2f97bffc9c53fc40a1a28a 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)) = 63515b42dcdf9544f4e6a02fd7632793fde2f72d +Provides: bundled(golang(golang.org/x/sys)) = 33da011f77ade50ff5b6a6fb4a9a1e6d6b285809 Provides: bundled(golang(golang.org/x/text)) = 23ae387dee1f90d29a23c0e87ee0b46038fbed0e Provides: bundled(golang(golang.org/x/time)) = 555d28b269f0569763d25dbe1a237ae74c6bcc82 Provides: bundled(golang(google.golang.org/api)) = dec2ee309f5b09fc59bc40676447c15736284d78 diff --git a/sources b/sources index 6b0d2f8..9973ffd 100644 --- a/sources +++ b/sources @@ -1,3 +1,3 @@ -SHA512 (cli-20.10.15.tar.gz) = ccf405129f4447af9b73d068d47ffc13deb2711bed24a53122f762d7a12bd4716cf74ac069b0597e4931a18842c5d0bbd6a7f28ec1331873b83e4bd575da3a2c -SHA512 (moby-20.10.15.tar.gz) = df827e6c5695a32cbafedc0cd77df3f86a4b9a4f6f54403896d4360a172e319e0bb5bc8f26688e62d8540089c32630fc2407ddb25a3e70dea25ed134f4bdf955 +SHA512 (cli-20.10.16.tar.gz) = 90451f71f16f3bd1410b13c5df256ef1f422dd5b9b75d63cf318ee91a07bcb3ddb2876d2fee81e835d8daaee48c4e010c2daf4373de1095e2075fed8ee5fe75e +SHA512 (moby-20.10.16.tar.gz) = 5fdf87f98a951af87a334a5a403e36b975ff6c4647d0656dde2bd763d27562c620346f3746adafa1439c205869c721a3bef750f8302734499423ca789218f85d SHA512 (tini-de40ad0.tar.gz) = 6e21fbcc8ab0daf2f2ac407f8d85373d2873d4b1e7d010056e4dd7071183fe1ede9dadf116c520e68a6226d5eb9d5ede383729327630600ed85080c1586bf3bb diff --git a/update.sh b/update.sh index 59fb062..6e6718c 100755 --- a/update.sh +++ b/update.sh @@ -30,5 +30,5 @@ grep -v -e '^$' -e '^#' "moby-${version}/vendor.conf" | sort | awk '{print "Prov if command -v update.sh && [ "$#" -gt 0 ]; then git add --update - git commit --gpgsign --amend --no-edit + git commit --gpg-sign --amend --no-edit fi From 9248a6df35094dec06a50ee433d2282954ee5151 Mon Sep 17 00:00:00 2001 From: Maxwell G Date: Fri, 10 Jun 2022 15:35:41 -0500 Subject: [PATCH 059/163] Update to 20.10.17. Fixes rhbz#2095714. --- .gitignore | 2 ++ moby-engine.spec | 5 ++++- provides.spec.inc | 8 ++++---- sources | 4 ++-- 4 files changed, 12 insertions(+), 7 deletions(-) diff --git a/.gitignore b/.gitignore index ad44ba4..0f887b7 100644 --- a/.gitignore +++ b/.gitignore @@ -38,3 +38,5 @@ moby-v20.10.10.tar.gz /moby-20.10.15.tar.gz /cli-20.10.16.tar.gz /moby-20.10.16.tar.gz +/cli-20.10.17.tar.gz +/moby-20.10.17.tar.gz diff --git a/moby-engine.spec b/moby-engine.spec index 227f160..f36a6a7 100644 --- a/moby-engine.spec +++ b/moby-engine.spec @@ -31,7 +31,7 @@ %global shortcommit_tini %(c=%{commit_tini}; echo ${c:0:7}) Name: %{newname}-engine -Version: 20.10.16 +Version: 20.10.17 Release: 1%{?dist} Summary: The open-source application container engine License: ASL 2.0 @@ -287,6 +287,9 @@ getent group %{service_name} >/dev/null || groupadd -r %{service_name} || : %{_datadir}/nano/Dockerfile.nanorc %changelog +* Fri Jun 10 2022 Maxwell G - 20.10.17-1 +- Update to 20.10.17. Fixes rhbz#2095714. + * Fri May 13 2022 Maxwell G - 20.10.16-1 - Update to 20.10.16. diff --git a/provides.spec.inc b/provides.spec.inc index 3d5d915..b5bae94 100644 --- a/provides.spec.inc +++ b/provides.spec.inc @@ -2,7 +2,7 @@ Provides: bundled(tini-static) Provides: bundled(golang(github.com/docker/docker)) Provides: bundled(golang(github.com/docker/cli)) -# grep -v -e '^$' -e '^#' cli-20.10.16/vendor.conf | sort | awk '{print "Provides: bundled(golang("$1")) = "$2}' +# grep -v -e '^$' -e '^#' cli-20.10.17/vendor.conf | sort | awk '{print "Provides: bundled(golang("$1")) = "$2}' Provides: bundled(golang(cloud.google.com/go)) = ceeb313ad77b789a7fa5287b36a1d127b69b7093 Provides: bundled(golang(github.com/Azure/go-ansiterm)) = d185dfc1b5a126116ea5a19e148e29d16b4574c9 Provides: bundled(golang(github.com/beorn7/perks)) = 37c8de3658fcb183f997c4e13e8337516ab753e6 @@ -98,7 +98,7 @@ Provides: bundled(golang(k8s.io/klog)) = 4ad0115ba9e45c096d06a31d8dfb0e5bd Provides: bundled(golang(k8s.io/kube-openapi)) = 0270cf2f1c1d995d34b36019a6f65d58e6e33ad4 Provides: bundled(golang(k8s.io/utils)) = 69764acb6e8e900b7c05296c5d3c9c19545475f9 Provides: bundled(golang(sigs.k8s.io/yaml)) = fd68e9863619f6ec2fdd8625fe1f02e7c877e480 -# grep -v -e '^$' -e '^#' moby-20.10.16/vendor.conf | sort | awk '{print "Provides: bundled(golang("$1")) = "$2}' +# grep -v -e '^$' -e '^#' moby-20.10.17/vendor.conf | sort | awk '{print "Provides: bundled(golang("$1")) = "$2}' Provides: bundled(golang(cloud.google.com/go)) = ceeb313ad77b789a7fa5287b36a1d127b69b7093 Provides: bundled(golang(code.cloudfoundry.org/clock)) = 02e53af36e6c978af692887ed449b74026d76fec Provides: bundled(golang(github.com/armon/go-metrics)) = eb0af217e5e9747e41dd5303755356b62d28e3ec @@ -133,7 +133,7 @@ Provides: bundled(golang(github.com/docker/go-events)) = e31b211e4f1cd09aa Provides: bundled(golang(github.com/docker/go-metrics)) = b619b3592b65de4f087d9f16863a7e6ff905973c Provides: bundled(golang(github.com/docker/go-units)) = 519db1ee28dcc9fd2474ae59fca29a810482bfb1 Provides: bundled(golang(github.com/docker/libkv)) = 458977154600b9f23984d9f4b82e79570b5ae12b -Provides: bundled(golang(github.com/docker/libnetwork)) = 339b972b464ee3d401b5788b2af9e31d09d6b7da +Provides: bundled(golang(github.com/docker/libnetwork)) = f6ccccb1c082a432c2a5814aaedaca56af33d9ea Provides: bundled(golang(github.com/docker/libtrust)) = 9cbd2a1374f46905c68a4eb3694a130610adc62a Provides: bundled(golang(github.com/docker/swarmkit)) = cf1e0f8d95ee37ea1f9a5f8a54c73c1e0fa58a54 Provides: bundled(golang(github.com/fernet/fernet-go)) = 9eac43b88a5efb8651d24de9b68e87567e029736 @@ -173,7 +173,7 @@ Provides: bundled(golang(github.com/jmespath/go-jmespath)) = 2d053f87d1d7f Provides: bundled(golang(github.com/json-iterator/go)) = a1ca0830781e007c66b225121d2cdb3a649421f6 Provides: bundled(golang(github.com/matttproud/golang_protobuf_extensions)) = c12348ce28de40eed0136aa2b644d0ee0650e56c Provides: bundled(golang(github.com/Microsoft/go-winio)) = 7e149e8c70409f36773c1b2cf3447a7ab7697368 -Provides: bundled(golang(github.com/Microsoft/hcsshim)) = 64a2b71405dacf76c95600f4c756a991ad09cf7c +Provides: bundled(golang(github.com/Microsoft/hcsshim)) = a11a2c44e8a4aa9d66314b1d759ef582df5ab5e8 Provides: bundled(golang(github.com/Microsoft/opengcs)) = a10967154e143a36014584a6f664344e3bb0aa64 Provides: bundled(golang(github.com/miekg/dns)) = 6c0c4e6581f8e173cc562c8b3363ab984e4ae071 Provides: bundled(golang(github.com/mistifyio/go-zfs)) = f784269be439d704d3dfa1906f45dd848fed2beb diff --git a/sources b/sources index 9973ffd..e68c1b0 100644 --- a/sources +++ b/sources @@ -1,3 +1,3 @@ -SHA512 (cli-20.10.16.tar.gz) = 90451f71f16f3bd1410b13c5df256ef1f422dd5b9b75d63cf318ee91a07bcb3ddb2876d2fee81e835d8daaee48c4e010c2daf4373de1095e2075fed8ee5fe75e -SHA512 (moby-20.10.16.tar.gz) = 5fdf87f98a951af87a334a5a403e36b975ff6c4647d0656dde2bd763d27562c620346f3746adafa1439c205869c721a3bef750f8302734499423ca789218f85d +SHA512 (cli-20.10.17.tar.gz) = 9c2cff7e248272e234eac9febdfd7c5c844fc65ee4b08fd4ce0f526e4fed33f2d12682d0991ef28b42977b9de2c84d7ef9c6ddd6f31c4e8c34a3985c1cea3316 +SHA512 (moby-20.10.17.tar.gz) = 1def92a4f87695b1889e482947f2bc49342ad868ee15425900b0c6f8954ba77aa2a9a8bd4fc500ba124218603aa8c7127daf7192140cace6e652a311391397c4 SHA512 (tini-de40ad0.tar.gz) = 6e21fbcc8ab0daf2f2ac407f8d85373d2873d4b1e7d010056e4dd7071183fe1ede9dadf116c520e68a6226d5eb9d5ede383729327630600ed85080c1586bf3bb From b88bf1e28a51877ce16a3affd100062fe722f73f Mon Sep 17 00:00:00 2001 From: Maxwell G Date: Fri, 10 Jun 2022 23:24:29 -0500 Subject: [PATCH 060/163] Rebuild for new golang-github-docker-libnetwork --- moby-engine.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/moby-engine.spec b/moby-engine.spec index f36a6a7..979231d 100644 --- a/moby-engine.spec +++ b/moby-engine.spec @@ -32,7 +32,7 @@ Name: %{newname}-engine Version: 20.10.17 -Release: 1%{?dist} +Release: 2%{?dist} Summary: The open-source application container engine License: ASL 2.0 Source0: %{git_moby}/archive/v%{version}/moby-%{version}.tar.gz @@ -287,6 +287,9 @@ getent group %{service_name} >/dev/null || groupadd -r %{service_name} || : %{_datadir}/nano/Dockerfile.nanorc %changelog +* Sat Jun 11 2022 Maxwell G - 20.10.17-2 +- Rebuild for new golang-github-docker-libnetwork + * Fri Jun 10 2022 Maxwell G - 20.10.17-1 - Update to 20.10.17. Fixes rhbz#2095714. From 217fd08ba98b9d872a30d3655717b3b655ddf4c7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert-Andr=C3=A9=20Mauchin?= Date: Sat, 18 Jun 2022 12:14:30 +0200 Subject: [PATCH 061/163] Rebuilt for CVE-2022-1996, CVE-2022-24675, CVE-2022-28327, CVE-2022-27191, CVE-2022-29526, CVE-2022-30629 --- moby-engine.spec | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/moby-engine.spec b/moby-engine.spec index 979231d..4d72c71 100644 --- a/moby-engine.spec +++ b/moby-engine.spec @@ -32,7 +32,7 @@ Name: %{newname}-engine Version: 20.10.17 -Release: 2%{?dist} +Release: 3%{?dist} Summary: The open-source application container engine License: ASL 2.0 Source0: %{git_moby}/archive/v%{version}/moby-%{version}.tar.gz @@ -287,6 +287,10 @@ getent group %{service_name} >/dev/null || groupadd -r %{service_name} || : %{_datadir}/nano/Dockerfile.nanorc %changelog +* Sat Jun 18 2022 Robert-André Mauchin - 20.10.17-3 +- Rebuilt for CVE-2022-1996, CVE-2022-24675, CVE-2022-28327, CVE-2022-27191, + CVE-2022-29526, CVE-2022-30629 + * Sat Jun 11 2022 Maxwell G - 20.10.17-2 - Rebuild for new golang-github-docker-libnetwork From 5c0302b914116c97a6d4f5fe36b0c83d259de609 Mon Sep 17 00:00:00 2001 From: Maxwell G Date: Sat, 18 Jun 2022 22:20:53 -0500 Subject: [PATCH 062/163] Revert "Rebuilt for CVE-2022-1996, CVE-2022-24675, CVE-2022-28327, CVE-2022-27191, CVE-2022-29526, CVE-2022-30629" This reverts commit 217fd08ba98b9d872a30d3655717b3b655ddf4c7. --- moby-engine.spec | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/moby-engine.spec b/moby-engine.spec index 4d72c71..979231d 100644 --- a/moby-engine.spec +++ b/moby-engine.spec @@ -32,7 +32,7 @@ Name: %{newname}-engine Version: 20.10.17 -Release: 3%{?dist} +Release: 2%{?dist} Summary: The open-source application container engine License: ASL 2.0 Source0: %{git_moby}/archive/v%{version}/moby-%{version}.tar.gz @@ -287,10 +287,6 @@ getent group %{service_name} >/dev/null || groupadd -r %{service_name} || : %{_datadir}/nano/Dockerfile.nanorc %changelog -* Sat Jun 18 2022 Robert-André Mauchin - 20.10.17-3 -- Rebuilt for CVE-2022-1996, CVE-2022-24675, CVE-2022-28327, CVE-2022-27191, - CVE-2022-29526, CVE-2022-30629 - * Sat Jun 11 2022 Maxwell G - 20.10.17-2 - Rebuild for new golang-github-docker-libnetwork From 00bcc2fe7b20318855bfbd35130ce2a783e1d864 Mon Sep 17 00:00:00 2001 From: Maxwell G Date: Sat, 18 Jun 2022 22:21:10 -0500 Subject: [PATCH 063/163] Rebuilt for CVE-2022-1996, CVE-2022-24675, CVE-2022-28327, CVE-2022-27191, CVE-2022-29526, CVE-2022-30629. --- moby-engine.spec | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/moby-engine.spec b/moby-engine.spec index 979231d..3736d32 100644 --- a/moby-engine.spec +++ b/moby-engine.spec @@ -32,7 +32,7 @@ Name: %{newname}-engine Version: 20.10.17 -Release: 2%{?dist} +Release: 3%{?dist} Summary: The open-source application container engine License: ASL 2.0 Source0: %{git_moby}/archive/v%{version}/moby-%{version}.tar.gz @@ -287,6 +287,10 @@ getent group %{service_name} >/dev/null || groupadd -r %{service_name} || : %{_datadir}/nano/Dockerfile.nanorc %changelog +* Sun Jun 19 2022 Maxwell G - 20.10.17-3 +- Rebuilt for CVE-2022-1996, CVE-2022-24675, CVE-2022-28327, CVE-2022-27191, + CVE-2022-29526, CVE-2022-30629. + * Sat Jun 11 2022 Maxwell G - 20.10.17-2 - Rebuild for new golang-github-docker-libnetwork From 3d23934ab2f753c3115cd07cc898cb2a903caab6 Mon Sep 17 00:00:00 2001 From: Maxwell G Date: Sun, 3 Jul 2022 23:36:25 -0500 Subject: [PATCH 064/163] Only build on %golang_arches (i.e. where golang is available). --- moby-engine.spec | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/moby-engine.spec b/moby-engine.spec index 3736d32..3dff4f4 100644 --- a/moby-engine.spec +++ b/moby-engine.spec @@ -32,7 +32,7 @@ Name: %{newname}-engine Version: 20.10.17 -Release: 3%{?dist} +Release: 4%{?dist} Summary: The open-source application container engine License: ASL 2.0 Source0: %{git_moby}/archive/v%{version}/moby-%{version}.tar.gz @@ -44,6 +44,8 @@ Source4: %{service_name}.sysconfig Source5: provides.spec.inc URL: https://www.%{origname}.com +ExclusiveArch: %{golang_arches} + # BuildRequires: golang(github.com/docker/docker) BuildRequires: golang(github.com/docker/libnetwork) BuildRequires: pkgconfig(libbtrfsutil) @@ -287,6 +289,9 @@ getent group %{service_name} >/dev/null || groupadd -r %{service_name} || : %{_datadir}/nano/Dockerfile.nanorc %changelog +* Mon Jul 04 2022 Maxwell G - 20.10.17-4 +- Only build on %%golang_arches (i.e. where golang is available). + * Sun Jun 19 2022 Maxwell G - 20.10.17-3 - Rebuilt for CVE-2022-1996, CVE-2022-24675, CVE-2022-28327, CVE-2022-27191, CVE-2022-29526, CVE-2022-30629. From d885c6971db5084e9cd1c7bbc324d30c615080f5 Mon Sep 17 00:00:00 2001 From: Maxwell G Date: Tue, 19 Jul 2022 13:58:45 -0500 Subject: [PATCH 065/163] Rebuild for CVE-2022-{1705,32148,30631,30633,28131,30635,30632,30630,1962} in golang --- moby-engine.spec | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/moby-engine.spec b/moby-engine.spec index 3dff4f4..12ef75d 100644 --- a/moby-engine.spec +++ b/moby-engine.spec @@ -32,7 +32,7 @@ Name: %{newname}-engine Version: 20.10.17 -Release: 4%{?dist} +Release: 5%{?dist} Summary: The open-source application container engine License: ASL 2.0 Source0: %{git_moby}/archive/v%{version}/moby-%{version}.tar.gz @@ -289,6 +289,10 @@ getent group %{service_name} >/dev/null || groupadd -r %{service_name} || : %{_datadir}/nano/Dockerfile.nanorc %changelog +* Tue Jul 19 2022 Maxwell G - 20.10.17-5 +- Rebuild for CVE-2022-{1705,32148,30631,30633,28131,30635,30632,30630,1962} in + golang + * Mon Jul 04 2022 Maxwell G - 20.10.17-4 - Only build on %%golang_arches (i.e. where golang is available). From abbda294bffd0452db6c3028668ea56a772335a4 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 21 Jul 2022 23:29:41 +0000 Subject: [PATCH 066/163] Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- moby-engine.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/moby-engine.spec b/moby-engine.spec index 12ef75d..c7614e8 100644 --- a/moby-engine.spec +++ b/moby-engine.spec @@ -32,7 +32,7 @@ Name: %{newname}-engine Version: 20.10.17 -Release: 5%{?dist} +Release: 6%{?dist} Summary: The open-source application container engine License: ASL 2.0 Source0: %{git_moby}/archive/v%{version}/moby-%{version}.tar.gz @@ -289,6 +289,9 @@ getent group %{service_name} >/dev/null || groupadd -r %{service_name} || : %{_datadir}/nano/Dockerfile.nanorc %changelog +* Thu Jul 21 2022 Fedora Release Engineering +- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild + * Tue Jul 19 2022 Maxwell G - 20.10.17-5 - Rebuild for CVE-2022-{1705,32148,30631,30633,28131,30635,30632,30630,1962} in golang From 95213de4abf9e160340bf804ede6dc72652519a2 Mon Sep 17 00:00:00 2001 From: Maxwell G Date: Fri, 5 Aug 2022 11:01:07 +0200 Subject: [PATCH 067/163] Remove unnecessary debug package logic --- moby-engine.spec | 9 --------- 1 file changed, 9 deletions(-) diff --git a/moby-engine.spec b/moby-engine.spec index c7614e8..b8a8d4a 100644 --- a/moby-engine.spec +++ b/moby-engine.spec @@ -1,12 +1,3 @@ -%global with_debug 0 - -%if 0%{?with_debug} -%global _find_debuginfo_dwz_opts %{nil} -%global _dwz_low_mem_die_limit 0 -%else -%global debug_package %{nil} -%endif - # binaries and unitfiles are currently called 'docker' # to match with upstream supplied packages %global origname docker From 138c48597c3e9d7fbaeb7bbb80eebe1802d43a3e Mon Sep 17 00:00:00 2001 From: Maxwell G Date: Fri, 5 Aug 2022 11:03:56 +0200 Subject: [PATCH 068/163] Explicitly license specfile --- moby-engine.spec | 7 +++++++ moby-engine.spec.license | 9 +++++++++ 2 files changed, 16 insertions(+) create mode 100644 moby-engine.spec.license diff --git a/moby-engine.spec b/moby-engine.spec index b8a8d4a..deb9158 100644 --- a/moby-engine.spec +++ b/moby-engine.spec @@ -3,6 +3,11 @@ %global origname docker %global newname moby %global service_name %{origname} +# This specfile is licensed under: +# SPDX-License-Identifier: MIT +# SPDX-FileCopyrightText: Fedora Project Authors +# SPDX-FileCopyrightText: 2022 Maxwell G +# See %%{name}.spec.license for the full license text. # moby %global goipath_moby github.com/%{service_name}/%{service_name} @@ -33,6 +38,8 @@ Source3: %{service_name}.service Source4: %{service_name}.sysconfig # Seperate file containing virtual provides for bundled deps that's %%include'd in the specfile. Source5: provides.spec.inc +# Specfile license +Source6: moby-engine.spec.license URL: https://www.%{origname}.com ExclusiveArch: %{golang_arches} diff --git a/moby-engine.spec.license b/moby-engine.spec.license new file mode 100644 index 0000000..2071b23 --- /dev/null +++ b/moby-engine.spec.license @@ -0,0 +1,9 @@ +MIT License + +Copyright (c) + +Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions: + +The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. + +THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. From a86774b3c7135240b4310a98c1fa365bfe8e52d3 Mon Sep 17 00:00:00 2001 From: Maxwell G Date: Fri, 5 Aug 2022 11:05:42 +0200 Subject: [PATCH 069/163] Migrate to SPDX identifiers --- moby-engine.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/moby-engine.spec b/moby-engine.spec index deb9158..56515f0 100644 --- a/moby-engine.spec +++ b/moby-engine.spec @@ -30,7 +30,7 @@ Name: %{newname}-engine Version: 20.10.17 Release: 6%{?dist} Summary: The open-source application container engine -License: ASL 2.0 +License: Apache-2.0 Source0: %{git_moby}/archive/v%{version}/moby-%{version}.tar.gz Source1: %{git_cli}/archive/v%{version}/cli-%{version}.tar.gz Source2: %{git_tini}/archive/%{commit_tini}/tini-%{shortcommit_tini}.tar.gz From 75633634f744841f155cfff19c5a2d7c2b9a73bc Mon Sep 17 00:00:00 2001 From: Maxwell G Date: Fri, 5 Aug 2022 11:08:12 +0200 Subject: [PATCH 070/163] Sort and properly indent Buildrequires --- moby-engine.spec | 23 +++++++++++------------ 1 file changed, 11 insertions(+), 12 deletions(-) diff --git a/moby-engine.spec b/moby-engine.spec index 56515f0..5d99f64 100644 --- a/moby-engine.spec +++ b/moby-engine.spec @@ -44,18 +44,17 @@ URL: https://www.%{origname}.com ExclusiveArch: %{golang_arches} -# BuildRequires: golang(github.com/docker/docker) -BuildRequires: golang(github.com/docker/libnetwork) -BuildRequires: pkgconfig(libbtrfsutil) -BuildRequires: pkgconfig(devmapper) -BuildRequires: golang -BuildRequires: go-rpm-macros -BuildRequires: go-md2man -BuildRequires: pkgconfig(libseccomp) >= 2.3.0 -BuildRequires: make -BuildRequires: pkgconfig(audit) -BuildRequires: pkgconfig(systemd) -BuildRequires: firewalld-filesystem +BuildRequires: golang(github.com/docker/libnetwork) +BuildRequires: pkgconfig(libbtrfsutil) +BuildRequires: pkgconfig(devmapper) +BuildRequires: golang +BuildRequires: go-rpm-macros +BuildRequires: go-md2man +BuildRequires: pkgconfig(libseccomp) >= 2.3.0 +BuildRequires: make +BuildRequires: pkgconfig(audit) +BuildRequires: pkgconfig(systemd) +BuildRequires: firewalld-filesystem # Build dependencies for tini BuildRequires: cmake From 0f0e28fd3ecc6ac48c1b9017f5ad97a7742d8c9c Mon Sep 17 00:00:00 2001 From: Maxwell G Date: Fri, 5 Aug 2022 11:15:13 +0200 Subject: [PATCH 071/163] Remove confusing duplicate macros --- moby-engine.spec | 123 +++++++++++++++++++++++------------------------ 1 file changed, 59 insertions(+), 64 deletions(-) diff --git a/moby-engine.spec b/moby-engine.spec index 5d99f64..35967ec 100644 --- a/moby-engine.spec +++ b/moby-engine.spec @@ -1,8 +1,3 @@ -# binaries and unitfiles are currently called 'docker' -# to match with upstream supplied packages -%global origname docker -%global newname moby -%global service_name %{origname} # This specfile is licensed under: # SPDX-License-Identifier: MIT # SPDX-FileCopyrightText: Fedora Project Authors @@ -10,13 +5,13 @@ # See %%{name}.spec.license for the full license text. # moby -%global goipath_moby github.com/%{service_name}/%{service_name} +%global goipath_moby github.com/docker/docker %global git_moby https://%{goipath_moby} %global commit_moby f756502055d2e36a84f2068e6620bea5ecf09058 %global shortcommit_moby %(c=%{commit_moby}; echo ${c:0:7}) # cli -%global goipath_cli github.com/%{origname}/cli +%global goipath_cli github.com/docker/cli %global git_cli https://%{goipath_cli} %global commit_cli aa7e414fdcb23a66e8fabbef0a560ef1769eace5 %global shortcommit_cli %(c=%{commit_cli}; echo ${c:0:7}) @@ -26,7 +21,7 @@ %global commit_tini de40ad007797e0dcd8b7126f27bb87401d224240 %global shortcommit_tini %(c=%{commit_tini}; echo ${c:0:7}) -Name: %{newname}-engine +Name: moby-engine Version: 20.10.17 Release: 6%{?dist} Summary: The open-source application container engine @@ -34,13 +29,13 @@ License: Apache-2.0 Source0: %{git_moby}/archive/v%{version}/moby-%{version}.tar.gz Source1: %{git_cli}/archive/v%{version}/cli-%{version}.tar.gz Source2: %{git_tini}/archive/%{commit_tini}/tini-%{shortcommit_tini}.tar.gz -Source3: %{service_name}.service -Source4: %{service_name}.sysconfig +Source3: docker.service +Source4: docker.sysconfig # Seperate file containing virtual provides for bundled deps that's %%include'd in the specfile. Source5: provides.spec.inc # Specfile license Source6: moby-engine.spec.license -URL: https://www.%{origname}.com +URL: https://www.docker.com ExclusiveArch: %{golang_arches} @@ -74,22 +69,22 @@ Requires: containerd Requires: device-mapper-libs >= 1.02.90-1 # Replace the old Docker packages -Obsoletes: %{origname} < 2:%{version}-%{release} -Obsoletes: %{origname}-latest < 2:%{version}-%{release} -Obsoletes: %{origname}-common < 2:%{version}-%{release} -Provides: %{origname} = %{version}-%{release} -Provides: %{origname}-latest = %{version}-%{release} +Obsoletes: docker < 2:%{version}-%{release} +Obsoletes: docker-latest < 2:%{version}-%{release} +Obsoletes: docker-common < 2:%{version}-%{release} +Provides: docker = %{version}-%{release} +Provides: docker-latest = %{version}-%{release} # conflicting packages -Conflicts: %{origname} -Conflicts: %{origname}-latest -Conflicts: %{origname}-common -Conflicts: %{origname}-io -Conflicts: %{origname}-engine-cs -Conflicts: %{origname}-ce -Conflicts: %{origname}-ce-cli -Conflicts: %{origname}-ee -Conflicts: podman-%{origname} +Conflicts: docker +Conflicts: docker-latest +Conflicts: docker-common +Conflicts: docker-io +Conflicts: docker-engine-cs +Conflicts: docker-ce +Conflicts: docker-ce-cli +Conflicts: docker-ee +Conflicts: podman-docker %include %{SOURCE5} @@ -109,9 +104,9 @@ Summary: Fish completion files for %{name} BuildArch: noarch Requires: %{name} = %{version}-%{release} Requires: fish -Conflicts: %{service_name}-fish-completion -Obsoletes: %{service_name}-fish-completion < 2:%{version}-%{release} -Provides: %{service_name}-fish-completion = %{version}-%{release} +Conflicts: docker-fish-completion +Obsoletes: docker-fish-completion < 2:%{version}-%{release} +Provides: docker-fish-completion = %{version}-%{release} %description fish-completion This package installs %{summary}. @@ -121,9 +116,9 @@ Summary: Zsh completion files for %{name} BuildArch: noarch Requires: %{name} = %{version}-%{release} Requires: zsh -Conflicts: %{service_name}-zsh-completion -Obsoletes: %{service_name}-zsh-completion < 2:%{version}-%{release} -Provides: %{service_name}-zsh-completion = %{version}-%{release} +Conflicts: docker-zsh-completion +Obsoletes: docker-zsh-completion < 2:%{version}-%{release} +Provides: docker-zsh-completion = %{version}-%{release} %description zsh-completion This package installs %{summary}. @@ -153,10 +148,10 @@ mkdir -p _build/bin # Build binary using `golang-github-docker-libnetwork-devel` # (github.com/docker/libnetwork) installed in system GOPATH. export GOPATH="%{_datadir}/gocode" - %gobuild -o _build/bin/%{service_name}-proxy github.com/%{service_name}/libnetwork/cmd/proxy + %gobuild -o _build/bin/docker-proxy github.com/docker/libnetwork/cmd/proxy ) -# build tini (installed as %%{service_name}-init) +# build tini (installed as docker-init) ( cd tini-%{commit_tini} %cmake @@ -166,7 +161,7 @@ mkdir -p _build/bin %global buildtime %(date --utc --date="@${SOURCE_DATE_EPOCH:-$(date +%s)}" +"%Y-%m-%dT%H:%M:%SZ") # build engine ( - mkdir -p src/github.com/%{service_name} + mkdir -p src/github.com/docker # Link source and vendored deps into local GOPATH. ln -fns ../../.. src/%{goipath_moby} # Build using source and vendored deps in local GOPATH. @@ -180,7 +175,7 @@ mkdir -p _build/bin export DOCKER_BUILDTAGS="seccomp selinux journald" export BUILDTAGS="${DOCKER_BUILDTAGS}" export GOBUILDTAGS="${BUILDTAGS}" - %gobuild -o _build/bin/%{service_name}d %{goipath_moby}/cmd/%{service_name}d + %gobuild -o _build/bin/dockerd %{goipath_moby}/cmd/dockerd # VERSION=%%{version} DOCKER_GITCOMMIT=%%{shortcommit_moby} bash sh dynbinary # mv bundles/dynbinary-daemon/dockerd-%{version} _build/bin/dockerd ) @@ -188,7 +183,7 @@ mkdir -p _build/bin # build cli ( cd cli-%{version} - mkdir -p src/github.com/%{service_name} + mkdir -p src/github.com/docker # Link source and vendored deps into local GOPATH. ln -fns ../../.. src/%{goipath_cli} # export DISABLE_WARN_OUTSIDE_CONTAINER=1 @@ -203,34 +198,34 @@ mkdir -p _build/bin " export BUILDTAGS="pkcs11" export GOBUILDTAGS="${BUILDTAGS}" - %gobuild -o ../_build/bin/%{service_name} %{goipath_cli}/cmd/%{service_name} + %gobuild -o ../_build/bin/docker %{goipath_cli}/cmd/docker # make VERSION=%%{version} GITCOMMIT=%%{shortcommit_cli} dynbinary man/md2man-all.sh ) %install # install binary -install -Dpm 755 _build/bin/%{service_name} _build/bin/%{service_name}d -t %{buildroot}%{_bindir}/ +install -Dpm 755 _build/bin/docker _build/bin/dockerd -t %{buildroot}%{_bindir}/ # install proxy -install -Dpm 755 _build/bin/%{service_name}-proxy -t %{buildroot}%{_libexecdir}/%{service_name}/ +install -Dpm 755 _build/bin/docker-proxy -t %{buildroot}%{_libexecdir}/docker/ # install tini -install -Dpm 755 tini-%{commit_tini}/%{__cmake_builddir}/tini-static %{buildroot}%{_libexecdir}/%{service_name}/%{service_name}-init +install -Dpm 755 tini-%{commit_tini}/%{__cmake_builddir}/tini-static %{buildroot}%{_libexecdir}/docker/docker-init # install udev rules -install -Dpm 644 contrib/udev/80-%{service_name}.rules -t %{buildroot}%{_usr}/lib/udev/rules.d/ +install -Dpm 644 contrib/udev/80-docker.rules -t %{buildroot}%{_usr}/lib/udev/rules.d/ # add init scripts install -Dpm 644 %{SOURCE3} contrib/init/systemd/docker.socket -t %{buildroot}%{_unitdir}/ # for additional args -install -Dpm 644 %{SOURCE4} %{buildroot}%{_sysconfdir}/sysconfig/%{service_name} +install -Dpm 644 %{SOURCE4} %{buildroot}%{_sysconfdir}/sysconfig/docker # add bash, zsh, and fish completions -install -Dpm 644 cli-%{version}/contrib/completion/bash/%{service_name} -t %{buildroot}%{_datadir}/bash-completion/completions/ -install -Dpm 644 cli-%{version}/contrib/completion/zsh/_%{service_name} -t %{buildroot}%{_datadir}/zsh/site-functions/ -install -Dpm 644 cli-%{version}/contrib/completion/fish/%{service_name}.fish -t %{buildroot}%{_datadir}/fish/vendor_completions.d/ +install -Dpm 644 cli-%{version}/contrib/completion/bash/docker -t %{buildroot}%{_datadir}/bash-completion/completions/ +install -Dpm 644 cli-%{version}/contrib/completion/zsh/_docker -t %{buildroot}%{_datadir}/zsh/site-functions/ +install -Dpm 644 cli-%{version}/contrib/completion/fish/docker.fish -t %{buildroot}%{_datadir}/fish/vendor_completions.d/ # install manpages install -Dpm 644 cli-%{version}/man/man1/*.1 -t %{buildroot}%{_mandir}/man1/ @@ -245,41 +240,41 @@ for cli_file in LICENSE MAINTAINERS NOTICE README.md; do done %pre -getent group %{service_name} >/dev/null || groupadd -r %{service_name} || : +getent group docker >/dev/null || groupadd -r docker || : %post -%systemd_post %{service_name}.service %{service_name}.socket +%systemd_post docker.service docker.socket %firewalld_reload %preun -%systemd_preun %{service_name}.service %{service_name}.socket +%systemd_preun docker.service docker.socket %postun -%systemd_postun_with_restart %{service_name}.service +%systemd_postun_with_restart docker.service %files %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} -%{_bindir}/%{service_name}d -%dir %{_libexecdir}/%{service_name}/ -%{_libexecdir}/%{service_name}/%{service_name}-proxy -%{_libexecdir}/%{service_name}/%{service_name}-init -%{_usr}/lib/udev/rules.d/80-%{service_name}.rules -%{_unitdir}/%{service_name}.service -%{_unitdir}/%{service_name}.socket -%{_datadir}/bash-completion/completions/%{service_name} -%{_mandir}/man1/* -%{_mandir}/man5/* -%{_mandir}/man8/* +%config(noreplace) %{_sysconfdir}/sysconfig/docker +%{_bindir}/docker +%{_bindir}/dockerd +%dir %{_libexecdir}/docker/ +%{_libexecdir}/docker/docker-proxy +%{_libexecdir}/docker/docker-init +%{_usr}/lib/udev/rules.d/80-docker.rules +%{_unitdir}/docker.service +%{_unitdir}/docker.socket +%{_datadir}/bash-completion/completions/docker +%{_mandir}/man1/docker*.1* +%{_mandir}/man5/{Dockerfile,docker-config-json}.5* +%{_mandir}/man8/dockerd.8* %files zsh-completion -%{_datadir}/zsh/site-functions/_%{service_name} +%{_datadir}/zsh/site-functions/_docker %files fish-completion -%{_datadir}/fish/vendor_completions.d/%{service_name}.fish +%{_datadir}/fish/vendor_completions.d/docker.fish %files nano %dir %{_datadir}/nano From af2a539c7151ced93f5db3b05f2253f63e76286b Mon Sep 17 00:00:00 2001 From: Maxwell G Date: Fri, 5 Aug 2022 11:17:02 +0200 Subject: [PATCH 072/163] Fix specfile indentation --- moby-engine.spec | 60 ++++++++++++++++++++++++------------------------ 1 file changed, 30 insertions(+), 30 deletions(-) diff --git a/moby-engine.spec b/moby-engine.spec index 35967ec..7138374 100644 --- a/moby-engine.spec +++ b/moby-engine.spec @@ -22,17 +22,17 @@ %global shortcommit_tini %(c=%{commit_tini}; echo ${c:0:7}) Name: moby-engine -Version: 20.10.17 -Release: 6%{?dist} -Summary: The open-source application container engine +Version: 20.10.17 +Release: 6%{?dist} +Summary: The open-source application container engine License: Apache-2.0 -Source0: %{git_moby}/archive/v%{version}/moby-%{version}.tar.gz -Source1: %{git_cli}/archive/v%{version}/cli-%{version}.tar.gz -Source2: %{git_tini}/archive/%{commit_tini}/tini-%{shortcommit_tini}.tar.gz +Source0: %{git_moby}/archive/v%{version}/moby-%{version}.tar.gz +Source1: %{git_cli}/archive/v%{version}/cli-%{version}.tar.gz +Source2: %{git_tini}/archive/%{commit_tini}/tini-%{shortcommit_tini}.tar.gz Source3: docker.service Source4: docker.sysconfig # Seperate file containing virtual provides for bundled deps that's %%include'd in the specfile. -Source5: provides.spec.inc +Source5: provides.spec.inc # Specfile license Source6: moby-engine.spec.license URL: https://www.docker.com @@ -52,21 +52,21 @@ BuildRequires: pkgconfig(systemd) BuildRequires: firewalld-filesystem # Build dependencies for tini -BuildRequires: cmake -BuildRequires: glibc-static +BuildRequires: cmake +BuildRequires: glibc-static # required packages on install -Requires: container-selinux -Requires: iptables -Requires: systemd -Requires: tar -Requires: xz -Requires: pigz -Requires: runc -Requires: containerd +Requires: container-selinux +Requires: iptables +Requires: systemd +Requires: tar +Requires: xz +Requires: pigz +Requires: runc +Requires: containerd # Resolves: rhbz#1165615 -Requires: device-mapper-libs >= 1.02.90-1 +Requires: device-mapper-libs >= 1.02.90-1 # Replace the old Docker packages Obsoletes: docker < 2:%{version}-%{release} @@ -100,10 +100,10 @@ for deploying and scaling web apps, databases, and backend services without depending on a particular stack or provider. %package fish-completion -Summary: Fish completion files for %{name} -BuildArch: noarch -Requires: %{name} = %{version}-%{release} -Requires: fish +Summary: Fish completion files for %{name} +BuildArch: noarch +Requires: %{name} = %{version}-%{release} +Requires: fish Conflicts: docker-fish-completion Obsoletes: docker-fish-completion < 2:%{version}-%{release} Provides: docker-fish-completion = %{version}-%{release} @@ -112,10 +112,10 @@ Provides: docker-fish-completion = %{version}-%{release} This package installs %{summary}. %package zsh-completion -Summary: Zsh completion files for %{name} -BuildArch: noarch -Requires: %{name} = %{version}-%{release} -Requires: zsh +Summary: Zsh completion files for %{name} +BuildArch: noarch +Requires: %{name} = %{version}-%{release} +Requires: zsh Conflicts: docker-zsh-completion Obsoletes: docker-zsh-completion < 2:%{version}-%{release} Provides: docker-zsh-completion = %{version}-%{release} @@ -124,10 +124,10 @@ Provides: docker-zsh-completion = %{version}-%{release} This package installs %{summary}. %package nano -Summary: GNU nano syntax highlighting files for Moby -BuildArch: noarch -Requires: %{name} = %{version}-%{release} -Requires: nano +Summary: GNU nano syntax highlighting files for Moby +BuildArch: noarch +Requires: %{name} = %{version}-%{release} +Requires: nano %description nano This package installs %{summary}. From 2496dcc6b3255b45343de4c38df55361c11e38a0 Mon Sep 17 00:00:00 2001 From: Maxwell G Date: Fri, 5 Aug 2022 11:28:48 +0200 Subject: [PATCH 073/163] More specfile sorting --- moby-engine.spec | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/moby-engine.spec b/moby-engine.spec index 7138374..d577a25 100644 --- a/moby-engine.spec +++ b/moby-engine.spec @@ -57,13 +57,13 @@ BuildRequires: glibc-static # required packages on install Requires: container-selinux +Requires: containerd Requires: iptables +Requires: pigz +Requires: runc Requires: systemd Requires: tar Requires: xz -Requires: pigz -Requires: runc -Requires: containerd # Resolves: rhbz#1165615 Requires: device-mapper-libs >= 1.02.90-1 @@ -77,13 +77,13 @@ Provides: docker-latest = %{version}-%{release} # conflicting packages Conflicts: docker -Conflicts: docker-latest -Conflicts: docker-common -Conflicts: docker-io -Conflicts: docker-engine-cs Conflicts: docker-ce Conflicts: docker-ce-cli +Conflicts: docker-common Conflicts: docker-ee +Conflicts: docker-engine-cs +Conflicts: docker-io +Conflicts: docker-latest Conflicts: podman-docker %include %{SOURCE5} From 316c298d1e2aafa234d07048c7a8b176d14f9218 Mon Sep 17 00:00:00 2001 From: Maxwell G Date: Fri, 5 Aug 2022 18:30:29 +0200 Subject: [PATCH 074/163] Update changelog --- moby-engine.spec | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/moby-engine.spec b/moby-engine.spec index d577a25..4498113 100644 --- a/moby-engine.spec +++ b/moby-engine.spec @@ -23,7 +23,7 @@ Name: moby-engine Version: 20.10.17 -Release: 6%{?dist} +Release: 7%{?dist} Summary: The open-source application container engine License: Apache-2.0 Source0: %{git_moby}/archive/v%{version}/moby-%{version}.tar.gz @@ -281,6 +281,11 @@ getent group docker >/dev/null || groupadd -r docker || : %{_datadir}/nano/Dockerfile.nanorc %changelog +* Fri Aug 05 2022 Maxwell G - 20.10.17-7 +- Migrate to SPDX license identifiers +- Generate debuginfo +- Specfile improvements + * Thu Jul 21 2022 Fedora Release Engineering - Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild From a9f2be129abd678bfe6e888b12333a005e08f958 Mon Sep 17 00:00:00 2001 From: Luca BRUNO Date: Tue, 30 Aug 2022 10:25:38 +0000 Subject: [PATCH 075/163] moby-engine: move 'docker' group creation logic to a sysusers.d fragment - Rearrange sources Resolves: https://bugzilla.redhat.com/1745936 Merges: https://src.fedoraproject.org/rpms/moby-engine/pull-request/11 Co-Authored-By: Maxwell G --- moby-engine-systemd-sysusers.conf | 2 ++ moby-engine.spec | 21 ++++++++++++++++----- 2 files changed, 18 insertions(+), 5 deletions(-) create mode 100644 moby-engine-systemd-sysusers.conf diff --git a/moby-engine-systemd-sysusers.conf b/moby-engine-systemd-sysusers.conf new file mode 100644 index 0000000..fafc512 --- /dev/null +++ b/moby-engine-systemd-sysusers.conf @@ -0,0 +1,2 @@ +#Type Name ID +g docker - diff --git a/moby-engine.spec b/moby-engine.spec index 4498113..a036f14 100644 --- a/moby-engine.spec +++ b/moby-engine.spec @@ -23,7 +23,7 @@ Name: moby-engine Version: 20.10.17 -Release: 7%{?dist} +Release: 8%{?dist} Summary: The open-source application container engine License: Apache-2.0 Source0: %{git_moby}/archive/v%{version}/moby-%{version}.tar.gz @@ -31,10 +31,12 @@ Source1: %{git_cli}/archive/v%{version}/cli-%{version}.tar.gz Source2: %{git_tini}/archive/%{commit_tini}/tini-%{shortcommit_tini}.tar.gz Source3: docker.service Source4: docker.sysconfig +Source5: moby-engine-systemd-sysusers.conf + # Seperate file containing virtual provides for bundled deps that's %%include'd in the specfile. -Source5: provides.spec.inc +Source100: provides.spec.inc # Specfile license -Source6: moby-engine.spec.license +Source200: moby-engine.spec.license URL: https://www.docker.com ExclusiveArch: %{golang_arches} @@ -49,6 +51,7 @@ BuildRequires: pkgconfig(libseccomp) >= 2.3.0 BuildRequires: make BuildRequires: pkgconfig(audit) BuildRequires: pkgconfig(systemd) +BuildRequires: systemd-rpm-macros BuildRequires: firewalld-filesystem # Build dependencies for tini @@ -86,7 +89,7 @@ Conflicts: docker-io Conflicts: docker-latest Conflicts: podman-docker -%include %{SOURCE5} +%include %{SOURCE100} %description Docker is an open source project to build, ship and run any application as a @@ -222,6 +225,9 @@ install -Dpm 644 %{SOURCE3} contrib/init/systemd/docker.socket -t %{buildroot}%{ # for additional args install -Dpm 644 %{SOURCE4} %{buildroot}%{_sysconfdir}/sysconfig/docker +# Install sysusers configuration +install -Dpm 0644 %{SOURCE5} %{buildroot}%{_sysusersdir}/moby-engine.conf + # add bash, zsh, and fish completions install -Dpm 644 cli-%{version}/contrib/completion/bash/docker -t %{buildroot}%{_datadir}/bash-completion/completions/ install -Dpm 644 cli-%{version}/contrib/completion/zsh/_docker -t %{buildroot}%{_datadir}/zsh/site-functions/ @@ -240,7 +246,7 @@ for cli_file in LICENSE MAINTAINERS NOTICE README.md; do done %pre -getent group docker >/dev/null || groupadd -r docker || : +%sysusers_create_compat %{SOURCE7} %post %systemd_post docker.service docker.socket @@ -265,6 +271,7 @@ getent group docker >/dev/null || groupadd -r docker || : %{_usr}/lib/udev/rules.d/80-docker.rules %{_unitdir}/docker.service %{_unitdir}/docker.socket +%{_sysusersdir}/moby-engine.conf %{_datadir}/bash-completion/completions/docker %{_mandir}/man1/docker*.1* %{_mandir}/man5/{Dockerfile,docker-config-json}.5* @@ -281,6 +288,10 @@ getent group docker >/dev/null || groupadd -r docker || : %{_datadir}/nano/Dockerfile.nanorc %changelog +* Tue Aug 30 2022 Luca BRUNO - 20.10.17-8 +- Move 'docker' group creation logic to a sysusers.d fragment + Resolves: rhbz#1745936 + * Fri Aug 05 2022 Maxwell G - 20.10.17-7 - Migrate to SPDX license identifiers - Generate debuginfo From 9c95be299bde9d63189030fb1a4381fa9405ad0a Mon Sep 17 00:00:00 2001 From: Maxwell G Date: Fri, 2 Sep 2022 08:09:52 -0500 Subject: [PATCH 076/163] Fix sysusers scriptlet source path --- moby-engine.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/moby-engine.spec b/moby-engine.spec index a036f14..f934177 100644 --- a/moby-engine.spec +++ b/moby-engine.spec @@ -246,7 +246,7 @@ for cli_file in LICENSE MAINTAINERS NOTICE README.md; do done %pre -%sysusers_create_compat %{SOURCE7} +%sysusers_create_compat %{SOURCE5} %post %systemd_post docker.service docker.socket From b4be1c7e9b0fa757a09a1780d225aff4438a0658 Mon Sep 17 00:00:00 2001 From: Maxwell G Date: Sat, 10 Sep 2022 14:37:51 -0500 Subject: [PATCH 077/163] Update to 20.10.18. --- .gitignore | 2 ++ moby-engine.spec | 8 ++++++-- sources | 4 ++-- 3 files changed, 10 insertions(+), 4 deletions(-) diff --git a/.gitignore b/.gitignore index 0f887b7..5d7b5f0 100644 --- a/.gitignore +++ b/.gitignore @@ -40,3 +40,5 @@ moby-v20.10.10.tar.gz /moby-20.10.16.tar.gz /cli-20.10.17.tar.gz /moby-20.10.17.tar.gz +/cli-20.10.18.tar.gz +/moby-20.10.18.tar.gz diff --git a/moby-engine.spec b/moby-engine.spec index f934177..90629a0 100644 --- a/moby-engine.spec +++ b/moby-engine.spec @@ -22,8 +22,8 @@ %global shortcommit_tini %(c=%{commit_tini}; echo ${c:0:7}) Name: moby-engine -Version: 20.10.17 -Release: 8%{?dist} +Version: 20.10.18 +Release: 1%{?dist} Summary: The open-source application container engine License: Apache-2.0 Source0: %{git_moby}/archive/v%{version}/moby-%{version}.tar.gz @@ -288,6 +288,10 @@ done %{_datadir}/nano/Dockerfile.nanorc %changelog +* Sat Sep 10 2022 Maxwell G - 20.10.18-1 +- Update to 20.10.18. +- Mitigates CVE-2022-36109 / GHSA-rc4r-wh2q-q6c4 + * Tue Aug 30 2022 Luca BRUNO - 20.10.17-8 - Move 'docker' group creation logic to a sysusers.d fragment Resolves: rhbz#1745936 diff --git a/sources b/sources index e68c1b0..fe500bf 100644 --- a/sources +++ b/sources @@ -1,3 +1,3 @@ -SHA512 (cli-20.10.17.tar.gz) = 9c2cff7e248272e234eac9febdfd7c5c844fc65ee4b08fd4ce0f526e4fed33f2d12682d0991ef28b42977b9de2c84d7ef9c6ddd6f31c4e8c34a3985c1cea3316 -SHA512 (moby-20.10.17.tar.gz) = 1def92a4f87695b1889e482947f2bc49342ad868ee15425900b0c6f8954ba77aa2a9a8bd4fc500ba124218603aa8c7127daf7192140cace6e652a311391397c4 +SHA512 (cli-20.10.18.tar.gz) = fe5359015041f99bacf7b674a99ab7772d9e71eb6c6fefd6acb28f2afee4321a7517a53497627ae9cae8c6e0c253971a53d0579a630a3d71986edd7300a0a8ab +SHA512 (moby-20.10.18.tar.gz) = 202f9f4d455329907e87bd95549aa433b6c773d3067cc89d0bd2e087bddfc66faddd6c2019843e42bf3fed6d6584ba4ab61d762f436f8bb164aa11e6280c91c5 SHA512 (tini-de40ad0.tar.gz) = 6e21fbcc8ab0daf2f2ac407f8d85373d2873d4b1e7d010056e4dd7071183fe1ede9dadf116c520e68a6226d5eb9d5ede383729327630600ed85080c1586bf3bb From deedae54299d14884fb10f1c296a0e56ca85bf21 Mon Sep 17 00:00:00 2001 From: Maxwell G Date: Sat, 10 Sep 2022 16:39:35 -0500 Subject: [PATCH 078/163] Fix macro-in-comment --- moby-engine.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/moby-engine.spec b/moby-engine.spec index 90629a0..4a95c4a 100644 --- a/moby-engine.spec +++ b/moby-engine.spec @@ -180,7 +180,7 @@ mkdir -p _build/bin export GOBUILDTAGS="${BUILDTAGS}" %gobuild -o _build/bin/dockerd %{goipath_moby}/cmd/dockerd # VERSION=%%{version} DOCKER_GITCOMMIT=%%{shortcommit_moby} bash sh dynbinary - # mv bundles/dynbinary-daemon/dockerd-%{version} _build/bin/dockerd + # mv bundles/dynbinary-daemon/dockerd-%%{version} _build/bin/dockerd ) # build cli From 9db9c9a73adaee7db528b9d038f1e0d7b89015fc Mon Sep 17 00:00:00 2001 From: Maxwell G Date: Sat, 10 Sep 2022 16:39:47 -0500 Subject: [PATCH 079/163] Remove old Obsoletes docker was retired in Fedora 31 and these Obsoletes were incorrectly formatted, so I removed them. --- moby-engine.spec | 9 --------- 1 file changed, 9 deletions(-) diff --git a/moby-engine.spec b/moby-engine.spec index 4a95c4a..78aace2 100644 --- a/moby-engine.spec +++ b/moby-engine.spec @@ -72,21 +72,16 @@ Requires: xz Requires: device-mapper-libs >= 1.02.90-1 # Replace the old Docker packages -Obsoletes: docker < 2:%{version}-%{release} -Obsoletes: docker-latest < 2:%{version}-%{release} -Obsoletes: docker-common < 2:%{version}-%{release} Provides: docker = %{version}-%{release} Provides: docker-latest = %{version}-%{release} # conflicting packages -Conflicts: docker Conflicts: docker-ce Conflicts: docker-ce-cli Conflicts: docker-common Conflicts: docker-ee Conflicts: docker-engine-cs Conflicts: docker-io -Conflicts: docker-latest Conflicts: podman-docker %include %{SOURCE100} @@ -107,8 +102,6 @@ Summary: Fish completion files for %{name} BuildArch: noarch Requires: %{name} = %{version}-%{release} Requires: fish -Conflicts: docker-fish-completion -Obsoletes: docker-fish-completion < 2:%{version}-%{release} Provides: docker-fish-completion = %{version}-%{release} %description fish-completion @@ -119,8 +112,6 @@ Summary: Zsh completion files for %{name} BuildArch: noarch Requires: %{name} = %{version}-%{release} Requires: zsh -Conflicts: docker-zsh-completion -Obsoletes: docker-zsh-completion < 2:%{version}-%{release} Provides: docker-zsh-completion = %{version}-%{release} %description zsh-completion From dfbc8b93ae851709eaa7ecfcd148aac7d34ba72b Mon Sep 17 00:00:00 2001 From: Jan Kuparinen Date: Tue, 18 Oct 2022 07:32:50 +0000 Subject: [PATCH 080/163] Update to 20.10.19. --- .gitignore | 2 ++ moby-engine.spec | 9 ++++++--- provides.spec.inc | 31 ++++++++++++++++--------------- sources | 4 ++-- 4 files changed, 26 insertions(+), 20 deletions(-) diff --git a/.gitignore b/.gitignore index 5d7b5f0..e7b5f08 100644 --- a/.gitignore +++ b/.gitignore @@ -42,3 +42,5 @@ moby-v20.10.10.tar.gz /moby-20.10.17.tar.gz /cli-20.10.18.tar.gz /moby-20.10.18.tar.gz +/cli-20.10.19.tar.gz +/moby-20.10.19.tar.gz diff --git a/moby-engine.spec b/moby-engine.spec index 78aace2..aa82f9d 100644 --- a/moby-engine.spec +++ b/moby-engine.spec @@ -7,13 +7,13 @@ # moby %global goipath_moby github.com/docker/docker %global git_moby https://%{goipath_moby} -%global commit_moby f756502055d2e36a84f2068e6620bea5ecf09058 +%global commit_moby c964641a0d76733c071d606c72541b263da84a3e %global shortcommit_moby %(c=%{commit_moby}; echo ${c:0:7}) # cli %global goipath_cli github.com/docker/cli %global git_cli https://%{goipath_cli} -%global commit_cli aa7e414fdcb23a66e8fabbef0a560ef1769eace5 +%global commit_cli d85ef845332936556fa43722fc2feb25ef94f39b %global shortcommit_cli %(c=%{commit_cli}; echo ${c:0:7}) # tini @@ -22,7 +22,7 @@ %global shortcommit_tini %(c=%{commit_tini}; echo ${c:0:7}) Name: moby-engine -Version: 20.10.18 +Version: 20.10.19 Release: 1%{?dist} Summary: The open-source application container engine License: Apache-2.0 @@ -279,6 +279,9 @@ done %{_datadir}/nano/Dockerfile.nanorc %changelog +* Tue Oct 18 2022 Jan Kuparinen - 20.10.19-1 +- Update to 20.10.19. + * Sat Sep 10 2022 Maxwell G - 20.10.18-1 - Update to 20.10.18. - Mitigates CVE-2022-36109 / GHSA-rc4r-wh2q-q6c4 diff --git a/provides.spec.inc b/provides.spec.inc index b5bae94..fae8c0d 100644 --- a/provides.spec.inc +++ b/provides.spec.inc @@ -2,7 +2,7 @@ Provides: bundled(tini-static) Provides: bundled(golang(github.com/docker/docker)) Provides: bundled(golang(github.com/docker/cli)) -# grep -v -e '^$' -e '^#' cli-20.10.17/vendor.conf | sort | awk '{print "Provides: bundled(golang("$1")) = "$2}' +# grep -v -e '^$' -e '^#' cli-20.10.19/vendor.conf | sort | awk '{print "Provides: bundled(golang("$1")) = "$2}' Provides: bundled(golang(cloud.google.com/go)) = ceeb313ad77b789a7fa5287b36a1d127b69b7093 Provides: bundled(golang(github.com/Azure/go-ansiterm)) = d185dfc1b5a126116ea5a19e148e29d16b4574c9 Provides: bundled(golang(github.com/beorn7/perks)) = 37c8de3658fcb183f997c4e13e8337516ab753e6 @@ -10,7 +10,7 @@ Provides: bundled(golang(github.com/cespare/xxhash/v2)) = d7df74196a9e781e 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/continuity)) = 5ad51c7aca47b8e742f5e6e7dc841d50f5f6affd 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)) = b1ec32e02fe539480dc03e3bf381c20066e7c6cc @@ -18,8 +18,8 @@ Provides: bundled(golang(github.com/creack/pty)) = 2a38352e8b4d7ab6c336eef Provides: bundled(golang(github.com/davecgh/go-spew)) = 8991bc29aa16c548c550c7ff78260e27b9ab7c73 Provides: bundled(golang(github.com/docker/compose-on-kubernetes)) = 1f9b5b8cb6aca13deee947511801cf89447c1bfe Provides: bundled(golang(github.com/docker/distribution)) = b5ca020cfbe998e5af3457fda087444cf5116496 -Provides: bundled(golang(github.com/docker/docker)) = 87a90dc786bda134c9eb02adbae2c6a7342fb7f6 Provides: bundled(golang(github.com/docker/docker-credential-helpers)) = fc9290adbcf1594e78910e2f0334090eaee0e1ee +Provides: bundled(golang(github.com/docker/docker)) = e42327a6d3c55ceda3bd5475be7aae6036d02db3 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 @@ -35,7 +35,7 @@ Provides: bundled(golang(github.com/golang/groupcache)) = 869f871628b6baa9 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/gofuzz)) = f140a6486e521aad38f5917de355cbf147cc0496 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 @@ -45,7 +45,7 @@ Provides: bundled(golang(github.com/hashicorp/golang-lru)) = 7f827b33c0f15 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/json-iterator/go)) = 024077e996b048517130b21ea6bf12aa23055d3d 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 @@ -55,7 +55,7 @@ Provides: bundled(golang(github.com/moby/buildkit)) = 8142d66b5ebde79846b8 Provides: bundled(golang(github.com/moby/sys)) = 1bc8673b57550ddf85262eb0fed0aac651a37dab Provides: bundled(golang(github.com/moby/term)) = 3f7ff695adc6a35abc925370dd0a4dafb48ec64d Provides: bundled(golang(github.com/modern-go/concurrent)) = bacd9c7ef1dd9b15be4a9909b8ac7a4e313eec94 -Provides: bundled(golang(github.com/modern-go/reflect2)) = 4b7aa43c6742a2c18fdef89dd197aaae7dac7ccd +Provides: bundled(golang(github.com/modern-go/reflect2)) = 2b33151c9bbc5231aea69b8861c540102b087070 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)) = 67d2d5658fe0476ab9bf414cec164077ebff3920 @@ -98,10 +98,10 @@ Provides: bundled(golang(k8s.io/klog)) = 4ad0115ba9e45c096d06a31d8dfb0e5bd Provides: bundled(golang(k8s.io/kube-openapi)) = 0270cf2f1c1d995d34b36019a6f65d58e6e33ad4 Provides: bundled(golang(k8s.io/utils)) = 69764acb6e8e900b7c05296c5d3c9c19545475f9 Provides: bundled(golang(sigs.k8s.io/yaml)) = fd68e9863619f6ec2fdd8625fe1f02e7c877e480 -# grep -v -e '^$' -e '^#' moby-20.10.17/vendor.conf | sort | awk '{print "Provides: bundled(golang("$1")) = "$2}' +# grep -v -e '^$' -e '^#' moby-20.10.19/vendor.conf | sort | awk '{print "Provides: bundled(golang("$1")) = "$2}' Provides: bundled(golang(cloud.google.com/go)) = ceeb313ad77b789a7fa5287b36a1d127b69b7093 Provides: bundled(golang(code.cloudfoundry.org/clock)) = 02e53af36e6c978af692887ed449b74026d76fec -Provides: bundled(golang(github.com/armon/go-metrics)) = eb0af217e5e9747e41dd5303755356b62d28e3ec +Provides: bundled(golang(github.com/armon/go-metrics)) = f0300d1749da6fa982027e449ec0c7a145510c3c Provides: bundled(golang(github.com/armon/go-radix)) = e39d623f12e8e41c7b5529e9a9dd67a1e2261f80 Provides: bundled(golang(github.com/aws/aws-sdk-go)) = 2590bc875c54c9fda225d8e4e56a9d28d90c6a47 Provides: bundled(golang(github.com/Azure/go-ansiterm)) = d6e3b3328b783f23731bc4d058875b0371ff8109 @@ -112,9 +112,9 @@ Provides: bundled(golang(github.com/cespare/xxhash/v2)) = d7df74196a9e781e Provides: bundled(golang(github.com/cilium/ebpf)) = 32458a752e0bcbc670691625f84e7ef6aef5655d Provides: bundled(golang(github.com/cloudflare/cfssl)) = 5d63dbd981b5c408effbb58c442d54761ff94fbd Provides: bundled(golang(github.com/containerd/cgroups)) = b9de8a2212026c07cec67baf3323f1fc0121e048 -Provides: bundled(golang(github.com/containerd/console)) = 5d7e1412f07b502a01029ea20e20e0d2be31fa7c -Provides: bundled(golang(github.com/containerd/containerd)) = 7cfa023d95d37076d5ab035003d4839f4b6ba791 -Provides: bundled(golang(github.com/containerd/continuity)) = efbc4488d8fe1bdc16bde3b2d2990d9b3a899165 +Provides: bundled(golang(github.com/containerd/console)) = 2f1e3d2b6afd18e8b2077816c711205a0b4d8769 +Provides: bundled(golang(github.com/containerd/containerd)) = 96c5ae04b6784e180aaeee50fba715ac448ddb0d +Provides: bundled(golang(github.com/containerd/continuity)) = 5ad51c7aca47b8e742f5e6e7dc841d50f5f6affd Provides: bundled(golang(github.com/containerd/fifo)) = 0724c46b320cf96bb172a0550c19a4b1fca4dacb Provides: bundled(golang(github.com/containerd/go-runc)) = 16b287bc67d069a60fa48db15f330b790b74365b Provides: bundled(golang(github.com/containerd/ttrpc)) = bfba540dc45464586c106b1f31c8547933c1eb41 @@ -133,7 +133,7 @@ Provides: bundled(golang(github.com/docker/go-events)) = e31b211e4f1cd09aa Provides: bundled(golang(github.com/docker/go-metrics)) = b619b3592b65de4f087d9f16863a7e6ff905973c Provides: bundled(golang(github.com/docker/go-units)) = 519db1ee28dcc9fd2474ae59fca29a810482bfb1 Provides: bundled(golang(github.com/docker/libkv)) = 458977154600b9f23984d9f4b82e79570b5ae12b -Provides: bundled(golang(github.com/docker/libnetwork)) = f6ccccb1c082a432c2a5814aaedaca56af33d9ea +Provides: bundled(golang(github.com/docker/libnetwork)) = 0dde5c895075df6e3630e76f750a447cf63f4789 Provides: bundled(golang(github.com/docker/libtrust)) = 9cbd2a1374f46905c68a4eb3694a130610adc62a Provides: bundled(golang(github.com/docker/swarmkit)) = cf1e0f8d95ee37ea1f9a5f8a54c73c1e0fa58a54 Provides: bundled(golang(github.com/fernet/fernet-go)) = 9eac43b88a5efb8651d24de9b68e87567e029736 @@ -147,6 +147,7 @@ Provides: bundled(golang(github.com/golang/gddo)) = 72a348e765d293ed6d1ded Provides: bundled(golang(github.com/golang/groupcache)) = 869f871628b6baa9cfbc11732cdf6546b17c1298 Provides: bundled(golang(github.com/golang/protobuf)) = 84668698ea25b64748563aa20726db66a6b8d299 Provides: bundled(golang(github.com/googleapis/gax-go)) = bd5b16380fd03dc758d11cef74ba2e3bc8b0e8c2 +Provides: bundled(golang(github.com/google/btree)) = 4030bb1f1f0c35b30ca7009e9ebd06849dd45306 Provides: bundled(golang(github.com/google/certificate-transparency-go)) = 37a384cd035e722ea46e55029093e26687138edf Provides: bundled(golang(github.com/google/go-cmp)) = 3af367b6b30c263d47e8895973edcca9a49cf029 Provides: bundled(golang(github.com/google/shlex)) = e7afc7fbc51079733e9468cdfd1efcd7d196cd1d @@ -164,7 +165,7 @@ Provides: bundled(golang(github.com/hashicorp/go-memdb)) = cb9a474f84cc5e4 Provides: bundled(golang(github.com/hashicorp/go-msgpack)) = 71c2886f5a673a35f909803f38ece5810165097b Provides: bundled(golang(github.com/hashicorp/go-multierror)) = 886a7fbe3eb1c874d46f623bfa70af45f425b3d1 Provides: bundled(golang(github.com/hashicorp/go-sockaddr)) = c7188e74f6acae5a989bdc959aa779f8b9f42faf -Provides: bundled(golang(github.com/hashicorp/memberlist)) = 3d8438da9589e7b608a83ffac1ef8211486bcb7c +Provides: bundled(golang(github.com/hashicorp/memberlist)) = e6ff9b2d87a3f0f3f04abb5672ada3ac2a640223 Provides: bundled(golang(github.com/hashicorp/serf)) = 598c54895cc5a7b1a24a398d635e8c0ea0959870 Provides: bundled(golang(github.com/imdario/mergo)) = 1afb36080aec31e0d1528973ebe6721b191b0369 Provides: bundled(golang(github.com/inconshreveable/mousetrap)) = 76626ae9c91c4f2a10f34cad8ce83ea42c93bb75 @@ -178,7 +179,7 @@ Provides: bundled(golang(github.com/Microsoft/opengcs)) = a10967154e143a36 Provides: bundled(golang(github.com/miekg/dns)) = 6c0c4e6581f8e173cc562c8b3363ab984e4ae071 Provides: bundled(golang(github.com/mistifyio/go-zfs)) = f784269be439d704d3dfa1906f45dd848fed2beb Provides: bundled(golang(github.com/mitchellh/hashstructure)) = a38c50148365edc8df43c1580c48fb2b3a1e9cd7 -Provides: bundled(golang(github.com/moby/buildkit)) = bc07b2b81b1c6a62d29981ac564b16a15ce2bfa7 +Provides: bundled(golang(github.com/moby/buildkit)) = 3a1eeca59a9263613d996ead67d53a4b7d45723d Provides: bundled(golang(github.com/moby/ipvs)) = 4566ccea0e08d68e9614c3e7a64a23b850c4bb35 Provides: bundled(golang(github.com/moby/locker)) = 281af2d563954745bea9d1487c965f24d30742fe Provides: bundled(golang(github.com/moby/sys)) = 1bc8673b57550ddf85262eb0fed0aac651a37dab @@ -210,7 +211,7 @@ Provides: bundled(golang(github.com/tchap/go-patricia)) = a7f0089c6f496e8e Provides: bundled(golang(github.com/tinylib/msgp)) = af6442a0fcf6e2a1b824f70dd0c734f01e817751 Provides: bundled(golang(github.com/tonistiigi/fsutil)) = 0834f99b7b85462efb69b4f571a4fa3ca7da5ac9 Provides: bundled(golang(github.com/tonistiigi/units)) = 6950e57a87eaf136bbe44ef2ec8e75b9e3569de2 -Provides: bundled(golang(github.com/vbatts/tar-split)) = 620714a4c508c880ac1bdda9c8370a2b19af1a55 +Provides: bundled(golang(github.com/vbatts/tar-split)) = 80a436fd6164c557b131f7c59ed69bd81af69761 Provides: bundled(golang(github.com/vishvananda/netlink)) = f049be6f391489d3f374498fe0c8df8449258372 Provides: bundled(golang(github.com/vishvananda/netns)) = db3c7e526aae966c4ccfa6c8189b693d6ac5d202 Provides: bundled(golang(github.com/willf/bitset)) = 559910e8471e48d76d9e5a1ba15842dee77ad45d diff --git a/sources b/sources index fe500bf..777e3b7 100644 --- a/sources +++ b/sources @@ -1,3 +1,3 @@ -SHA512 (cli-20.10.18.tar.gz) = fe5359015041f99bacf7b674a99ab7772d9e71eb6c6fefd6acb28f2afee4321a7517a53497627ae9cae8c6e0c253971a53d0579a630a3d71986edd7300a0a8ab -SHA512 (moby-20.10.18.tar.gz) = 202f9f4d455329907e87bd95549aa433b6c773d3067cc89d0bd2e087bddfc66faddd6c2019843e42bf3fed6d6584ba4ab61d762f436f8bb164aa11e6280c91c5 +SHA512 (cli-20.10.19.tar.gz) = 536f2549334e928fa999be36d96fe99e462f2a7825a8e044c7917a148ee7e504564ee08477d07c213e72a0caf076847b00475e359b01b2ef65f480cdad30a422 SHA512 (tini-de40ad0.tar.gz) = 6e21fbcc8ab0daf2f2ac407f8d85373d2873d4b1e7d010056e4dd7071183fe1ede9dadf116c520e68a6226d5eb9d5ede383729327630600ed85080c1586bf3bb +SHA512 (moby-20.10.19.tar.gz) = 50624afc1f278582e7a43234d9beeb293fa6d33bb30393a6222e23748d4e103af75ee2740cbf8f897860b9488de433cce7cf7512cadfcd10109ba90f4d8a6822 From ad80f85b6c9284644eb37d63fae8504127a1ea0c Mon Sep 17 00:00:00 2001 From: Jan Kuparinen Date: Thu, 20 Oct 2022 16:56:20 +0000 Subject: [PATCH 081/163] Update to 20.10.20. Mitigates CVE-2022-39253 --- .gitignore | 2 ++ moby-engine.spec | 10 +++++++--- provides.spec.inc | 10 +++++----- sources | 4 ++-- 4 files changed, 16 insertions(+), 10 deletions(-) diff --git a/.gitignore b/.gitignore index e7b5f08..8740ca5 100644 --- a/.gitignore +++ b/.gitignore @@ -44,3 +44,5 @@ moby-v20.10.10.tar.gz /moby-20.10.18.tar.gz /cli-20.10.19.tar.gz /moby-20.10.19.tar.gz +/cli-20.10.20.tar.gz +/moby-20.10.20.tar.gz \ No newline at end of file diff --git a/moby-engine.spec b/moby-engine.spec index aa82f9d..b2deb4b 100644 --- a/moby-engine.spec +++ b/moby-engine.spec @@ -7,13 +7,13 @@ # moby %global goipath_moby github.com/docker/docker %global git_moby https://%{goipath_moby} -%global commit_moby c964641a0d76733c071d606c72541b263da84a3e +%global commit_moby 03df974ae9e6c219862907efdd76ec2e77ec930b %global shortcommit_moby %(c=%{commit_moby}; echo ${c:0:7}) # cli %global goipath_cli github.com/docker/cli %global git_cli https://%{goipath_cli} -%global commit_cli d85ef845332936556fa43722fc2feb25ef94f39b +%global commit_cli 9fdeb9c3de2f2d9f5799be373f27b2f9df44609d %global shortcommit_cli %(c=%{commit_cli}; echo ${c:0:7}) # tini @@ -22,7 +22,7 @@ %global shortcommit_tini %(c=%{commit_tini}; echo ${c:0:7}) Name: moby-engine -Version: 20.10.19 +Version: 20.10.20 Release: 1%{?dist} Summary: The open-source application container engine License: Apache-2.0 @@ -279,6 +279,10 @@ done %{_datadir}/nano/Dockerfile.nanorc %changelog +* Thu Oct 20 2022 Jan Kuparinen - 20.10.20-1 +- Update to 20.10.20. +- Mitigates CVE-2022-39253 + * Tue Oct 18 2022 Jan Kuparinen - 20.10.19-1 - Update to 20.10.19. diff --git a/provides.spec.inc b/provides.spec.inc index fae8c0d..1f8d4d9 100644 --- a/provides.spec.inc +++ b/provides.spec.inc @@ -2,7 +2,7 @@ Provides: bundled(tini-static) Provides: bundled(golang(github.com/docker/docker)) Provides: bundled(golang(github.com/docker/cli)) -# grep -v -e '^$' -e '^#' cli-20.10.19/vendor.conf | sort | awk '{print "Provides: bundled(golang("$1")) = "$2}' +# grep -v -e '^$' -e '^#' cli-20.10.20/vendor.conf | sort | awk '{print "Provides: bundled(golang("$1")) = "$2}' Provides: bundled(golang(cloud.google.com/go)) = ceeb313ad77b789a7fa5287b36a1d127b69b7093 Provides: bundled(golang(github.com/Azure/go-ansiterm)) = d185dfc1b5a126116ea5a19e148e29d16b4574c9 Provides: bundled(golang(github.com/beorn7/perks)) = 37c8de3658fcb183f997c4e13e8337516ab753e6 @@ -18,8 +18,8 @@ Provides: bundled(golang(github.com/creack/pty)) = 2a38352e8b4d7ab6c336eef Provides: bundled(golang(github.com/davecgh/go-spew)) = 8991bc29aa16c548c550c7ff78260e27b9ab7c73 Provides: bundled(golang(github.com/docker/compose-on-kubernetes)) = 1f9b5b8cb6aca13deee947511801cf89447c1bfe Provides: bundled(golang(github.com/docker/distribution)) = b5ca020cfbe998e5af3457fda087444cf5116496 +Provides: bundled(golang(github.com/docker/docker)) = 03df974ae9e6c219862907efdd76ec2e77ec930b Provides: bundled(golang(github.com/docker/docker-credential-helpers)) = fc9290adbcf1594e78910e2f0334090eaee0e1ee -Provides: bundled(golang(github.com/docker/docker)) = e42327a6d3c55ceda3bd5475be7aae6036d02db3 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 @@ -51,7 +51,7 @@ Provides: bundled(golang(github.com/Microsoft/go-winio)) = 5b44b70ab3ab4d2 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/buildkit)) = c014937225cba29cfb1d5161fd134316c0e9bdaa Provides: bundled(golang(github.com/moby/sys)) = 1bc8673b57550ddf85262eb0fed0aac651a37dab Provides: bundled(golang(github.com/moby/term)) = 3f7ff695adc6a35abc925370dd0a4dafb48ec64d Provides: bundled(golang(github.com/modern-go/concurrent)) = bacd9c7ef1dd9b15be4a9909b8ac7a4e313eec94 @@ -98,7 +98,7 @@ Provides: bundled(golang(k8s.io/klog)) = 4ad0115ba9e45c096d06a31d8dfb0e5bd Provides: bundled(golang(k8s.io/kube-openapi)) = 0270cf2f1c1d995d34b36019a6f65d58e6e33ad4 Provides: bundled(golang(k8s.io/utils)) = 69764acb6e8e900b7c05296c5d3c9c19545475f9 Provides: bundled(golang(sigs.k8s.io/yaml)) = fd68e9863619f6ec2fdd8625fe1f02e7c877e480 -# grep -v -e '^$' -e '^#' moby-20.10.19/vendor.conf | sort | awk '{print "Provides: bundled(golang("$1")) = "$2}' +# grep -v -e '^$' -e '^#' moby-20.10.20/vendor.conf | sort | awk '{print "Provides: bundled(golang("$1")) = "$2}' Provides: bundled(golang(cloud.google.com/go)) = ceeb313ad77b789a7fa5287b36a1d127b69b7093 Provides: bundled(golang(code.cloudfoundry.org/clock)) = 02e53af36e6c978af692887ed449b74026d76fec Provides: bundled(golang(github.com/armon/go-metrics)) = f0300d1749da6fa982027e449ec0c7a145510c3c @@ -179,7 +179,7 @@ Provides: bundled(golang(github.com/Microsoft/opengcs)) = a10967154e143a36 Provides: bundled(golang(github.com/miekg/dns)) = 6c0c4e6581f8e173cc562c8b3363ab984e4ae071 Provides: bundled(golang(github.com/mistifyio/go-zfs)) = f784269be439d704d3dfa1906f45dd848fed2beb Provides: bundled(golang(github.com/mitchellh/hashstructure)) = a38c50148365edc8df43c1580c48fb2b3a1e9cd7 -Provides: bundled(golang(github.com/moby/buildkit)) = 3a1eeca59a9263613d996ead67d53a4b7d45723d +Provides: bundled(golang(github.com/moby/buildkit)) = c014937225cba29cfb1d5161fd134316c0e9bdaa Provides: bundled(golang(github.com/moby/ipvs)) = 4566ccea0e08d68e9614c3e7a64a23b850c4bb35 Provides: bundled(golang(github.com/moby/locker)) = 281af2d563954745bea9d1487c965f24d30742fe Provides: bundled(golang(github.com/moby/sys)) = 1bc8673b57550ddf85262eb0fed0aac651a37dab diff --git a/sources b/sources index 777e3b7..952a52d 100644 --- a/sources +++ b/sources @@ -1,3 +1,3 @@ -SHA512 (cli-20.10.19.tar.gz) = 536f2549334e928fa999be36d96fe99e462f2a7825a8e044c7917a148ee7e504564ee08477d07c213e72a0caf076847b00475e359b01b2ef65f480cdad30a422 +SHA512 (cli-20.10.20.tar.gz) = 536c26b421fb0ca92a09ff67f4fa3afd64115ef9f748ae7fb6d3448c4c1acade72bef037f71017e9c3e039ecada95fb157d9f336ee3348be1f21874730bcb03e SHA512 (tini-de40ad0.tar.gz) = 6e21fbcc8ab0daf2f2ac407f8d85373d2873d4b1e7d010056e4dd7071183fe1ede9dadf116c520e68a6226d5eb9d5ede383729327630600ed85080c1586bf3bb -SHA512 (moby-20.10.19.tar.gz) = 50624afc1f278582e7a43234d9beeb293fa6d33bb30393a6222e23748d4e103af75ee2740cbf8f897860b9488de433cce7cf7512cadfcd10109ba90f4d8a6822 +SHA512 (moby-20.10.20.tar.gz) = f5e5bcf18fcdca8b7d5a2226091b22c14c144e632723a0ac0058d5f9bedba884cbba7bc16c06f30d9906713ec0cfa2a43839c64df9917e243122d125a4808bec From 156ac0947233063baffaea1c8356353d830b128d Mon Sep 17 00:00:00 2001 From: Maxwell G Date: Thu, 20 Oct 2022 23:56:40 -0500 Subject: [PATCH 082/163] Enhance update.sh - Set %_sourcedir to PWD so `rpmspec` can parse the %include in the specfile. Previously, this replied on users modifying ~/.rpmmacros. - Add explanatory comments and USAGE instructions - Avoid broad `git add` --- update.sh | 13 +++++++++++-- 1 file changed, 11 insertions(+), 2 deletions(-) diff --git a/update.sh b/update.sh index 6e6718c..8c78a70 100755 --- a/update.sh +++ b/update.sh @@ -2,15 +2,22 @@ # SPDX-FileCopyrightText: 2022 Maxwell G (@gotmax23) # SPDX-License-Identifier: MIT +# USAGE: After bumping the version in moby-engine.spec and downloading the new +# sources, run this script in moby-engine's distgit repository to update the +# package's virtual Provides. + set -euo pipefail +# Note(gotmax23): I have a separate update.sh script in my $PATH. +# When that exists, this script will run that first. +# You can ignore this. if command -v update.sh && [ "$#" -gt 0 ]; then update.sh "$@" fi fedpkg prep -version="$(rpmspec -q --srpm --qf '%{version}\n' *.spec)" +version="$(rpmspec -D '_sourcedir %(pwd)' -q --srpm --qf '%{version}\n' *.spec)" cat << EOF > provides.spec.inc # Bundled dependencies @@ -28,7 +35,9 @@ EOF grep -v -e '^$' -e '^#' "moby-${version}/vendor.conf" | sort | awk '{print "Provides: bundled(golang("$1")) = "$2}' >> provides.spec.inc +# Note(gotmax23): Ignore this also. My script commits the specfile, +# and then this ammends that commit to add the updated provides.spec.inc. if command -v update.sh && [ "$#" -gt 0 ]; then - git add --update + git add provides.spec.inc git commit --gpg-sign --amend --no-edit fi From f5208d1b0215a36c3f191cd3054762c5a68bab7b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Dan=20=C4=8Cerm=C3=A1k?= Date: Wed, 14 Dec 2022 15:50:47 +0100 Subject: [PATCH 083/163] Update to 20.10.21 --- .gitignore | 4 +++- moby-engine.spec | 9 ++++++--- provides.spec.inc | 11 ++++++----- sources | 4 ++-- 4 files changed, 17 insertions(+), 11 deletions(-) diff --git a/.gitignore b/.gitignore index 8740ca5..134e8d6 100644 --- a/.gitignore +++ b/.gitignore @@ -45,4 +45,6 @@ moby-v20.10.10.tar.gz /cli-20.10.19.tar.gz /moby-20.10.19.tar.gz /cli-20.10.20.tar.gz -/moby-20.10.20.tar.gz \ No newline at end of file +/moby-20.10.20.tar.gz +/cli-20.10.21.tar.gz +/moby-20.10.21.tar.gz diff --git a/moby-engine.spec b/moby-engine.spec index b2deb4b..c5f73cc 100644 --- a/moby-engine.spec +++ b/moby-engine.spec @@ -7,13 +7,13 @@ # moby %global goipath_moby github.com/docker/docker %global git_moby https://%{goipath_moby} -%global commit_moby 03df974ae9e6c219862907efdd76ec2e77ec930b +%global commit_moby 9fdeb9c3de2f2d9f5799be373f27b2f9df44609d %global shortcommit_moby %(c=%{commit_moby}; echo ${c:0:7}) # cli %global goipath_cli github.com/docker/cli %global git_cli https://%{goipath_cli} -%global commit_cli 9fdeb9c3de2f2d9f5799be373f27b2f9df44609d +%global commit_cli baeda1f82a10204ec5708d5fbba130ad76cfee49 %global shortcommit_cli %(c=%{commit_cli}; echo ${c:0:7}) # tini @@ -22,7 +22,7 @@ %global shortcommit_tini %(c=%{commit_tini}; echo ${c:0:7}) Name: moby-engine -Version: 20.10.20 +Version: 20.10.21 Release: 1%{?dist} Summary: The open-source application container engine License: Apache-2.0 @@ -279,6 +279,9 @@ done %{_datadir}/nano/Dockerfile.nanorc %changelog +* Wed Dec 14 2022 Dan Čermák - 20.10.21-1 +- Update to 20.10.21 + * Thu Oct 20 2022 Jan Kuparinen - 20.10.20-1 - Update to 20.10.20. - Mitigates CVE-2022-39253 diff --git a/provides.spec.inc b/provides.spec.inc index 1f8d4d9..1ba3707 100644 --- a/provides.spec.inc +++ b/provides.spec.inc @@ -2,7 +2,7 @@ Provides: bundled(tini-static) Provides: bundled(golang(github.com/docker/docker)) Provides: bundled(golang(github.com/docker/cli)) -# grep -v -e '^$' -e '^#' cli-20.10.20/vendor.conf | sort | awk '{print "Provides: bundled(golang("$1")) = "$2}' +# grep -v -e '^$' -e '^#' cli-20.10.21/vendor.conf | sort | awk '{print "Provides: bundled(golang("$1")) = "$2}' Provides: bundled(golang(cloud.google.com/go)) = ceeb313ad77b789a7fa5287b36a1d127b69b7093 Provides: bundled(golang(github.com/Azure/go-ansiterm)) = d185dfc1b5a126116ea5a19e148e29d16b4574c9 Provides: bundled(golang(github.com/beorn7/perks)) = 37c8de3658fcb183f997c4e13e8337516ab753e6 @@ -98,13 +98,14 @@ Provides: bundled(golang(k8s.io/klog)) = 4ad0115ba9e45c096d06a31d8dfb0e5bd Provides: bundled(golang(k8s.io/kube-openapi)) = 0270cf2f1c1d995d34b36019a6f65d58e6e33ad4 Provides: bundled(golang(k8s.io/utils)) = 69764acb6e8e900b7c05296c5d3c9c19545475f9 Provides: bundled(golang(sigs.k8s.io/yaml)) = fd68e9863619f6ec2fdd8625fe1f02e7c877e480 -# grep -v -e '^$' -e '^#' moby-20.10.20/vendor.conf | sort | awk '{print "Provides: bundled(golang("$1")) = "$2}' +# grep -v -e '^$' -e '^#' moby-20.10.21/vendor.conf | sort | awk '{print "Provides: bundled(golang("$1")) = "$2}' Provides: bundled(golang(cloud.google.com/go)) = ceeb313ad77b789a7fa5287b36a1d127b69b7093 Provides: bundled(golang(code.cloudfoundry.org/clock)) = 02e53af36e6c978af692887ed449b74026d76fec +Provides: bundled(golang(github.com/armon/circbuf)) = 5111143e8da2e98b4ea6a8f32b9065ea1821c191 Provides: bundled(golang(github.com/armon/go-metrics)) = f0300d1749da6fa982027e449ec0c7a145510c3c Provides: bundled(golang(github.com/armon/go-radix)) = e39d623f12e8e41c7b5529e9a9dd67a1e2261f80 Provides: bundled(golang(github.com/aws/aws-sdk-go)) = 2590bc875c54c9fda225d8e4e56a9d28d90c6a47 -Provides: bundled(golang(github.com/Azure/go-ansiterm)) = d6e3b3328b783f23731bc4d058875b0371ff8109 +Provides: bundled(golang(github.com/Azure/go-ansiterm)) = d185dfc1b5a126116ea5a19e148e29d16b4574c9 Provides: bundled(golang(github.com/beorn7/perks)) = 37c8de3658fcb183f997c4e13e8337516ab753e6 Provides: bundled(golang(github.com/bsphere/le_go)) = 7a984a84b5492ae539b79b62fb4a10afc63c7bcf Provides: bundled(golang(github.com/BurntSushi/toml)) = 3012a1dbe2e4bd1391d42b32f0577cb7bbc7f005 @@ -179,11 +180,11 @@ Provides: bundled(golang(github.com/Microsoft/opengcs)) = a10967154e143a36 Provides: bundled(golang(github.com/miekg/dns)) = 6c0c4e6581f8e173cc562c8b3363ab984e4ae071 Provides: bundled(golang(github.com/mistifyio/go-zfs)) = f784269be439d704d3dfa1906f45dd848fed2beb Provides: bundled(golang(github.com/mitchellh/hashstructure)) = a38c50148365edc8df43c1580c48fb2b3a1e9cd7 -Provides: bundled(golang(github.com/moby/buildkit)) = c014937225cba29cfb1d5161fd134316c0e9bdaa +Provides: bundled(golang(github.com/moby/buildkit)) = eeb7b65ab7d651770a5ec52a06ea7c96eb97a249 Provides: bundled(golang(github.com/moby/ipvs)) = 4566ccea0e08d68e9614c3e7a64a23b850c4bb35 Provides: bundled(golang(github.com/moby/locker)) = 281af2d563954745bea9d1487c965f24d30742fe Provides: bundled(golang(github.com/moby/sys)) = 1bc8673b57550ddf85262eb0fed0aac651a37dab -Provides: bundled(golang(github.com/moby/term)) = bea5bbe245bf407372d477f1361d2ff042d2f556 +Provides: bundled(golang(github.com/moby/term)) = 3f7ff695adc6a35abc925370dd0a4dafb48ec64d Provides: bundled(golang(github.com/modern-go/concurrent)) = bacd9c7ef1dd9b15be4a9909b8ac7a4e313eec94 Provides: bundled(golang(github.com/modern-go/reflect2)) = 94122c33edd36123c84d5368cfb2b69df93a0ec8 Provides: bundled(golang(github.com/morikuni/aec)) = 39771216ff4c63d11f5e604076f9c45e8be1067b diff --git a/sources b/sources index 952a52d..b462bb5 100644 --- a/sources +++ b/sources @@ -1,3 +1,3 @@ -SHA512 (cli-20.10.20.tar.gz) = 536c26b421fb0ca92a09ff67f4fa3afd64115ef9f748ae7fb6d3448c4c1acade72bef037f71017e9c3e039ecada95fb157d9f336ee3348be1f21874730bcb03e +SHA512 (cli-20.10.21.tar.gz) = 951100d75c833e1c844203fe86d73d25c3164eba4fce87cc05a0ac3691851fc5341c3b32ce3814dd61bd3700d8e8e1d045a7a5651c6dc5ddc0a39c58db9bd7b3 SHA512 (tini-de40ad0.tar.gz) = 6e21fbcc8ab0daf2f2ac407f8d85373d2873d4b1e7d010056e4dd7071183fe1ede9dadf116c520e68a6226d5eb9d5ede383729327630600ed85080c1586bf3bb -SHA512 (moby-20.10.20.tar.gz) = f5e5bcf18fcdca8b7d5a2226091b22c14c144e632723a0ac0058d5f9bedba884cbba7bc16c06f30d9906713ec0cfa2a43839c64df9917e243122d125a4808bec +SHA512 (moby-20.10.21.tar.gz) = de8186d191884ff678c84fefb11833205b5a46face266d432c7640bcda2677da331f74e835026c05c90df2a19d88b6e5f5acb004891049ebdec52a101d130375 From e0b83f12567b5606181c3478856c132965fcb9f6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?S=C3=A9rgio=20M=2E=20Basto?= Date: Fri, 16 Dec 2022 02:40:16 +0000 Subject: [PATCH 084/163] Fix build, use libnetwork from golang-github-docker-0:22.06.0~beta --- moby-engine.spec | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/moby-engine.spec b/moby-engine.spec index c5f73cc..7f11255 100644 --- a/moby-engine.spec +++ b/moby-engine.spec @@ -41,7 +41,7 @@ URL: https://www.docker.com ExclusiveArch: %{golang_arches} -BuildRequires: golang(github.com/docker/libnetwork) +BuildRequires: golang(github.com/docker/docker/libnetwork) BuildRequires: pkgconfig(libbtrfsutil) BuildRequires: pkgconfig(devmapper) BuildRequires: golang @@ -142,7 +142,7 @@ mkdir -p _build/bin # Build binary using `golang-github-docker-libnetwork-devel` # (github.com/docker/libnetwork) installed in system GOPATH. export GOPATH="%{_datadir}/gocode" - %gobuild -o _build/bin/docker-proxy github.com/docker/libnetwork/cmd/proxy + %gobuild -o _build/bin/docker-proxy github.com/docker/docker/cmd/docker-proxy ) # build tini (installed as docker-init) @@ -281,6 +281,7 @@ done %changelog * Wed Dec 14 2022 Dan Čermák - 20.10.21-1 - Update to 20.10.21 +- Fix build, use libnetwork from golang-github-docker-0:22.06.0~beta * Thu Oct 20 2022 Jan Kuparinen - 20.10.20-1 - Update to 20.10.20. From 0d34fae57d5e4bac586cbb9fa249a9104635bca1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?S=C3=A9rgio=20M=2E=20Basto?= Date: Sun, 1 Jan 2023 23:21:43 +0000 Subject: [PATCH 085/163] Fix build for btrfs-progs-6.1 --- 44707.patch | 36 ++++++++++++++++++++++++++++++++++++ moby-engine.spec | 4 ++++ 2 files changed, 40 insertions(+) create mode 100644 44707.patch diff --git a/44707.patch b/44707.patch new file mode 100644 index 0000000..39d72bc --- /dev/null +++ b/44707.patch @@ -0,0 +1,36 @@ +From ffbbe3d103b045c3f8ec5f74aa71b7a314fd57fe Mon Sep 17 00:00:00 2001 +From: Shengjing Zhu +Date: Thu, 29 Dec 2022 02:37:39 +0800 +Subject: [PATCH] daemon/graphdriver/btrfs: workaround field rename in + btrfs-progs 6.1 + +Closes: #44698 + +Signed-off-by: Shengjing Zhu +--- + daemon/graphdriver/btrfs/btrfs.go | 5 ++++- + 1 file changed, 4 insertions(+), 1 deletion(-) + +diff --git a/daemon/graphdriver/btrfs/btrfs.go b/daemon/graphdriver/btrfs/btrfs.go +index 720f1ab0cd43..f2f6bf9e975b 100644 +--- a/daemon/graphdriver/btrfs/btrfs.go ++++ b/daemon/graphdriver/btrfs/btrfs.go +@@ -6,6 +6,9 @@ package btrfs // import "github.com/docker/docker/daemon/graphdriver/btrfs" + /* + #include + #include ++ ++// keep struct field name compatible with btrfs-progs < 6.1. ++#define max_referenced max_rfer + #include + #include + +@@ -395,7 +398,7 @@ func subvolLimitQgroup(path string, size uint64) error { + defer closeDir(dir) + + var args C.struct_btrfs_ioctl_qgroup_limit_args +- args.lim.max_referenced = C.__u64(size) ++ args.lim.max_rfer = C.__u64(size) + args.lim.flags = C.BTRFS_QGROUP_LIMIT_MAX_RFER + _, _, errno := unix.Syscall(unix.SYS_IOCTL, getDirFd(dir), C.BTRFS_IOC_QGROUP_LIMIT, + uintptr(unsafe.Pointer(&args))) diff --git a/moby-engine.spec b/moby-engine.spec index 7f11255..2efe5c5 100644 --- a/moby-engine.spec +++ b/moby-engine.spec @@ -37,6 +37,9 @@ Source5: moby-engine-systemd-sysusers.conf Source100: provides.spec.inc # Specfile license Source200: moby-engine.spec.license + +# Fix build for btrfs-progs-6.1 +Patch1: 44707.patch URL: https://www.docker.com ExclusiveArch: %{golang_arches} @@ -128,6 +131,7 @@ This package installs %{summary}. %prep %setup -q -a 1 -a 2 -n moby-%{version} +%patch1 -p1 # correct rpmlint errors for bash completion sed -i '/env bash/d' cli-%{version}/contrib/completion/bash/docker From be74733fbe8e860005c0e97c4b917d2c239ab8b0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?S=C3=A9rgio=20M=2E=20Basto?= Date: Sun, 1 Jan 2023 23:24:02 +0000 Subject: [PATCH 086/163] Update moby-engine to 20.10.22 --- moby-engine.spec | 5 ++++- provides.spec.inc | 12 ++++++------ 2 files changed, 10 insertions(+), 7 deletions(-) diff --git a/moby-engine.spec b/moby-engine.spec index 2efe5c5..5147b48 100644 --- a/moby-engine.spec +++ b/moby-engine.spec @@ -22,7 +22,7 @@ %global shortcommit_tini %(c=%{commit_tini}; echo ${c:0:7}) Name: moby-engine -Version: 20.10.21 +Version: 20.10.22 Release: 1%{?dist} Summary: The open-source application container engine License: Apache-2.0 @@ -283,6 +283,9 @@ done %{_datadir}/nano/Dockerfile.nanorc %changelog +* Sun Jan 01 2023 Sérgio Basto +- Update moby-engine to 20.10.22 + * Wed Dec 14 2022 Dan Čermák - 20.10.21-1 - Update to 20.10.21 - Fix build, use libnetwork from golang-github-docker-0:22.06.0~beta diff --git a/provides.spec.inc b/provides.spec.inc index 1ba3707..b50d762 100644 --- a/provides.spec.inc +++ b/provides.spec.inc @@ -2,7 +2,7 @@ Provides: bundled(tini-static) Provides: bundled(golang(github.com/docker/docker)) Provides: bundled(golang(github.com/docker/cli)) -# grep -v -e '^$' -e '^#' cli-20.10.21/vendor.conf | sort | awk '{print "Provides: bundled(golang("$1")) = "$2}' +# grep -v -e '^$' -e '^#' cli-20.10.22/vendor.conf | sort | awk '{print "Provides: bundled(golang("$1")) = "$2}' Provides: bundled(golang(cloud.google.com/go)) = ceeb313ad77b789a7fa5287b36a1d127b69b7093 Provides: bundled(golang(github.com/Azure/go-ansiterm)) = d185dfc1b5a126116ea5a19e148e29d16b4574c9 Provides: bundled(golang(github.com/beorn7/perks)) = 37c8de3658fcb183f997c4e13e8337516ab753e6 @@ -18,7 +18,7 @@ Provides: bundled(golang(github.com/creack/pty)) = 2a38352e8b4d7ab6c336eef Provides: bundled(golang(github.com/davecgh/go-spew)) = 8991bc29aa16c548c550c7ff78260e27b9ab7c73 Provides: bundled(golang(github.com/docker/compose-on-kubernetes)) = 1f9b5b8cb6aca13deee947511801cf89447c1bfe Provides: bundled(golang(github.com/docker/distribution)) = b5ca020cfbe998e5af3457fda087444cf5116496 -Provides: bundled(golang(github.com/docker/docker)) = 03df974ae9e6c219862907efdd76ec2e77ec930b +Provides: bundled(golang(github.com/docker/docker)) = 3056208812eb5e792fa99736c9167d1e10f4ab49 Provides: bundled(golang(github.com/docker/docker-credential-helpers)) = fc9290adbcf1594e78910e2f0334090eaee0e1ee Provides: bundled(golang(github.com/docker/go-connections)) = 7395e3f8aa162843a74ed6d48e79627d9792ac55 Provides: bundled(golang(github.com/docker/go)) = d30aec9fd63c35133f8f79c3412ad91a3b08be06 @@ -51,7 +51,7 @@ Provides: bundled(golang(github.com/Microsoft/go-winio)) = 5b44b70ab3ab4d2 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)) = c014937225cba29cfb1d5161fd134316c0e9bdaa +Provides: bundled(golang(github.com/moby/buildkit)) = eeb7b65ab7d651770a5ec52a06ea7c96eb97a249 Provides: bundled(golang(github.com/moby/sys)) = 1bc8673b57550ddf85262eb0fed0aac651a37dab Provides: bundled(golang(github.com/moby/term)) = 3f7ff695adc6a35abc925370dd0a4dafb48ec64d Provides: bundled(golang(github.com/modern-go/concurrent)) = bacd9c7ef1dd9b15be4a9909b8ac7a4e313eec94 @@ -77,7 +77,7 @@ Provides: bundled(golang(github.com/tonistiigi/units)) = 6950e57a87eaf136b 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/crypto)) = 642fcc37f5043eadb2509c84b2769e729e7d27ef Provides: bundled(golang(golang.org/x/net)) = ab34263943818b32f575efc978a3d24e80b04bd7 Provides: bundled(golang(golang.org/x/oauth2)) = bf48bf16ab8d622ce64ec6ce98d2c98f916b6303 Provides: bundled(golang(golang.org/x/sync)) = cd5d95a43a6e21273425c7ae415d3df9ea832eeb @@ -98,7 +98,7 @@ Provides: bundled(golang(k8s.io/klog)) = 4ad0115ba9e45c096d06a31d8dfb0e5bd Provides: bundled(golang(k8s.io/kube-openapi)) = 0270cf2f1c1d995d34b36019a6f65d58e6e33ad4 Provides: bundled(golang(k8s.io/utils)) = 69764acb6e8e900b7c05296c5d3c9c19545475f9 Provides: bundled(golang(sigs.k8s.io/yaml)) = fd68e9863619f6ec2fdd8625fe1f02e7c877e480 -# grep -v -e '^$' -e '^#' moby-20.10.21/vendor.conf | sort | awk '{print "Provides: bundled(golang("$1")) = "$2}' +# grep -v -e '^$' -e '^#' moby-20.10.22/vendor.conf | sort | awk '{print "Provides: bundled(golang("$1")) = "$2}' Provides: bundled(golang(cloud.google.com/go)) = ceeb313ad77b789a7fa5287b36a1d127b69b7093 Provides: bundled(golang(code.cloudfoundry.org/clock)) = 02e53af36e6c978af692887ed449b74026d76fec Provides: bundled(golang(github.com/armon/circbuf)) = 5111143e8da2e98b4ea6a8f32b9065ea1821c191 @@ -134,7 +134,7 @@ Provides: bundled(golang(github.com/docker/go-events)) = e31b211e4f1cd09aa Provides: bundled(golang(github.com/docker/go-metrics)) = b619b3592b65de4f087d9f16863a7e6ff905973c Provides: bundled(golang(github.com/docker/go-units)) = 519db1ee28dcc9fd2474ae59fca29a810482bfb1 Provides: bundled(golang(github.com/docker/libkv)) = 458977154600b9f23984d9f4b82e79570b5ae12b -Provides: bundled(golang(github.com/docker/libnetwork)) = 0dde5c895075df6e3630e76f750a447cf63f4789 +Provides: bundled(golang(github.com/docker/libnetwork)) = dcdf8f176d1e13ad719e913e796fb698d846de98 Provides: bundled(golang(github.com/docker/libtrust)) = 9cbd2a1374f46905c68a4eb3694a130610adc62a Provides: bundled(golang(github.com/docker/swarmkit)) = cf1e0f8d95ee37ea1f9a5f8a54c73c1e0fa58a54 Provides: bundled(golang(github.com/fernet/fernet-go)) = 9eac43b88a5efb8651d24de9b68e87567e029736 From 0dbef888936eafec1aa42117360f48a1e8e11832 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?S=C3=A9rgio=20M=2E=20Basto?= Date: Mon, 2 Jan 2023 04:46:38 +0000 Subject: [PATCH 087/163] Update sources --- .gitignore | 2 ++ sources | 4 ++-- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/.gitignore b/.gitignore index 134e8d6..fe9e534 100644 --- a/.gitignore +++ b/.gitignore @@ -48,3 +48,5 @@ moby-v20.10.10.tar.gz /moby-20.10.20.tar.gz /cli-20.10.21.tar.gz /moby-20.10.21.tar.gz +/cli-20.10.22.tar.gz +/moby-20.10.22.tar.gz diff --git a/sources b/sources index b462bb5..ac44a7f 100644 --- a/sources +++ b/sources @@ -1,3 +1,3 @@ -SHA512 (cli-20.10.21.tar.gz) = 951100d75c833e1c844203fe86d73d25c3164eba4fce87cc05a0ac3691851fc5341c3b32ce3814dd61bd3700d8e8e1d045a7a5651c6dc5ddc0a39c58db9bd7b3 +SHA512 (cli-20.10.22.tar.gz) = 550346904d172725f48c4de0e34fa95123c7022b14980d30cd01df0c9e154ac817f19e24b61538f8cbc23db090de56977c8b885b96f99583e8a5f773691280a6 +SHA512 (moby-20.10.22.tar.gz) = 81aec7faedced07718e3e228e999c4774fd293cedfacd272798a0057177ddca5322a701d0f644777a69b87140cd7a7194aa93a524507f202d050eb30b1a4142c SHA512 (tini-de40ad0.tar.gz) = 6e21fbcc8ab0daf2f2ac407f8d85373d2873d4b1e7d010056e4dd7071183fe1ede9dadf116c520e68a6226d5eb9d5ede383729327630600ed85080c1586bf3bb -SHA512 (moby-20.10.21.tar.gz) = de8186d191884ff678c84fefb11833205b5a46face266d432c7640bcda2677da331f74e835026c05c90df2a19d88b6e5f5acb004891049ebdec52a101d130375 From 53ccd238226ce93a88d830b74937e49d9abe6fd7 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 19 Jan 2023 20:28:36 +0000 Subject: [PATCH 088/163] Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- moby-engine.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/moby-engine.spec b/moby-engine.spec index 5147b48..745cd4d 100644 --- a/moby-engine.spec +++ b/moby-engine.spec @@ -23,7 +23,7 @@ Name: moby-engine Version: 20.10.22 -Release: 1%{?dist} +Release: 2%{?dist} Summary: The open-source application container engine License: Apache-2.0 Source0: %{git_moby}/archive/v%{version}/moby-%{version}.tar.gz @@ -283,6 +283,9 @@ done %{_datadir}/nano/Dockerfile.nanorc %changelog +* Thu Jan 19 2023 Fedora Release Engineering +- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild + * Sun Jan 01 2023 Sérgio Basto - Update moby-engine to 20.10.22 From 96816033894cab0db1c3a22787d28652fc240010 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?S=C3=A9rgio=20M=2E=20Basto?= Date: Sun, 29 Jan 2023 16:31:39 +0000 Subject: [PATCH 089/163] Update moby-engine to 20.10.23 --- 44707.patch | 36 ------------------------------------ moby-engine.spec | 22 +++++++++++----------- provides.spec.inc | 8 ++++---- 3 files changed, 15 insertions(+), 51 deletions(-) delete mode 100644 44707.patch diff --git a/44707.patch b/44707.patch deleted file mode 100644 index 39d72bc..0000000 --- a/44707.patch +++ /dev/null @@ -1,36 +0,0 @@ -From ffbbe3d103b045c3f8ec5f74aa71b7a314fd57fe Mon Sep 17 00:00:00 2001 -From: Shengjing Zhu -Date: Thu, 29 Dec 2022 02:37:39 +0800 -Subject: [PATCH] daemon/graphdriver/btrfs: workaround field rename in - btrfs-progs 6.1 - -Closes: #44698 - -Signed-off-by: Shengjing Zhu ---- - daemon/graphdriver/btrfs/btrfs.go | 5 ++++- - 1 file changed, 4 insertions(+), 1 deletion(-) - -diff --git a/daemon/graphdriver/btrfs/btrfs.go b/daemon/graphdriver/btrfs/btrfs.go -index 720f1ab0cd43..f2f6bf9e975b 100644 ---- a/daemon/graphdriver/btrfs/btrfs.go -+++ b/daemon/graphdriver/btrfs/btrfs.go -@@ -6,6 +6,9 @@ package btrfs // import "github.com/docker/docker/daemon/graphdriver/btrfs" - /* - #include - #include -+ -+// keep struct field name compatible with btrfs-progs < 6.1. -+#define max_referenced max_rfer - #include - #include - -@@ -395,7 +398,7 @@ func subvolLimitQgroup(path string, size uint64) error { - defer closeDir(dir) - - var args C.struct_btrfs_ioctl_qgroup_limit_args -- args.lim.max_referenced = C.__u64(size) -+ args.lim.max_rfer = C.__u64(size) - args.lim.flags = C.BTRFS_QGROUP_LIMIT_MAX_RFER - _, _, errno := unix.Syscall(unix.SYS_IOCTL, getDirFd(dir), C.BTRFS_IOC_QGROUP_LIMIT, - uintptr(unsafe.Pointer(&args))) diff --git a/moby-engine.spec b/moby-engine.spec index 745cd4d..6ae89ba 100644 --- a/moby-engine.spec +++ b/moby-engine.spec @@ -6,15 +6,15 @@ # moby %global goipath_moby github.com/docker/docker -%global git_moby https://%{goipath_moby} -%global commit_moby 9fdeb9c3de2f2d9f5799be373f27b2f9df44609d -%global shortcommit_moby %(c=%{commit_moby}; echo ${c:0:7}) +%global git_moby https://%%{goipath_moby} +#%%global commit_moby 9fdeb9c3de2f2d9f5799be373f27b2f9df44609d +#%%global shortcommit_moby %%(c=%%{commit_moby}; echo ${c:0:7}) # cli %global goipath_cli github.com/docker/cli -%global git_cli https://%{goipath_cli} -%global commit_cli baeda1f82a10204ec5708d5fbba130ad76cfee49 -%global shortcommit_cli %(c=%{commit_cli}; echo ${c:0:7}) +%global git_cli https://%%{goipath_cli} +#%%global commit_cli baeda1f82a10204ec5708d5fbba130ad76cfee49 +#%%global shortcommit_cli %%(c=%%{commit_cli}; echo ${c:0:7}) # tini %global git_tini https://github.com/krallin/tini @@ -22,8 +22,8 @@ %global shortcommit_tini %(c=%{commit_tini}; echo ${c:0:7}) Name: moby-engine -Version: 20.10.22 -Release: 2%{?dist} +Version: 20.10.23 +Release: 1%{?dist} Summary: The open-source application container engine License: Apache-2.0 Source0: %{git_moby}/archive/v%{version}/moby-%{version}.tar.gz @@ -38,8 +38,6 @@ Source100: provides.spec.inc # Specfile license Source200: moby-engine.spec.license -# Fix build for btrfs-progs-6.1 -Patch1: 44707.patch URL: https://www.docker.com ExclusiveArch: %{golang_arches} @@ -131,7 +129,6 @@ This package installs %{summary}. %prep %setup -q -a 1 -a 2 -n moby-%{version} -%patch1 -p1 # correct rpmlint errors for bash completion sed -i '/env bash/d' cli-%{version}/contrib/completion/bash/docker @@ -283,6 +280,9 @@ done %{_datadir}/nano/Dockerfile.nanorc %changelog +* Sun Jan 29 2023 Sérgio Basto +- Update moby-engine to 20.10.23 + * Thu Jan 19 2023 Fedora Release Engineering - Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild diff --git a/provides.spec.inc b/provides.spec.inc index b50d762..4ee5cbb 100644 --- a/provides.spec.inc +++ b/provides.spec.inc @@ -2,7 +2,7 @@ Provides: bundled(tini-static) Provides: bundled(golang(github.com/docker/docker)) Provides: bundled(golang(github.com/docker/cli)) -# grep -v -e '^$' -e '^#' cli-20.10.22/vendor.conf | sort | awk '{print "Provides: bundled(golang("$1")) = "$2}' +# grep -v -e '^$' -e '^#' cli-20.10.23/vendor.conf | sort | awk '{print "Provides: bundled(golang("$1")) = "$2}' Provides: bundled(golang(cloud.google.com/go)) = ceeb313ad77b789a7fa5287b36a1d127b69b7093 Provides: bundled(golang(github.com/Azure/go-ansiterm)) = d185dfc1b5a126116ea5a19e148e29d16b4574c9 Provides: bundled(golang(github.com/beorn7/perks)) = 37c8de3658fcb183f997c4e13e8337516ab753e6 @@ -18,7 +18,7 @@ Provides: bundled(golang(github.com/creack/pty)) = 2a38352e8b4d7ab6c336eef Provides: bundled(golang(github.com/davecgh/go-spew)) = 8991bc29aa16c548c550c7ff78260e27b9ab7c73 Provides: bundled(golang(github.com/docker/compose-on-kubernetes)) = 1f9b5b8cb6aca13deee947511801cf89447c1bfe Provides: bundled(golang(github.com/docker/distribution)) = b5ca020cfbe998e5af3457fda087444cf5116496 -Provides: bundled(golang(github.com/docker/docker)) = 3056208812eb5e792fa99736c9167d1e10f4ab49 +Provides: bundled(golang(github.com/docker/docker)) = 42c8b314993e5eb3cc2776da0bbe41d5eb4b707b Provides: bundled(golang(github.com/docker/docker-credential-helpers)) = fc9290adbcf1594e78910e2f0334090eaee0e1ee Provides: bundled(golang(github.com/docker/go-connections)) = 7395e3f8aa162843a74ed6d48e79627d9792ac55 Provides: bundled(golang(github.com/docker/go)) = d30aec9fd63c35133f8f79c3412ad91a3b08be06 @@ -98,7 +98,7 @@ Provides: bundled(golang(k8s.io/klog)) = 4ad0115ba9e45c096d06a31d8dfb0e5bd Provides: bundled(golang(k8s.io/kube-openapi)) = 0270cf2f1c1d995d34b36019a6f65d58e6e33ad4 Provides: bundled(golang(k8s.io/utils)) = 69764acb6e8e900b7c05296c5d3c9c19545475f9 Provides: bundled(golang(sigs.k8s.io/yaml)) = fd68e9863619f6ec2fdd8625fe1f02e7c877e480 -# grep -v -e '^$' -e '^#' moby-20.10.22/vendor.conf | sort | awk '{print "Provides: bundled(golang("$1")) = "$2}' +# grep -v -e '^$' -e '^#' moby-20.10.23/vendor.conf | sort | awk '{print "Provides: bundled(golang("$1")) = "$2}' Provides: bundled(golang(cloud.google.com/go)) = ceeb313ad77b789a7fa5287b36a1d127b69b7093 Provides: bundled(golang(code.cloudfoundry.org/clock)) = 02e53af36e6c978af692887ed449b74026d76fec Provides: bundled(golang(github.com/armon/circbuf)) = 5111143e8da2e98b4ea6a8f32b9065ea1821c191 @@ -134,7 +134,7 @@ Provides: bundled(golang(github.com/docker/go-events)) = e31b211e4f1cd09aa Provides: bundled(golang(github.com/docker/go-metrics)) = b619b3592b65de4f087d9f16863a7e6ff905973c Provides: bundled(golang(github.com/docker/go-units)) = 519db1ee28dcc9fd2474ae59fca29a810482bfb1 Provides: bundled(golang(github.com/docker/libkv)) = 458977154600b9f23984d9f4b82e79570b5ae12b -Provides: bundled(golang(github.com/docker/libnetwork)) = dcdf8f176d1e13ad719e913e796fb698d846de98 +Provides: bundled(golang(github.com/docker/libnetwork)) = 05b93e0d3a95952f70c113b0bc5bdb538d7afdd7 Provides: bundled(golang(github.com/docker/libtrust)) = 9cbd2a1374f46905c68a4eb3694a130610adc62a Provides: bundled(golang(github.com/docker/swarmkit)) = cf1e0f8d95ee37ea1f9a5f8a54c73c1e0fa58a54 Provides: bundled(golang(github.com/fernet/fernet-go)) = 9eac43b88a5efb8651d24de9b68e87567e029736 From 861db2af91b8f2fe91fbafb14d7a704a4629e9e0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?S=C3=A9rgio=20M=2E=20Basto?= Date: Sun, 29 Jan 2023 16:31:39 +0000 Subject: [PATCH 090/163] Update sources, includes line breaks spectool -g --- .gitignore | 2 ++ sources | 4 ++-- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/.gitignore b/.gitignore index fe9e534..a1317a4 100644 --- a/.gitignore +++ b/.gitignore @@ -50,3 +50,5 @@ moby-v20.10.10.tar.gz /moby-20.10.21.tar.gz /cli-20.10.22.tar.gz /moby-20.10.22.tar.gz +/moby-20.10.23.tar.gz +/cli-20.10.23.tar.gz diff --git a/sources b/sources index ac44a7f..d2a6e31 100644 --- a/sources +++ b/sources @@ -1,3 +1,3 @@ -SHA512 (cli-20.10.22.tar.gz) = 550346904d172725f48c4de0e34fa95123c7022b14980d30cd01df0c9e154ac817f19e24b61538f8cbc23db090de56977c8b885b96f99583e8a5f773691280a6 -SHA512 (moby-20.10.22.tar.gz) = 81aec7faedced07718e3e228e999c4774fd293cedfacd272798a0057177ddca5322a701d0f644777a69b87140cd7a7194aa93a524507f202d050eb30b1a4142c +SHA512 (moby-20.10.23.tar.gz) = f6e13a275c7f368e90779b2bae4ded98c8949f398934fb249b10958973d86aaa3bc10a868fa64eb245e35ddb36ff14a89f6b20ff274e7e3b57a57daffa00c26d +SHA512 (cli-20.10.23.tar.gz) = c1debb583e9464d51ef482de29f63d6df1815eaae18cd66e5b4b36dee324f8c5c699134eee13ed4882e24aadaac37483a37e6729b734a60510271b107dc31cf0 SHA512 (tini-de40ad0.tar.gz) = 6e21fbcc8ab0daf2f2ac407f8d85373d2873d4b1e7d010056e4dd7071183fe1ede9dadf116c520e68a6226d5eb9d5ede383729327630600ed85080c1586bf3bb From f3ca1f3ff331ded358985ff07ecda47127c1c9e9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?S=C3=A9rgio=20M=2E=20Basto?= Date: Tue, 18 Apr 2023 15:07:53 +0100 Subject: [PATCH 091/163] Update moby-engine to 23.0.4 --- .gitignore | 3 + generate-docs.sh | 12 ++ moby-engine.spec | 16 ++- provides.spec.inc | 319 ++++++++++++++-------------------------------- sources | 6 +- update.sh | 9 +- 6 files changed, 131 insertions(+), 234 deletions(-) create mode 100644 generate-docs.sh diff --git a/.gitignore b/.gitignore index a1317a4..261a243 100644 --- a/.gitignore +++ b/.gitignore @@ -52,3 +52,6 @@ moby-v20.10.10.tar.gz /moby-20.10.22.tar.gz /moby-20.10.23.tar.gz /cli-20.10.23.tar.gz +/moby-23.0.4.tar.gz +/cli-23.0.4.tar.gz +/tini-0b44d36.tar.gz diff --git a/generate-docs.sh b/generate-docs.sh new file mode 100644 index 0000000..09fb5cb --- /dev/null +++ b/generate-docs.sh @@ -0,0 +1,12 @@ +cd man +for FILE in *.md; do + base="$(basename "$FILE")" + name="${base%.md}" + num="${name##*.}" + if [ -z "$num" ] || [ "$name" = "$num" ]; then + # skip files that aren't of the format xxxx.N.md (like README.md) + continue + fi + mkdir -p "./man${num}" + (set -x ;go-md2man -in "$FILE" -out "./man${num}/${name}") +done diff --git a/moby-engine.spec b/moby-engine.spec index 6ae89ba..bb4c15b 100644 --- a/moby-engine.spec +++ b/moby-engine.spec @@ -18,11 +18,11 @@ # tini %global git_tini https://github.com/krallin/tini -%global commit_tini de40ad007797e0dcd8b7126f27bb87401d224240 +%global commit_tini 0b44d3665869e46ccbac7414241b8256d6234dc4 %global shortcommit_tini %(c=%{commit_tini}; echo ${c:0:7}) Name: moby-engine -Version: 20.10.23 +Version: 23.0.4 Release: 1%{?dist} Summary: The open-source application container engine License: Apache-2.0 @@ -32,6 +32,7 @@ Source2: %{git_tini}/archive/%{commit_tini}/tini-%{shortcommit_tini}.tar. Source3: docker.service Source4: docker.sysconfig Source5: moby-engine-systemd-sysusers.conf +Source6: generate-docs.sh # Seperate file containing virtual provides for bundled deps that's %%include'd in the specfile. Source100: provides.spec.inc @@ -132,8 +133,7 @@ This package installs %{summary}. # correct rpmlint errors for bash completion sed -i '/env bash/d' cli-%{version}/contrib/completion/bash/docker - - +cp %{SOURCE6} cli-%{version}/scripts/docs/generate-man.sh %build mkdir -p _build/bin @@ -195,7 +195,8 @@ mkdir -p _build/bin export GOBUILDTAGS="${BUILDTAGS}" %gobuild -o ../_build/bin/docker %{goipath_cli}/cmd/docker # make VERSION=%%{version} GITCOMMIT=%%{shortcommit_cli} dynbinary - man/md2man-all.sh + + scripts/docs/generate-man.sh ) %install @@ -252,7 +253,7 @@ done %files %license LICENSE cli-LICENSE -%doc AUTHORS CHANGELOG.md CONTRIBUTING.md MAINTAINERS NOTICE README.md +%doc AUTHORS CONTRIBUTING.md MAINTAINERS NOTICE README.md %doc cli-MAINTAINERS cli-NOTICE cli-README.md %config(noreplace) %{_sysconfdir}/sysconfig/docker %{_bindir}/docker @@ -280,6 +281,9 @@ done %{_datadir}/nano/Dockerfile.nanorc %changelog +* Sun Jan 29 2023 John Ghatas +- Update moby-engine to 23.0.4 + * Sun Jan 29 2023 Sérgio Basto - Update moby-engine to 20.10.23 diff --git a/provides.spec.inc b/provides.spec.inc index 4ee5cbb..87f2416 100644 --- a/provides.spec.inc +++ b/provides.spec.inc @@ -2,230 +2,107 @@ Provides: bundled(tini-static) Provides: bundled(golang(github.com/docker/docker)) Provides: bundled(golang(github.com/docker/cli)) -# grep -v -e '^$' -e '^#' cli-20.10.23/vendor.conf | sort | awk '{print "Provides: bundled(golang("$1")) = "$2}' -Provides: bundled(golang(cloud.google.com/go)) = ceeb313ad77b789a7fa5287b36a1d127b69b7093 -Provides: bundled(golang(github.com/Azure/go-ansiterm)) = d185dfc1b5a126116ea5a19e148e29d16b4574c9 -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)) = 5ad51c7aca47b8e742f5e6e7dc841d50f5f6affd -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)) = b1ec32e02fe539480dc03e3bf381c20066e7c6cc -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)) = 1f9b5b8cb6aca13deee947511801cf89447c1bfe -Provides: bundled(golang(github.com/docker/distribution)) = b5ca020cfbe998e5af3457fda087444cf5116496 -Provides: bundled(golang(github.com/docker/docker)) = 42c8b314993e5eb3cc2776da0bbe41d5eb4b707b -Provides: bundled(golang(github.com/docker/docker-credential-helpers)) = fc9290adbcf1594e78910e2f0334090eaee0e1ee -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)) = 17d8d4e4d8bdec33d386e6362d3537fa9493ba00 -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/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)) = f140a6486e521aad38f5917de355cbf147cc0496 -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 +# grep -v -e '^$' -e '^#' cli-23.0.4/vendor/github.com/docker/distribution/vendor.conf | sort | awk '{print "Provides: bundled(golang("$1")) = "$2}' +Provides: bundled(golang(github.com/aws/aws-sdk-go)) = f831d5a0822a1ad72420ab18c6269bca1ddaf490 +Provides: bundled(golang(github.com/Azure/azure-sdk-for-go)) = 4650843026a7fdec254a8d9cf893693a254edd0b +Provides: bundled(golang(github.com/Azure/go-autorest)) = eaa7994b2278094c904d31993d26f56324db3052 +Provides: bundled(golang(github.com/beorn7/perks)) = 4c0e84591b9aa9e6dcfdf3e020114cd81f89d5f9 +Provides: bundled(golang(github.com/bshuster-repo/logrus-logstash-hook)) = d2c0ecc1836d91814e15e23bb5dc309c3ef51f4a +Provides: bundled(golang(github.com/bugsnag/bugsnag-go)) = b1d153021fcd90ca3f080db36bec96dc690fb274 +Provides: bundled(golang(github.com/bugsnag/osext)) = 0dd3f918b21bec95ace9dc86c7e70266cfc5c702 +Provides: bundled(golang(github.com/bugsnag/panicwrap)) = e2c28503fcd0675329da73bf48b33404db873782 +Provides: bundled(golang(github.com/denverdino/aliyungo)) = afedced274aa9a7fcdd47ac97018f0f8db4e5de2 +Provides: bundled(golang(github.com/dgrijalva/jwt-go)) = 4bbdd8ac624fc7a9ef7aec841c43d99b5fe65a29 +Provides: bundled(golang(github.com/docker/go-metrics)) = 399ea8c73916000c64c2c76e8da00ca82f8387ab +Provides: bundled(golang(github.com/docker/libtrust)) = fa567046d9b14f6aa788882a950d69651d230b21 +Provides: bundled(golang(github.com/garyburd/redigo)) = 535138d7bcd717d6531c701ef5933d98b1866257 +Provides: bundled(golang(github.com/go-ini/ini)) = 2ba15ac2dc9cdf88c110ec2dc0ced7fa45f5678c +Provides: bundled(golang(github.com/golang/protobuf)) = 8d92cf5fc15a4382f8964b08e1f42a75c0591aa3 +Provides: bundled(golang(github.com/gorilla/handlers)) = 60c7bfde3e33c201519a200a4507a158cc03a17b +Provides: bundled(golang(github.com/gorilla/mux)) = 599cba5e7b6137d46ddf58fb1765f5d928e69604 Provides: bundled(golang(github.com/inconshreveable/mousetrap)) = 76626ae9c91c4f2a10f34cad8ce83ea42c93bb75 -Provides: bundled(golang(github.com/jaguilar/vt100)) = ad4c4a5743050fb7f88ce968dca9422f72a0e3f2 -Provides: bundled(golang(github.com/json-iterator/go)) = 024077e996b048517130b21ea6bf12aa23055d3d +Provides: bundled(golang(github.com/jmespath/go-jmespath)) = bd40a432e4c76585ef6b72d3fd96fb9b6dc7b68d +Provides: bundled(golang(github.com/marstr/guid)) = 8bd9a64bf37eb297b492a4101fb28e80ac0b290f 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)) = eeb7b65ab7d651770a5ec52a06ea7c96eb97a249 -Provides: bundled(golang(github.com/moby/sys)) = 1bc8673b57550ddf85262eb0fed0aac651a37dab -Provides: bundled(golang(github.com/moby/term)) = 3f7ff695adc6a35abc925370dd0a4dafb48ec64d -Provides: bundled(golang(github.com/modern-go/concurrent)) = bacd9c7ef1dd9b15be4a9909b8ac7a4e313eec94 -Provides: bundled(golang(github.com/modern-go/reflect2)) = 2b33151c9bbc5231aea69b8861c540102b087070 -Provides: bundled(golang(github.com/morikuni/aec)) = 39771216ff4c63d11f5e604076f9c45e8be1067b -Provides: bundled(golang(github.com/opencontainers/go-digest)) = ea51bea511f75cfa3ef6098cc253c5c3609b037a +Provides: bundled(golang(github.com/miekg/dns)) = 271c58e0c14f552178ea321a545ff9af38930f39 +Provides: bundled(golang(github.com/mitchellh/mapstructure)) = 482a9fd5fa83e8c4e7817413b80f3eb8feec03ef +Provides: bundled(golang(github.com/ncw/swift)) = a0320860b16212c2b59b4912bb6508cda1d7cee6 +Provides: bundled(golang(github.com/opencontainers/go-digest)) = a6d0ee40d4207ea02364bd3b9e8e77b9159ba1eb Provides: bundled(golang(github.com/opencontainers/image-spec)) = 67d2d5658fe0476ab9bf414cec164077ebff3920 -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)) = 4c9bf9512682b995722660a4196c0013228e2049 -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)) = bf96a202a09a312ae005cd312fc06ff4d2c166ce -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)) = 642fcc37f5043eadb2509c84b2769e729e7d27ef -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)) = 33da011f77ade50ff5b6a6fb4a9a1e6d6b285809 -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 -# grep -v -e '^$' -e '^#' moby-20.10.23/vendor.conf | sort | awk '{print "Provides: bundled(golang("$1")) = "$2}' -Provides: bundled(golang(cloud.google.com/go)) = ceeb313ad77b789a7fa5287b36a1d127b69b7093 -Provides: bundled(golang(code.cloudfoundry.org/clock)) = 02e53af36e6c978af692887ed449b74026d76fec -Provides: bundled(golang(github.com/armon/circbuf)) = 5111143e8da2e98b4ea6a8f32b9065ea1821c191 -Provides: bundled(golang(github.com/armon/go-metrics)) = f0300d1749da6fa982027e449ec0c7a145510c3c -Provides: bundled(golang(github.com/armon/go-radix)) = e39d623f12e8e41c7b5529e9a9dd67a1e2261f80 -Provides: bundled(golang(github.com/aws/aws-sdk-go)) = 2590bc875c54c9fda225d8e4e56a9d28d90c6a47 -Provides: bundled(golang(github.com/Azure/go-ansiterm)) = d185dfc1b5a126116ea5a19e148e29d16b4574c9 -Provides: bundled(golang(github.com/beorn7/perks)) = 37c8de3658fcb183f997c4e13e8337516ab753e6 -Provides: bundled(golang(github.com/bsphere/le_go)) = 7a984a84b5492ae539b79b62fb4a10afc63c7bcf -Provides: bundled(golang(github.com/BurntSushi/toml)) = 3012a1dbe2e4bd1391d42b32f0577cb7bbc7f005 -Provides: bundled(golang(github.com/cespare/xxhash/v2)) = d7df74196a9e781ede915320c11c378c1b2f3a1f -Provides: bundled(golang(github.com/cilium/ebpf)) = 32458a752e0bcbc670691625f84e7ef6aef5655d -Provides: bundled(golang(github.com/cloudflare/cfssl)) = 5d63dbd981b5c408effbb58c442d54761ff94fbd -Provides: bundled(golang(github.com/containerd/cgroups)) = b9de8a2212026c07cec67baf3323f1fc0121e048 -Provides: bundled(golang(github.com/containerd/console)) = 2f1e3d2b6afd18e8b2077816c711205a0b4d8769 -Provides: bundled(golang(github.com/containerd/containerd)) = 96c5ae04b6784e180aaeee50fba715ac448ddb0d -Provides: bundled(golang(github.com/containerd/continuity)) = 5ad51c7aca47b8e742f5e6e7dc841d50f5f6affd -Provides: bundled(golang(github.com/containerd/fifo)) = 0724c46b320cf96bb172a0550c19a4b1fca4dacb -Provides: bundled(golang(github.com/containerd/go-runc)) = 16b287bc67d069a60fa48db15f330b790b74365b -Provides: bundled(golang(github.com/containerd/ttrpc)) = bfba540dc45464586c106b1f31c8547933c1eb41 -Provides: bundled(golang(github.com/containerd/typeurl)) = cd3ce7159eae562a4f60ceff37dada11a939d247 -Provides: bundled(golang(github.com/coreos/etcd)) = 973882f697a8db3d59815bf132c6c506434334bd -Provides: bundled(golang(github.com/coreos/go-semver)) = 8ab6407b697782a06568d4b7f1db25550ec2e4c6 -Provides: bundled(golang(github.com/coreos/go-systemd)) = 39ca1b05acc7ad1220e09f133283b8859a8b71ab -Provides: bundled(golang(github.com/coreos/go-systemd/v22)) = 2d78030078ef61b3cae27f42ad6d0e46db51b339 -Provides: bundled(golang(github.com/coreos/pkg)) = 3ac0863d7acf3bc44daf49afef8919af12f704ef -Provides: bundled(golang(github.com/creack/pty)) = 2a38352e8b4d7ab6c336eef107e42a55e72e7fbc -Provides: bundled(golang(github.com/cyphar/filepath-securejoin)) = a261ee33d7a517f054effbf451841abaafe3e0fd -Provides: bundled(golang(github.com/deckarep/golang-set)) = ef32fa3046d9f249d399f98ebaf9be944430fd1d -Provides: bundled(golang(github.com/docker/distribution)) = b5ca020cfbe998e5af3457fda087444cf5116496 -Provides: bundled(golang(github.com/docker/go-connections)) = 7395e3f8aa162843a74ed6d48e79627d9792ac55 -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/libkv)) = 458977154600b9f23984d9f4b82e79570b5ae12b -Provides: bundled(golang(github.com/docker/libnetwork)) = 05b93e0d3a95952f70c113b0bc5bdb538d7afdd7 -Provides: bundled(golang(github.com/docker/libtrust)) = 9cbd2a1374f46905c68a4eb3694a130610adc62a -Provides: bundled(golang(github.com/docker/swarmkit)) = cf1e0f8d95ee37ea1f9a5f8a54c73c1e0fa58a54 -Provides: bundled(golang(github.com/fernet/fernet-go)) = 9eac43b88a5efb8651d24de9b68e87567e029736 -Provides: bundled(golang(github.com/fluent/fluent-logger-golang)) = 0b652e850a9140d0b1db6390d8925d0601e952db -Provides: bundled(golang(github.com/fsnotify/fsnotify)) = 45d7d09e39ef4ac08d493309fa031790c15bfe8a -Provides: bundled(golang(github.com/godbus/dbus/v5)) = 37bf87eef99d69c4f1d3528bd66e3a87dc201472 -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/gddo)) = 72a348e765d293ed6d1ded7b699591f14d6cd921 -Provides: bundled(golang(github.com/golang/groupcache)) = 869f871628b6baa9cfbc11732cdf6546b17c1298 -Provides: bundled(golang(github.com/golang/protobuf)) = 84668698ea25b64748563aa20726db66a6b8d299 -Provides: bundled(golang(github.com/googleapis/gax-go)) = bd5b16380fd03dc758d11cef74ba2e3bc8b0e8c2 -Provides: bundled(golang(github.com/google/btree)) = 4030bb1f1f0c35b30ca7009e9ebd06849dd45306 -Provides: bundled(golang(github.com/google/certificate-transparency-go)) = 37a384cd035e722ea46e55029093e26687138edf -Provides: bundled(golang(github.com/google/go-cmp)) = 3af367b6b30c263d47e8895973edcca9a49cf029 -Provides: bundled(golang(github.com/google/shlex)) = e7afc7fbc51079733e9468cdfd1efcd7d196cd1d -Provides: bundled(golang(github.com/google/uuid)) = 0cd6bf5da1e1c83f8b45653022c74f71af0538a4 -Provides: bundled(golang(github.com/gorilla/mux)) = 98cb6bf42e086f6af920b965c38cacc07402d51b -Provides: bundled(golang(github.com/Graylog2/go-gelf)) = 1550ee647df0510058c9d67a45c56f18911d80b8 -Provides: bundled(golang(github.com/grpc-ecosystem/go-grpc-middleware)) = 3c51f7f332123e8be5a157c0802a228ac85bf9db -Provides: bundled(golang(github.com/grpc-ecosystem/go-grpc-prometheus)) = c225b8c3b01faf2899099b768856a9e916e5087b -Provides: bundled(golang(github.com/grpc-ecosystem/grpc-opentracing)) = 8e809c8a86450a29b90dcc9efbf062d0fe6d9746 -Provides: bundled(golang(github.com/hashicorp/consul)) = 9a9cc9341bb487651a0399e3fc5e1e8a42e62dd9 -Provides: bundled(golang(github.com/hashicorp/errwrap)) = 8a6fb523712970c966eefc6b39ed2c5e74880354 -Provides: bundled(golang(github.com/hashicorp/go-immutable-radix)) = 826af9ccf0feeee615d546d69b11f8e98da8c8f1 -Provides: bundled(golang(github.com/hashicorp/golang-lru)) = 7f827b33c0f158ec5dfbba01bb0b14a4541fd81d -Provides: bundled(golang(github.com/hashicorp/go-memdb)) = cb9a474f84cc5e41b273b20c6927680b2a8776ad -Provides: bundled(golang(github.com/hashicorp/go-msgpack)) = 71c2886f5a673a35f909803f38ece5810165097b -Provides: bundled(golang(github.com/hashicorp/go-multierror)) = 886a7fbe3eb1c874d46f623bfa70af45f425b3d1 -Provides: bundled(golang(github.com/hashicorp/go-sockaddr)) = c7188e74f6acae5a989bdc959aa779f8b9f42faf -Provides: bundled(golang(github.com/hashicorp/memberlist)) = e6ff9b2d87a3f0f3f04abb5672ada3ac2a640223 -Provides: bundled(golang(github.com/hashicorp/serf)) = 598c54895cc5a7b1a24a398d635e8c0ea0959870 -Provides: bundled(golang(github.com/imdario/mergo)) = 1afb36080aec31e0d1528973ebe6721b191b0369 +Provides: bundled(golang(github.com/prometheus/client_golang)) = c332b6f63c0658a65eca15c0e5247ded801cf564 +Provides: bundled(golang(github.com/prometheus/client_model)) = 99fa1f4be8e564e8a6b613da7fa6f46c9edafc6c +Provides: bundled(golang(github.com/prometheus/common)) = 89604d197083d4781071d3c65855d24ecfb0a563 +Provides: bundled(golang(github.com/prometheus/procfs)) = cb4147076ac75738c9a7d279075a253c0cc5acbd +Provides: bundled(golang(github.com/satori/go.uuid)) = f58768cc1a7a7e77a3bd49e98cdd21419399b6a3 +Provides: bundled(golang(github.com/Shopify/logrus-bugsnag)) = 577dee27f20dd8f1a529f82210094af593be12bd +Provides: bundled(golang(github.com/sirupsen/logrus)) = 3d4380f53a34dcdc95f0c1db702615992b38d9a4 +Provides: bundled(golang(github.com/spf13/cobra)) = 312092086bed4968099259622145a0c9ae280064 +Provides: bundled(golang(github.com/spf13/pflag)) = 5644820622454e71517561946e3d94b9f9db6842 +Provides: bundled(golang(github.com/xenolf/lego)) = a9d8cec0e6563575e5868a005359ac97911b5985 +Provides: bundled(golang(github.com/yvasiyarov/go-metrics)) = 57bccd1ccd43f94bb17fdd8bf3007059b802f85e +Provides: bundled(golang(github.com/yvasiyarov/gorelic)) = a9bba5b9ab508a086f9a12b8c51fab68478e2128 +Provides: bundled(golang(github.com/yvasiyarov/newrelic_platform_go)) = b21fdbd4370f3717f3bbd2bf41c223bc273068e6 +Provides: bundled(golang(golang.org/x/crypto)) = c10c31b5e94b6f7a0283272dc2bb27163dcea24b +Provides: bundled(golang(golang.org/x/net)) = 4876518f9e71663000c348837735820161a42df7 +Provides: bundled(golang(golang.org/x/oauth2)) = 045497edb6234273d67dbc25da3f2ddbc4c4cacf +Provides: bundled(golang(golang.org/x/time)) = a4bde12657593d5e90d0533a3e4fd95e635124cb +Provides: bundled(golang(google.golang.org/api)) = 9bf6e6e569ff057f75d9604a46c52928f17d2b54 +Provides: bundled(golang(google.golang.org/appengine)) = 12d5545dc1cfa6047a286d5e853841b6471f4c19 +Provides: bundled(golang(google.golang.org/cloud)) = 975617b05ea8a58727e6c1a06b6161ff4185a9f2 +Provides: bundled(golang(google.golang.org/grpc)) = d3ddb4469d5a1b949fc7a7da7c1d6a0d1b6de994 +Provides: bundled(golang(gopkg.in/check.v1)) = 64131543e7896d5bcc6bd5a76287eb75ea96c673 +Provides: bundled(golang(gopkg.in/square/go-jose.v1)) = 40d457b439244b546f023d056628e5184136899b +Provides: bundled(golang(gopkg.in/yaml.v2)) = v2.2.1 +Provides: bundled(golang(rsc.io/letsencrypt)) = e770c10b0f1a64775ae91d240407ce00d1a5bdeb +# grep -v -e '^$' -e '^#' moby-23.0.4/vendor/github.com/docker/distribution/vendor.conf | sort | awk '{print "Provides: bundled(golang("$1")) = "$2}' +Provides: bundled(golang(github.com/aws/aws-sdk-go)) = f831d5a0822a1ad72420ab18c6269bca1ddaf490 +Provides: bundled(golang(github.com/Azure/azure-sdk-for-go)) = 4650843026a7fdec254a8d9cf893693a254edd0b +Provides: bundled(golang(github.com/Azure/go-autorest)) = eaa7994b2278094c904d31993d26f56324db3052 +Provides: bundled(golang(github.com/beorn7/perks)) = 4c0e84591b9aa9e6dcfdf3e020114cd81f89d5f9 +Provides: bundled(golang(github.com/bshuster-repo/logrus-logstash-hook)) = d2c0ecc1836d91814e15e23bb5dc309c3ef51f4a +Provides: bundled(golang(github.com/bugsnag/bugsnag-go)) = b1d153021fcd90ca3f080db36bec96dc690fb274 +Provides: bundled(golang(github.com/bugsnag/osext)) = 0dd3f918b21bec95ace9dc86c7e70266cfc5c702 +Provides: bundled(golang(github.com/bugsnag/panicwrap)) = e2c28503fcd0675329da73bf48b33404db873782 +Provides: bundled(golang(github.com/denverdino/aliyungo)) = afedced274aa9a7fcdd47ac97018f0f8db4e5de2 +Provides: bundled(golang(github.com/dgrijalva/jwt-go)) = 4bbdd8ac624fc7a9ef7aec841c43d99b5fe65a29 +Provides: bundled(golang(github.com/docker/go-metrics)) = 399ea8c73916000c64c2c76e8da00ca82f8387ab +Provides: bundled(golang(github.com/docker/libtrust)) = fa567046d9b14f6aa788882a950d69651d230b21 +Provides: bundled(golang(github.com/garyburd/redigo)) = 535138d7bcd717d6531c701ef5933d98b1866257 +Provides: bundled(golang(github.com/go-ini/ini)) = 2ba15ac2dc9cdf88c110ec2dc0ced7fa45f5678c +Provides: bundled(golang(github.com/golang/protobuf)) = 8d92cf5fc15a4382f8964b08e1f42a75c0591aa3 +Provides: bundled(golang(github.com/gorilla/handlers)) = 60c7bfde3e33c201519a200a4507a158cc03a17b +Provides: bundled(golang(github.com/gorilla/mux)) = 599cba5e7b6137d46ddf58fb1765f5d928e69604 Provides: bundled(golang(github.com/inconshreveable/mousetrap)) = 76626ae9c91c4f2a10f34cad8ce83ea42c93bb75 -Provides: bundled(golang(github.com/ishidawataru/sctp)) = f2269e66cdee387bd321445d5d300893449805be -Provides: bundled(golang(github.com/jmespath/go-jmespath)) = 2d053f87d1d7f9f48196ae04cf3daea4273d207d -Provides: bundled(golang(github.com/json-iterator/go)) = a1ca0830781e007c66b225121d2cdb3a649421f6 +Provides: bundled(golang(github.com/jmespath/go-jmespath)) = bd40a432e4c76585ef6b72d3fd96fb9b6dc7b68d +Provides: bundled(golang(github.com/marstr/guid)) = 8bd9a64bf37eb297b492a4101fb28e80ac0b290f Provides: bundled(golang(github.com/matttproud/golang_protobuf_extensions)) = c12348ce28de40eed0136aa2b644d0ee0650e56c -Provides: bundled(golang(github.com/Microsoft/go-winio)) = 7e149e8c70409f36773c1b2cf3447a7ab7697368 -Provides: bundled(golang(github.com/Microsoft/hcsshim)) = a11a2c44e8a4aa9d66314b1d759ef582df5ab5e8 -Provides: bundled(golang(github.com/Microsoft/opengcs)) = a10967154e143a36014584a6f664344e3bb0aa64 -Provides: bundled(golang(github.com/miekg/dns)) = 6c0c4e6581f8e173cc562c8b3363ab984e4ae071 -Provides: bundled(golang(github.com/mistifyio/go-zfs)) = f784269be439d704d3dfa1906f45dd848fed2beb -Provides: bundled(golang(github.com/mitchellh/hashstructure)) = a38c50148365edc8df43c1580c48fb2b3a1e9cd7 -Provides: bundled(golang(github.com/moby/buildkit)) = eeb7b65ab7d651770a5ec52a06ea7c96eb97a249 -Provides: bundled(golang(github.com/moby/ipvs)) = 4566ccea0e08d68e9614c3e7a64a23b850c4bb35 -Provides: bundled(golang(github.com/moby/locker)) = 281af2d563954745bea9d1487c965f24d30742fe -Provides: bundled(golang(github.com/moby/sys)) = 1bc8673b57550ddf85262eb0fed0aac651a37dab -Provides: bundled(golang(github.com/moby/term)) = 3f7ff695adc6a35abc925370dd0a4dafb48ec64d -Provides: bundled(golang(github.com/modern-go/concurrent)) = bacd9c7ef1dd9b15be4a9909b8ac7a4e313eec94 -Provides: bundled(golang(github.com/modern-go/reflect2)) = 94122c33edd36123c84d5368cfb2b69df93a0ec8 -Provides: bundled(golang(github.com/morikuni/aec)) = 39771216ff4c63d11f5e604076f9c45e8be1067b -Provides: bundled(golang(github.com/opencontainers/go-digest)) = ea51bea511f75cfa3ef6098cc253c5c3609b037a +Provides: bundled(golang(github.com/miekg/dns)) = 271c58e0c14f552178ea321a545ff9af38930f39 +Provides: bundled(golang(github.com/mitchellh/mapstructure)) = 482a9fd5fa83e8c4e7817413b80f3eb8feec03ef +Provides: bundled(golang(github.com/ncw/swift)) = a0320860b16212c2b59b4912bb6508cda1d7cee6 +Provides: bundled(golang(github.com/opencontainers/go-digest)) = a6d0ee40d4207ea02364bd3b9e8e77b9159ba1eb Provides: bundled(golang(github.com/opencontainers/image-spec)) = 67d2d5658fe0476ab9bf414cec164077ebff3920 -Provides: bundled(golang(github.com/opencontainers/runc)) = ff819c7e9184c13b7c2607fe6c30ae19403a7aff -Provides: bundled(golang(github.com/opencontainers/runtime-spec)) = 4d89ac9fbff6c455f46a5bb59c6b1bb7184a5e43 -Provides: bundled(golang(github.com/opencontainers/selinux)) = 2f45b3796d18f1ab4c9fc0c888a98d0a0fd6e429 -Provides: bundled(golang(github.com/opentracing-contrib/go-stdlib)) = 8a6ff1ad1691a29e4f7b5d46604f97634997c8c4 -Provides: bundled(golang(github.com/opentracing/opentracing-go)) = d34af3eaa63c4d08ab54863a4bdd0daa45212e12 -Provides: bundled(golang(github.com/philhofer/fwd)) = bb6d471dc95d4fe11e432687f8b70ff496cf3136 -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/RackSec/srslog)) = a4725f04ec91af1a91b380da679d6e0c2f061e59 -Provides: bundled(golang(github.com/samuel/go-zookeeper)) = d0e0d8e11f318e000a8cc434616d69e329edc374 -Provides: bundled(golang(github.com/sean-/seed)) = e2103e2c35297fb7e17febb81e49b312087a2372 -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/syndtr/gocapability)) = 42c35b4376354fd554efc7ad35e0b7f94e3a0ffb -Provides: bundled(golang(github.com/tchap/go-patricia)) = a7f0089c6f496e8e70402f61733606daa326cac5 -Provides: bundled(golang(github.com/tinylib/msgp)) = af6442a0fcf6e2a1b824f70dd0c734f01e817751 -Provides: bundled(golang(github.com/tonistiigi/fsutil)) = 0834f99b7b85462efb69b4f571a4fa3ca7da5ac9 -Provides: bundled(golang(github.com/tonistiigi/units)) = 6950e57a87eaf136bbe44ef2ec8e75b9e3569de2 -Provides: bundled(golang(github.com/vbatts/tar-split)) = 80a436fd6164c557b131f7c59ed69bd81af69761 -Provides: bundled(golang(github.com/vishvananda/netlink)) = f049be6f391489d3f374498fe0c8df8449258372 -Provides: bundled(golang(github.com/vishvananda/netns)) = db3c7e526aae966c4ccfa6c8189b693d6ac5d202 -Provides: bundled(golang(github.com/willf/bitset)) = 559910e8471e48d76d9e5a1ba15842dee77ad45d -Provides: bundled(golang(go.etcd.io/bbolt)) = 232d8fc87f50244f9c808f4745759e08a304c029 -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)) = 33da011f77ade50ff5b6a6fb4a9a1e6d6b285809 -Provides: bundled(golang(golang.org/x/text)) = 23ae387dee1f90d29a23c0e87ee0b46038fbed0e -Provides: bundled(golang(golang.org/x/time)) = 555d28b269f0569763d25dbe1a237ae74c6bcc82 -Provides: bundled(golang(google.golang.org/api)) = dec2ee309f5b09fc59bc40676447c15736284d78 -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(gotest.tools/v3)) = 568bc57cc5c19a2ef85e5749870b49a4cc2ab54d +Provides: bundled(golang(github.com/prometheus/client_golang)) = c332b6f63c0658a65eca15c0e5247ded801cf564 +Provides: bundled(golang(github.com/prometheus/client_model)) = 99fa1f4be8e564e8a6b613da7fa6f46c9edafc6c +Provides: bundled(golang(github.com/prometheus/common)) = 89604d197083d4781071d3c65855d24ecfb0a563 +Provides: bundled(golang(github.com/prometheus/procfs)) = cb4147076ac75738c9a7d279075a253c0cc5acbd +Provides: bundled(golang(github.com/satori/go.uuid)) = f58768cc1a7a7e77a3bd49e98cdd21419399b6a3 +Provides: bundled(golang(github.com/Shopify/logrus-bugsnag)) = 577dee27f20dd8f1a529f82210094af593be12bd +Provides: bundled(golang(github.com/sirupsen/logrus)) = 3d4380f53a34dcdc95f0c1db702615992b38d9a4 +Provides: bundled(golang(github.com/spf13/cobra)) = 312092086bed4968099259622145a0c9ae280064 +Provides: bundled(golang(github.com/spf13/pflag)) = 5644820622454e71517561946e3d94b9f9db6842 +Provides: bundled(golang(github.com/xenolf/lego)) = a9d8cec0e6563575e5868a005359ac97911b5985 +Provides: bundled(golang(github.com/yvasiyarov/go-metrics)) = 57bccd1ccd43f94bb17fdd8bf3007059b802f85e +Provides: bundled(golang(github.com/yvasiyarov/gorelic)) = a9bba5b9ab508a086f9a12b8c51fab68478e2128 +Provides: bundled(golang(github.com/yvasiyarov/newrelic_platform_go)) = b21fdbd4370f3717f3bbd2bf41c223bc273068e6 +Provides: bundled(golang(golang.org/x/crypto)) = c10c31b5e94b6f7a0283272dc2bb27163dcea24b +Provides: bundled(golang(golang.org/x/net)) = 4876518f9e71663000c348837735820161a42df7 +Provides: bundled(golang(golang.org/x/oauth2)) = 045497edb6234273d67dbc25da3f2ddbc4c4cacf +Provides: bundled(golang(golang.org/x/time)) = a4bde12657593d5e90d0533a3e4fd95e635124cb +Provides: bundled(golang(google.golang.org/api)) = 9bf6e6e569ff057f75d9604a46c52928f17d2b54 +Provides: bundled(golang(google.golang.org/appengine)) = 12d5545dc1cfa6047a286d5e853841b6471f4c19 +Provides: bundled(golang(google.golang.org/cloud)) = 975617b05ea8a58727e6c1a06b6161ff4185a9f2 +Provides: bundled(golang(google.golang.org/grpc)) = d3ddb4469d5a1b949fc7a7da7c1d6a0d1b6de994 +Provides: bundled(golang(gopkg.in/check.v1)) = 64131543e7896d5bcc6bd5a76287eb75ea96c673 +Provides: bundled(golang(gopkg.in/square/go-jose.v1)) = 40d457b439244b546f023d056628e5184136899b +Provides: bundled(golang(gopkg.in/yaml.v2)) = v2.2.1 +Provides: bundled(golang(rsc.io/letsencrypt)) = e770c10b0f1a64775ae91d240407ce00d1a5bdeb diff --git a/sources b/sources index d2a6e31..511d30c 100644 --- a/sources +++ b/sources @@ -1,3 +1,3 @@ -SHA512 (moby-20.10.23.tar.gz) = f6e13a275c7f368e90779b2bae4ded98c8949f398934fb249b10958973d86aaa3bc10a868fa64eb245e35ddb36ff14a89f6b20ff274e7e3b57a57daffa00c26d -SHA512 (cli-20.10.23.tar.gz) = c1debb583e9464d51ef482de29f63d6df1815eaae18cd66e5b4b36dee324f8c5c699134eee13ed4882e24aadaac37483a37e6729b734a60510271b107dc31cf0 -SHA512 (tini-de40ad0.tar.gz) = 6e21fbcc8ab0daf2f2ac407f8d85373d2873d4b1e7d010056e4dd7071183fe1ede9dadf116c520e68a6226d5eb9d5ede383729327630600ed85080c1586bf3bb +SHA512 (moby-23.0.4.tar.gz) = 94d2c748541cf402197e98f93f574daf72bd84fc7603bf30e23674be36862ddbff5f37ad667455a710d730b9c5bc11962c287d6fd60a20320e0e0a41e3329c44 +SHA512 (cli-23.0.4.tar.gz) = ef9ab03258e4c858cac61767ddddb7319c8c3a33d08fdf416fda78db017457003344e06cb7701c9277557a6fb2a73285a7cd5ce3a0af0323ed2dd4edfc28f703 +SHA512 (tini-0b44d36.tar.gz) = 5294e877c369177b09c2a34f759e911f612f6977e960a63d46b6e5ebea790455dad972e91ca10c478693da637a5479d4e0b904efcfb5ae291e87e7e66674c752 diff --git a/update.sh b/update.sh index 8c78a70..3089ca4 100755 --- a/update.sh +++ b/update.sh @@ -15,6 +15,7 @@ if command -v update.sh && [ "$#" -gt 0 ]; then update.sh "$@" fi +spectool -g moby-engine.spec --define "_sourcedir ." fedpkg prep version="$(rpmspec -D '_sourcedir %(pwd)' -q --srpm --qf '%{version}\n' *.spec)" @@ -24,16 +25,16 @@ cat << EOF > provides.spec.inc Provides: bundled(tini-static) Provides: bundled(golang(github.com/docker/docker)) Provides: bundled(golang(github.com/docker/cli)) -# grep -v -e '^$' -e '^#' cli-${version}/vendor.conf | sort | awk '{print "Provides: bundled(golang("\$1")) = "\$2}' +# grep -v -e '^$' -e '^#' cli-${version}/vendor/github.com/docker/distribution/vendor.conf | sort | awk '{print "Provides: bundled(golang("\$1")) = "\$2}' EOF -grep -v -e '^$' -e '^#' "moby-${version}/cli-${version}/vendor.conf" | sort | awk '{print "Provides: bundled(golang("$1")) = "$2}' >> provides.spec.inc +grep -v -e '^$' -e '^#' "moby-${version}/cli-${version}/vendor/github.com/docker/distribution/vendor.conf" | sort | awk '{print "Provides: bundled(golang("$1")) = "$2}' >> provides.spec.inc cat << EOF >> provides.spec.inc -# grep -v -e '^$' -e '^#' moby-${version}/vendor.conf | sort | awk '{print "Provides: bundled(golang("\$1")) = "\$2}' +# grep -v -e '^$' -e '^#' moby-${version}/vendor/github.com/docker/distribution/vendor.conf | sort | awk '{print "Provides: bundled(golang("\$1")) = "\$2}' EOF -grep -v -e '^$' -e '^#' "moby-${version}/vendor.conf" | sort | awk '{print "Provides: bundled(golang("$1")) = "$2}' >> provides.spec.inc +grep -v -e '^$' -e '^#' "moby-${version}/vendor/github.com/docker/distribution/vendor.conf" | sort | awk '{print "Provides: bundled(golang("$1")) = "$2}' >> provides.spec.inc # Note(gotmax23): Ignore this also. My script commits the specfile, # and then this ammends that commit to add the updated provides.spec.inc. From 846dd5e3b3c053cfe8378bb33decfcfe175e912a Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 20 Jul 2023 15:31:10 +0000 Subject: [PATCH 092/163] Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- moby-engine.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/moby-engine.spec b/moby-engine.spec index bb4c15b..80173fe 100644 --- a/moby-engine.spec +++ b/moby-engine.spec @@ -23,7 +23,7 @@ Name: moby-engine Version: 23.0.4 -Release: 1%{?dist} +Release: 2%{?dist} Summary: The open-source application container engine License: Apache-2.0 Source0: %{git_moby}/archive/v%{version}/moby-%{version}.tar.gz @@ -281,6 +281,9 @@ done %{_datadir}/nano/Dockerfile.nanorc %changelog +* Thu Jul 20 2023 Fedora Release Engineering +- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild + * Sun Jan 29 2023 John Ghatas - Update moby-engine to 23.0.4 From 94a83534c50ef10c8deaf9487227ef17c27639e8 Mon Sep 17 00:00:00 2001 From: LuK1337 Date: Wed, 23 Aug 2023 21:06:15 +0200 Subject: [PATCH 093/163] Update moby-engine to 24.0.5 --- .gitignore | 2 ++ moby-engine.spec | 7 +++++-- provides.spec.inc | 4 ++-- sources | 4 ++-- 4 files changed, 11 insertions(+), 6 deletions(-) diff --git a/.gitignore b/.gitignore index 261a243..d310b09 100644 --- a/.gitignore +++ b/.gitignore @@ -55,3 +55,5 @@ moby-v20.10.10.tar.gz /moby-23.0.4.tar.gz /cli-23.0.4.tar.gz /tini-0b44d36.tar.gz +/cli-24.0.5.tar.gz +/moby-24.0.5.tar.gz diff --git a/moby-engine.spec b/moby-engine.spec index 80173fe..f01b0e7 100644 --- a/moby-engine.spec +++ b/moby-engine.spec @@ -22,8 +22,8 @@ %global shortcommit_tini %(c=%{commit_tini}; echo ${c:0:7}) Name: moby-engine -Version: 23.0.4 -Release: 2%{?dist} +Version: 24.0.5 +Release: 1%{?dist} Summary: The open-source application container engine License: Apache-2.0 Source0: %{git_moby}/archive/v%{version}/moby-%{version}.tar.gz @@ -281,6 +281,9 @@ done %{_datadir}/nano/Dockerfile.nanorc %changelog +* Wed Aug 23 2023 LuK1337 - 24.0.5-1 +- Update moby-engine to 24.0.5 + * Thu Jul 20 2023 Fedora Release Engineering - Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild diff --git a/provides.spec.inc b/provides.spec.inc index 87f2416..847f007 100644 --- a/provides.spec.inc +++ b/provides.spec.inc @@ -2,7 +2,7 @@ Provides: bundled(tini-static) Provides: bundled(golang(github.com/docker/docker)) Provides: bundled(golang(github.com/docker/cli)) -# grep -v -e '^$' -e '^#' cli-23.0.4/vendor/github.com/docker/distribution/vendor.conf | sort | awk '{print "Provides: bundled(golang("$1")) = "$2}' +# grep -v -e '^$' -e '^#' cli-24.0.5/vendor/github.com/docker/distribution/vendor.conf | sort | awk '{print "Provides: bundled(golang("$1")) = "$2}' Provides: bundled(golang(github.com/aws/aws-sdk-go)) = f831d5a0822a1ad72420ab18c6269bca1ddaf490 Provides: bundled(golang(github.com/Azure/azure-sdk-for-go)) = 4650843026a7fdec254a8d9cf893693a254edd0b Provides: bundled(golang(github.com/Azure/go-autorest)) = eaa7994b2278094c904d31993d26f56324db3052 @@ -54,7 +54,7 @@ Provides: bundled(golang(gopkg.in/check.v1)) = 64131543e7896d5bcc6bd5a7628 Provides: bundled(golang(gopkg.in/square/go-jose.v1)) = 40d457b439244b546f023d056628e5184136899b Provides: bundled(golang(gopkg.in/yaml.v2)) = v2.2.1 Provides: bundled(golang(rsc.io/letsencrypt)) = e770c10b0f1a64775ae91d240407ce00d1a5bdeb -# grep -v -e '^$' -e '^#' moby-23.0.4/vendor/github.com/docker/distribution/vendor.conf | sort | awk '{print "Provides: bundled(golang("$1")) = "$2}' +# grep -v -e '^$' -e '^#' moby-24.0.5/vendor/github.com/docker/distribution/vendor.conf | sort | awk '{print "Provides: bundled(golang("$1")) = "$2}' Provides: bundled(golang(github.com/aws/aws-sdk-go)) = f831d5a0822a1ad72420ab18c6269bca1ddaf490 Provides: bundled(golang(github.com/Azure/azure-sdk-for-go)) = 4650843026a7fdec254a8d9cf893693a254edd0b Provides: bundled(golang(github.com/Azure/go-autorest)) = eaa7994b2278094c904d31993d26f56324db3052 diff --git a/sources b/sources index 511d30c..185f3bb 100644 --- a/sources +++ b/sources @@ -1,3 +1,3 @@ -SHA512 (moby-23.0.4.tar.gz) = 94d2c748541cf402197e98f93f574daf72bd84fc7603bf30e23674be36862ddbff5f37ad667455a710d730b9c5bc11962c287d6fd60a20320e0e0a41e3329c44 -SHA512 (cli-23.0.4.tar.gz) = ef9ab03258e4c858cac61767ddddb7319c8c3a33d08fdf416fda78db017457003344e06cb7701c9277557a6fb2a73285a7cd5ce3a0af0323ed2dd4edfc28f703 +SHA512 (cli-24.0.5.tar.gz) = 765c67634d91d248b156d3e407398b98b7a0a89507bbac0310d4a68b95aa1a05e3af43c8b90bc10166748749d8cc36670619fc9efca110beefbdcd4385dc96be +SHA512 (moby-24.0.5.tar.gz) = cde2e47e7658b153399ee29154ec21eebf54b292185e07d43b968895dcfdfead95e4507fefb713859a4540f21d8007116d3ebeaa1fb7ba305fb2a0449ba1bee6 SHA512 (tini-0b44d36.tar.gz) = 5294e877c369177b09c2a34f759e911f612f6977e960a63d46b6e5ebea790455dad972e91ca10c478693da637a5479d4e0b904efcfb5ae291e87e7e66674c752 From 202bc73584e991c804ffab61a2b99cbf59194896 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sun, 21 Jan 2024 08:25:11 +0000 Subject: [PATCH 094/163] Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild --- moby-engine.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/moby-engine.spec b/moby-engine.spec index f01b0e7..0f9a06a 100644 --- a/moby-engine.spec +++ b/moby-engine.spec @@ -23,7 +23,7 @@ Name: moby-engine Version: 24.0.5 -Release: 1%{?dist} +Release: 2%{?dist} Summary: The open-source application container engine License: Apache-2.0 Source0: %{git_moby}/archive/v%{version}/moby-%{version}.tar.gz @@ -281,6 +281,9 @@ done %{_datadir}/nano/Dockerfile.nanorc %changelog +* Sun Jan 21 2024 Fedora Release Engineering +- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild + * Wed Aug 23 2023 LuK1337 - 24.0.5-1 - Update moby-engine to 24.0.5 From 95ef572078699508bd3dea002a00ca94e726eb00 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 25 Jan 2024 07:42:12 +0000 Subject: [PATCH 095/163] Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild --- moby-engine.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/moby-engine.spec b/moby-engine.spec index 0f9a06a..f2ac5af 100644 --- a/moby-engine.spec +++ b/moby-engine.spec @@ -23,7 +23,7 @@ Name: moby-engine Version: 24.0.5 -Release: 2%{?dist} +Release: 3%{?dist} Summary: The open-source application container engine License: Apache-2.0 Source0: %{git_moby}/archive/v%{version}/moby-%{version}.tar.gz @@ -281,6 +281,9 @@ done %{_datadir}/nano/Dockerfile.nanorc %changelog +* Thu Jan 25 2024 Fedora Release Engineering +- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild + * Sun Jan 21 2024 Fedora Release Engineering - Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild From 82004fd9ef221f2e4544f1ea3c8a86d4c4e991a6 Mon Sep 17 00:00:00 2001 From: Maxwell G Date: Sun, 11 Feb 2024 23:31:00 +0000 Subject: [PATCH 096/163] Rebuild for golang 1.22.0 --- moby-engine.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/moby-engine.spec b/moby-engine.spec index f2ac5af..f49570b 100644 --- a/moby-engine.spec +++ b/moby-engine.spec @@ -23,7 +23,7 @@ Name: moby-engine Version: 24.0.5 -Release: 3%{?dist} +Release: 4%{?dist} Summary: The open-source application container engine License: Apache-2.0 Source0: %{git_moby}/archive/v%{version}/moby-%{version}.tar.gz @@ -281,6 +281,9 @@ done %{_datadir}/nano/Dockerfile.nanorc %changelog +* Sun Feb 11 2024 Maxwell G - 24.0.5-4 +- Rebuild for golang 1.22.0 + * Thu Jan 25 2024 Fedora Release Engineering - Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild From ba9da2ef3dafcd656bcd7101472bb8c05be215b7 Mon Sep 17 00:00:00 2001 From: Maxwell G Date: Sat, 23 Mar 2024 23:22:11 +0000 Subject: [PATCH 097/163] Remove separate specfile license file I have adopted this header format for the rest of my packages. The extra file in the SRPM is a bit messy. Relates: 138c48597c3e9d7fbaeb7bbb80eebe1802d43a3e --- moby-engine.spec | 6 ++---- moby-engine.spec.license | 9 --------- 2 files changed, 2 insertions(+), 13 deletions(-) delete mode 100644 moby-engine.spec.license diff --git a/moby-engine.spec b/moby-engine.spec index f49570b..fe32b84 100644 --- a/moby-engine.spec +++ b/moby-engine.spec @@ -1,8 +1,8 @@ # This specfile is licensed under: -# SPDX-License-Identifier: MIT # SPDX-FileCopyrightText: Fedora Project Authors # SPDX-FileCopyrightText: 2022 Maxwell G -# See %%{name}.spec.license for the full license text. +# SPDX-License-Identifier: MIT +# License Text: https://spdx.org/licenses/MIT.html # moby %global goipath_moby github.com/docker/docker @@ -36,8 +36,6 @@ Source6: generate-docs.sh # Seperate file containing virtual provides for bundled deps that's %%include'd in the specfile. Source100: provides.spec.inc -# Specfile license -Source200: moby-engine.spec.license URL: https://www.docker.com diff --git a/moby-engine.spec.license b/moby-engine.spec.license deleted file mode 100644 index 2071b23..0000000 --- a/moby-engine.spec.license +++ /dev/null @@ -1,9 +0,0 @@ -MIT License - -Copyright (c) - -Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions: - -The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. - -THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. From e467313346c71c9a268120f1fc6510c767bd32d6 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 18 Jul 2024 18:23:55 +0000 Subject: [PATCH 098/163] Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild --- moby-engine.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/moby-engine.spec b/moby-engine.spec index fe32b84..39da8c7 100644 --- a/moby-engine.spec +++ b/moby-engine.spec @@ -23,7 +23,7 @@ Name: moby-engine Version: 24.0.5 -Release: 4%{?dist} +Release: 5%{?dist} Summary: The open-source application container engine License: Apache-2.0 Source0: %{git_moby}/archive/v%{version}/moby-%{version}.tar.gz @@ -279,6 +279,9 @@ done %{_datadir}/nano/Dockerfile.nanorc %changelog +* Thu Jul 18 2024 Fedora Release Engineering +- Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild + * Sun Feb 11 2024 Maxwell G - 24.0.5-4 - Rebuild for golang 1.22.0 From 56acff01d2394276d18da27428ae877d07487879 Mon Sep 17 00:00:00 2001 From: Maxwell G Date: Wed, 10 Apr 2024 15:14:38 -0500 Subject: [PATCH 099/163] Convert to %autorelease and %autochangelog [skip changelog] --- changelog | 277 ++++++++++++++++++++++++++++++++++++++++++++++ moby-engine.spec | 280 +---------------------------------------------- 2 files changed, 279 insertions(+), 278 deletions(-) create mode 100644 changelog diff --git a/changelog b/changelog new file mode 100644 index 0000000..557af05 --- /dev/null +++ b/changelog @@ -0,0 +1,277 @@ +* Thu Jul 18 2024 Fedora Release Engineering +- Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild + +* Sun Feb 11 2024 Maxwell G - 24.0.5-4 +- Rebuild for golang 1.22.0 + +* Thu Jan 25 2024 Fedora Release Engineering +- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild + +* Sun Jan 21 2024 Fedora Release Engineering +- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild + +* Wed Aug 23 2023 LuK1337 - 24.0.5-1 +- Update moby-engine to 24.0.5 + +* Thu Jul 20 2023 Fedora Release Engineering +- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild + +* Sun Jan 29 2023 John Ghatas +- Update moby-engine to 23.0.4 + +* Sun Jan 29 2023 Sérgio Basto +- Update moby-engine to 20.10.23 + +* Thu Jan 19 2023 Fedora Release Engineering +- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild + +* Sun Jan 01 2023 Sérgio Basto +- Update moby-engine to 20.10.22 + +* Wed Dec 14 2022 Dan Čermák - 20.10.21-1 +- Update to 20.10.21 +- Fix build, use libnetwork from golang-github-docker-0:22.06.0~beta + +* Thu Oct 20 2022 Jan Kuparinen - 20.10.20-1 +- Update to 20.10.20. +- Mitigates CVE-2022-39253 + +* Tue Oct 18 2022 Jan Kuparinen - 20.10.19-1 +- Update to 20.10.19. + +* Sat Sep 10 2022 Maxwell G - 20.10.18-1 +- Update to 20.10.18. +- Mitigates CVE-2022-36109 / GHSA-rc4r-wh2q-q6c4 + +* Tue Aug 30 2022 Luca BRUNO - 20.10.17-8 +- Move 'docker' group creation logic to a sysusers.d fragment + Resolves: rhbz#1745936 + +* Fri Aug 05 2022 Maxwell G - 20.10.17-7 +- Migrate to SPDX license identifiers +- Generate debuginfo +- Specfile improvements + +* Thu Jul 21 2022 Fedora Release Engineering +- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild + +* Tue Jul 19 2022 Maxwell G - 20.10.17-5 +- Rebuild for CVE-2022-{1705,32148,30631,30633,28131,30635,30632,30630,1962} in + golang + +* Mon Jul 04 2022 Maxwell G - 20.10.17-4 +- Only build on %%golang_arches (i.e. where golang is available). + +* Sun Jun 19 2022 Maxwell G - 20.10.17-3 +- Rebuilt for CVE-2022-1996, CVE-2022-24675, CVE-2022-28327, CVE-2022-27191, + CVE-2022-29526, CVE-2022-30629. + +* Sat Jun 11 2022 Maxwell G - 20.10.17-2 +- Rebuild for new golang-github-docker-libnetwork + +* Fri Jun 10 2022 Maxwell G - 20.10.17-1 +- Update to 20.10.17. Fixes rhbz#2095714. + +* Fri May 13 2022 Maxwell G - 20.10.16-1 +- Update to 20.10.16. + +* Sat May 07 2022 Maxwell G - 20.10.15-1 +- Update to 20.10.15 (rhbz#2082501). +- Fix BUILDTAGS (rhbz#2082924). +- Make non-binary subpackages noarch. + +* Mon Apr 11 2022 Maxwell G - 20.10.14-1 +- Update to 20.10.14. Fixes rhbz#2063052. +- Mitigate CVE-2022-24769. + +* Mon Jan 31 2022 Maxwell G - 20.10.12-3 +- Fixes FTBFS. Closes rhbz#2046748. +- Use %%gobuild instead of Makefile to build binaries +- Add explanatory comments. +- Normalize install commands +- Make compliant with SourceURL Guidelines +- Remove no longer necessary `ExcludeArch: ppc64`. + +* Thu Jan 20 2022 Fedora Release Engineering - 20.10.12-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild + +* Tue Jan 11 2022 Maxwell G - 20.10.12-1 +- Update to 20.10.12. Fixes rhbz#2032534. +- Install zsh completions to the correct directory. Fixes rhbz#2038888. + +* Mon Nov 22 2021 Olivier Lemasle - 20.10-11-1 +- Update to upstream 20.10.11 (fixes rhbz#2024384) +- Mitigates CVE-2021-41190 (fixes rhbz#2024940) + +* Fri Oct 29 2021 Maxwell G - 20.10.10-1 +- Update to 20.10.10 (fixes rhbz#2015385) +- Update virtual provides + +* Fri Oct 08 2021 Maxwell G - 20.10.9-1 +- Update to 20.10.9 (fixes rhbz#2010508) +- Patch seccomp policy to fix clone3() issue (fixes rhbz#2011523 and rhbz#1988199) + +* Sun Aug 15 2021 Olivier Lemasle - 20.10.8-1 +- Update to upstream 20.10.8 (fixes rhbz#1990148) +- Fix seccomp support (fixes rhbz#1986092) + +* Sun Aug 15 2021 Dusty Mabe - 20.10.7-3 +- Remove `Requires(post)` on firewalld-filesystem. + +* Thu Jul 22 2021 Fedora Release Engineering - 20.10.7-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild + +* Fri Jul 16 2021 Olivier Lemasle - 20.10.7-1 +- Update to upstream 20.10.7 (fixes rhbz#1967390) + +* Tue May 04 2021 Olivier Lemasle - 20.10.6-2 +- Add conflict with podman-docker + +* Tue Apr 20 2021 Olivier Lemasle - 20.10.6-1 +- Update to upstream 20.10.6 (#1948605) +- Re-bundle moby dependencies to fix gRPC issues with Swarm + (https://github.com/coreos/fedora-coreos-tracker/issues/793) + +* 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 +- Remove fixed storage-driver (cf. https://src.fedoraproject.org/rpms/moby-engine/pull-request/6) + +* 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. + +* Tue Jan 26 2021 Fedora Release Engineering - 19.03.13-2.ce.git4484c46 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild + +* Fri Oct 02 2020 Olivier Lemasle - 19.03.13-1.ce.git4484c46 +- Update to upstream 19.03.13 (#1837641) + +* Fri Oct 02 2020 Olivier Lemasle - 19.03.11-4.ce.git42e35e6 +- Fix FTBFS: adapt to change to CMake builds (#1864160) + +* Sat Aug 01 2020 Fedora Release Engineering - 19.03.11-3.ce.git42e35e6 +- Second attempt - Rebuilt for + https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild + +* Tue Jul 28 2020 Fedora Release Engineering - 19.03.11-2.ce.git42e35e6 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild + +* Sun Jun 07 2020 Olivier Lemasle - 19.03.11-1.ce.git42e35e6 +- Update to upstream 19.03.11 to prevent CVE-2020-13401 + +* Thu May 07 2020 Olivier Lemasle - 19.03.8-2.ce.gitafacb8b +- Configure storage-driver explicitely (fixes #1832301) +- Add firewalld zone: trust interface docker0, as firewalld now uses nftables + by default and docker communicates with iptables (fixes #1817022) + +* Mon Mar 16 2020 Olivier Lemasle - 19.03.8-1.ce.gitafacb8b +- Update to latest upstream release - Docker CE 19.03.8 +- Prune unused BuildRequires + +* Sun Mar 8 2020 Olivier Lemasle - 19.03.7-2.ce.git7141c19 +- Add Conflicts with docker-ce-cli and Obsoletes docker-common + +* Sat Mar 7 2020 Olivier Lemasle - 19.03.7-1.ce.git7141c19 +- Update to latest upstream release - Docker CE 19.03.7 +- Add Epoch: 2 to Obsoletes for docker and docker-latest + +* Wed Jan 29 2020 Fedora Release Engineering - 18.09.8-3.ce.git0dd43dd +- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild + +* Thu Jul 25 2019 Fedora Release Engineering - 18.09.8-2.ce.git0dd43dd +- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild + +* Thu Jul 18 2019 Olivier Lemasle - 18.09.8-1.ce.git0dd43dd +- Update to latest upstream release - Docker CE 18.09.8 + +* Sat Jul 13 2019 Olivier Lemasle - 18.09.7-5.ce.git2d0083d +- Move docker-init and docker-proxy to /usr/libexec/docker +- Update moby-engine-nano summary to follow guidelines + +* Sat Jul 13 2019 Olivier Lemasle - 18.09.7-4.ce.git2d0083d +- Add nofile ulimit to default docker daemon options (#1715254, #1708115) + +* Fri Jul 12 2019 Olivier Lemasle - 18.09.7-3.ce.git2d0083d +- rebuilt + +* Fri Jul 12 2019 Olivier Lemasle - 18.09.7-2.ce.git2d0083d +- Depend on packaged versions "runc" and "containerd" instead of building them. + +* Thu Jun 27 2019 David Michael - 18.09.7-1.ce.git2d0083d +- Update docker-ce to commit 2d0083d (version 18.09.7). +- Update runc to commit 425e105. +- Update containerd to commit 894b81a (1.2.6). +- Update docker-proxy to commit e7933d4. + +* Tue May 14 2019 David Michael - 18.09.6-1.ce.git481bc77 +- Update docker-ce to commit 481bc77 (version 18.09.6). +- Update docker-proxy to commit 872f0a8. +- Obsolete and provide the docker and docker-latest packages. (#1700006) + +* Thu Apr 11 2019 David Michael - 18.09.5-1.ce.gite8ff056 +- Update docker-ce to commit e8ff056 (version 18.09.5). +- Update docker-runc to commit 2b18fe1. +- Update docker-containerd to commit bb71b10 (version 1.2.5). +- Update docker-proxy to commit 4725f21. +- Report the correct engine version. +- Install symlinks to unprefixed runc/containerd program names. + +* Thu Mar 28 2019 David Michael - 18.06.3-2.ce.gitd7080c1 +- Conflict with docker-common. (#1693397) + +* Thu Feb 21 2019 David Michael - 18.06.3-1.ce.gitd7080c1 +- Update docker-ce to commit d7080c1 (version 18.06.3). + +* Tue Feb 12 2019 David Michael - 18.06.2-1.ce.git6d37f41 +- Update docker-ce to commit 6d37f41 (version 18.06.2). +- Update docker-runc to commit a592beb. + +* Mon Feb 11 2019 David Michael - 18.06.1-3.ce.gite68fc7a +- Apply a runc patch for CVE-2019-5736. + +* Fri Feb 01 2019 Fedora Release Engineering - 18.06.1-2.ce.gite68fc7a +- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild + +* Thu Nov 29 2018 David Michael - 18.06.1-1.ce.gite68fc7a +- Update docker-ce to commit e68fc7a (version 18.06.1). +- Update docker-runc to commit 69663f0. +- Update docker-containerd to commit 468a545 (version 1.1.2). +- Update docker-proxy to commit 3ac297b. +- Backport a fix for mounting named volumes. +- Create a "docker" group for non-root Docker access. +- Support systemd socket-activation. +- Make runc and containerd commit IDs match their expected values. +- Preserve containerd debuginfo. + +* Mon Nov 12 2018 Marcin Skarbek - 18.06.0-2.ce.git0ffa825 +- add configuration file +- update service file + +* Sat Aug 18 2018 Lokesh Mandvekar - 18.06.0-1.ce.git0ffa825 +- Resolves: #1539161 - first upload to Fedora +- built docker-ce commit 0ffa825 +- built docker-runc commit ad0f5255 +- built docker-containerd commit a88b631 +- built docker-proxy commit a79d368 +- built docker-init commit fec3683 + +* Tue Mar 20 2018 Lokesh Mandvekar - 17.03.2-4.ce.gitf5ec1e2 +- correct some rpmlint errors + +* Wed Feb 21 2018 Lokesh Mandvekar - 17.03.2-3.ce +- docker-* symlinks to moby-* (RE: gh PR 34226) + +* Wed Feb 21 2018 Lokesh Mandvekar - 17.03.2-2.ce +- rename binaries as per upstream gh PR 34226 + +* Fri Jan 26 2018 Lokesh Mandvekar - 17.03.2-1 +- initial build +- built moby commit f5ec1e2 +- built cli commit 4b61f56 +- built docker-runc commit 2d41c047 +- built docker-containerd commit 3addd84 +- built docker-proxy commit 7b2b1fe diff --git a/moby-engine.spec b/moby-engine.spec index 39da8c7..6a4ede5 100644 --- a/moby-engine.spec +++ b/moby-engine.spec @@ -23,7 +23,7 @@ Name: moby-engine Version: 24.0.5 -Release: 5%{?dist} +Release: %autorelease Summary: The open-source application container engine License: Apache-2.0 Source0: %{git_moby}/archive/v%{version}/moby-%{version}.tar.gz @@ -279,280 +279,4 @@ done %{_datadir}/nano/Dockerfile.nanorc %changelog -* Thu Jul 18 2024 Fedora Release Engineering -- Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild - -* Sun Feb 11 2024 Maxwell G - 24.0.5-4 -- Rebuild for golang 1.22.0 - -* Thu Jan 25 2024 Fedora Release Engineering -- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild - -* Sun Jan 21 2024 Fedora Release Engineering -- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild - -* Wed Aug 23 2023 LuK1337 - 24.0.5-1 -- Update moby-engine to 24.0.5 - -* Thu Jul 20 2023 Fedora Release Engineering -- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild - -* Sun Jan 29 2023 John Ghatas -- Update moby-engine to 23.0.4 - -* Sun Jan 29 2023 Sérgio Basto -- Update moby-engine to 20.10.23 - -* Thu Jan 19 2023 Fedora Release Engineering -- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild - -* Sun Jan 01 2023 Sérgio Basto -- Update moby-engine to 20.10.22 - -* Wed Dec 14 2022 Dan Čermák - 20.10.21-1 -- Update to 20.10.21 -- Fix build, use libnetwork from golang-github-docker-0:22.06.0~beta - -* Thu Oct 20 2022 Jan Kuparinen - 20.10.20-1 -- Update to 20.10.20. -- Mitigates CVE-2022-39253 - -* Tue Oct 18 2022 Jan Kuparinen - 20.10.19-1 -- Update to 20.10.19. - -* Sat Sep 10 2022 Maxwell G - 20.10.18-1 -- Update to 20.10.18. -- Mitigates CVE-2022-36109 / GHSA-rc4r-wh2q-q6c4 - -* Tue Aug 30 2022 Luca BRUNO - 20.10.17-8 -- Move 'docker' group creation logic to a sysusers.d fragment - Resolves: rhbz#1745936 - -* Fri Aug 05 2022 Maxwell G - 20.10.17-7 -- Migrate to SPDX license identifiers -- Generate debuginfo -- Specfile improvements - -* Thu Jul 21 2022 Fedora Release Engineering -- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild - -* Tue Jul 19 2022 Maxwell G - 20.10.17-5 -- Rebuild for CVE-2022-{1705,32148,30631,30633,28131,30635,30632,30630,1962} in - golang - -* Mon Jul 04 2022 Maxwell G - 20.10.17-4 -- Only build on %%golang_arches (i.e. where golang is available). - -* Sun Jun 19 2022 Maxwell G - 20.10.17-3 -- Rebuilt for CVE-2022-1996, CVE-2022-24675, CVE-2022-28327, CVE-2022-27191, - CVE-2022-29526, CVE-2022-30629. - -* Sat Jun 11 2022 Maxwell G - 20.10.17-2 -- Rebuild for new golang-github-docker-libnetwork - -* Fri Jun 10 2022 Maxwell G - 20.10.17-1 -- Update to 20.10.17. Fixes rhbz#2095714. - -* Fri May 13 2022 Maxwell G - 20.10.16-1 -- Update to 20.10.16. - -* Sat May 07 2022 Maxwell G - 20.10.15-1 -- Update to 20.10.15 (rhbz#2082501). -- Fix BUILDTAGS (rhbz#2082924). -- Make non-binary subpackages noarch. - -* Mon Apr 11 2022 Maxwell G - 20.10.14-1 -- Update to 20.10.14. Fixes rhbz#2063052. -- Mitigate CVE-2022-24769. - -* Mon Jan 31 2022 Maxwell G - 20.10.12-3 -- Fixes FTBFS. Closes rhbz#2046748. -- Use %%gobuild instead of Makefile to build binaries -- Add explanatory comments. -- Normalize install commands -- Make compliant with SourceURL Guidelines -- Remove no longer necessary `ExcludeArch: ppc64`. - -* Thu Jan 20 2022 Fedora Release Engineering - 20.10.12-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild - -* Tue Jan 11 2022 Maxwell G - 20.10.12-1 -- Update to 20.10.12. Fixes rhbz#2032534. -- Install zsh completions to the correct directory. Fixes rhbz#2038888. - -* Mon Nov 22 2021 Olivier Lemasle - 20.10-11-1 -- Update to upstream 20.10.11 (fixes rhbz#2024384) -- Mitigates CVE-2021-41190 (fixes rhbz#2024940) - -* Fri Oct 29 2021 Maxwell G - 20.10.10-1 -- Update to 20.10.10 (fixes rhbz#2015385) -- Update virtual provides - -* Fri Oct 08 2021 Maxwell G - 20.10.9-1 -- Update to 20.10.9 (fixes rhbz#2010508) -- Patch seccomp policy to fix clone3() issue (fixes rhbz#2011523 and rhbz#1988199) - -* Sun Aug 15 2021 Olivier Lemasle - 20.10.8-1 -- Update to upstream 20.10.8 (fixes rhbz#1990148) -- Fix seccomp support (fixes rhbz#1986092) - -* Sun Aug 15 2021 Dusty Mabe - 20.10.7-3 -- Remove `Requires(post)` on firewalld-filesystem. - -* Thu Jul 22 2021 Fedora Release Engineering - 20.10.7-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild - -* Fri Jul 16 2021 Olivier Lemasle - 20.10.7-1 -- Update to upstream 20.10.7 (fixes rhbz#1967390) - -* Tue May 04 2021 Olivier Lemasle - 20.10.6-2 -- Add conflict with podman-docker - -* Tue Apr 20 2021 Olivier Lemasle - 20.10.6-1 -- Update to upstream 20.10.6 (#1948605) -- Re-bundle moby dependencies to fix gRPC issues with Swarm - (https://github.com/coreos/fedora-coreos-tracker/issues/793) - -* 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 -- Remove fixed storage-driver (cf. https://src.fedoraproject.org/rpms/moby-engine/pull-request/6) - -* 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. - -* Tue Jan 26 2021 Fedora Release Engineering - 19.03.13-2.ce.git4484c46 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild - -* Fri Oct 02 2020 Olivier Lemasle - 19.03.13-1.ce.git4484c46 -- Update to upstream 19.03.13 (#1837641) - -* Fri Oct 02 2020 Olivier Lemasle - 19.03.11-4.ce.git42e35e6 -- Fix FTBFS: adapt to change to CMake builds (#1864160) - -* Sat Aug 01 2020 Fedora Release Engineering - 19.03.11-3.ce.git42e35e6 -- Second attempt - Rebuilt for - https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild - -* Tue Jul 28 2020 Fedora Release Engineering - 19.03.11-2.ce.git42e35e6 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild - -* Sun Jun 07 2020 Olivier Lemasle - 19.03.11-1.ce.git42e35e6 -- Update to upstream 19.03.11 to prevent CVE-2020-13401 - -* Thu May 07 2020 Olivier Lemasle - 19.03.8-2.ce.gitafacb8b -- Configure storage-driver explicitely (fixes #1832301) -- Add firewalld zone: trust interface docker0, as firewalld now uses nftables - by default and docker communicates with iptables (fixes #1817022) - -* Mon Mar 16 2020 Olivier Lemasle - 19.03.8-1.ce.gitafacb8b -- Update to latest upstream release - Docker CE 19.03.8 -- Prune unused BuildRequires - -* Sun Mar 8 2020 Olivier Lemasle - 19.03.7-2.ce.git7141c19 -- Add Conflicts with docker-ce-cli and Obsoletes docker-common - -* Sat Mar 7 2020 Olivier Lemasle - 19.03.7-1.ce.git7141c19 -- Update to latest upstream release - Docker CE 19.03.7 -- Add Epoch: 2 to Obsoletes for docker and docker-latest - -* Wed Jan 29 2020 Fedora Release Engineering - 18.09.8-3.ce.git0dd43dd -- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild - -* Thu Jul 25 2019 Fedora Release Engineering - 18.09.8-2.ce.git0dd43dd -- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild - -* Thu Jul 18 2019 Olivier Lemasle - 18.09.8-1.ce.git0dd43dd -- Update to latest upstream release - Docker CE 18.09.8 - -* Sat Jul 13 2019 Olivier Lemasle - 18.09.7-5.ce.git2d0083d -- Move docker-init and docker-proxy to /usr/libexec/docker -- Update moby-engine-nano summary to follow guidelines - -* Sat Jul 13 2019 Olivier Lemasle - 18.09.7-4.ce.git2d0083d -- Add nofile ulimit to default docker daemon options (#1715254, #1708115) - -* Fri Jul 12 2019 Olivier Lemasle - 18.09.7-3.ce.git2d0083d -- rebuilt - -* Fri Jul 12 2019 Olivier Lemasle - 18.09.7-2.ce.git2d0083d -- Depend on packaged versions "runc" and "containerd" instead of building them. - -* Thu Jun 27 2019 David Michael - 18.09.7-1.ce.git2d0083d -- Update docker-ce to commit 2d0083d (version 18.09.7). -- Update runc to commit 425e105. -- Update containerd to commit 894b81a (1.2.6). -- Update docker-proxy to commit e7933d4. - -* Tue May 14 2019 David Michael - 18.09.6-1.ce.git481bc77 -- Update docker-ce to commit 481bc77 (version 18.09.6). -- Update docker-proxy to commit 872f0a8. -- Obsolete and provide the docker and docker-latest packages. (#1700006) - -* Thu Apr 11 2019 David Michael - 18.09.5-1.ce.gite8ff056 -- Update docker-ce to commit e8ff056 (version 18.09.5). -- Update docker-runc to commit 2b18fe1. -- Update docker-containerd to commit bb71b10 (version 1.2.5). -- Update docker-proxy to commit 4725f21. -- Report the correct engine version. -- Install symlinks to unprefixed runc/containerd program names. - -* Thu Mar 28 2019 David Michael - 18.06.3-2.ce.gitd7080c1 -- Conflict with docker-common. (#1693397) - -* Thu Feb 21 2019 David Michael - 18.06.3-1.ce.gitd7080c1 -- Update docker-ce to commit d7080c1 (version 18.06.3). - -* Tue Feb 12 2019 David Michael - 18.06.2-1.ce.git6d37f41 -- Update docker-ce to commit 6d37f41 (version 18.06.2). -- Update docker-runc to commit a592beb. - -* Mon Feb 11 2019 David Michael - 18.06.1-3.ce.gite68fc7a -- Apply a runc patch for CVE-2019-5736. - -* Fri Feb 01 2019 Fedora Release Engineering - 18.06.1-2.ce.gite68fc7a -- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild - -* Thu Nov 29 2018 David Michael - 18.06.1-1.ce.gite68fc7a -- Update docker-ce to commit e68fc7a (version 18.06.1). -- Update docker-runc to commit 69663f0. -- Update docker-containerd to commit 468a545 (version 1.1.2). -- Update docker-proxy to commit 3ac297b. -- Backport a fix for mounting named volumes. -- Create a "docker" group for non-root Docker access. -- Support systemd socket-activation. -- Make runc and containerd commit IDs match their expected values. -- Preserve containerd debuginfo. - -* Mon Nov 12 2018 Marcin Skarbek - 18.06.0-2.ce.git0ffa825 -- add configuration file -- update service file - -* Sat Aug 18 2018 Lokesh Mandvekar - 18.06.0-1.ce.git0ffa825 -- Resolves: #1539161 - first upload to Fedora -- built docker-ce commit 0ffa825 -- built docker-runc commit ad0f5255 -- built docker-containerd commit a88b631 -- built docker-proxy commit a79d368 -- built docker-init commit fec3683 - -* Tue Mar 20 2018 Lokesh Mandvekar - 17.03.2-4.ce.gitf5ec1e2 -- correct some rpmlint errors - -* Wed Feb 21 2018 Lokesh Mandvekar - 17.03.2-3.ce -- docker-* symlinks to moby-* (RE: gh PR 34226) - -* Wed Feb 21 2018 Lokesh Mandvekar - 17.03.2-2.ce -- rename binaries as per upstream gh PR 34226 - -* Fri Jan 26 2018 Lokesh Mandvekar - 17.03.2-1 -- initial build -- built moby commit f5ec1e2 -- built cli commit 4b61f56 -- built docker-runc commit 2d41c047 -- built docker-containerd commit 3addd84 -- built docker-proxy commit 7b2b1fe +%autochangelog From 8c217e23ac6fce73859022e3e6f8002d09e5324d Mon Sep 17 00:00:00 2001 From: Maxwell G Date: Thu, 11 Apr 2024 01:03:39 +0000 Subject: [PATCH 100/163] Update to 26.0.0. Fixes rhbz#2237925. This specfile was rewritten from scratch. The code was cleaned up, go-vendor-tools was adopted to handle licensing and vendoring, we use the upstream Makefile to build the package, stop bundling tini-static, and split the cli into a separate package. --- .gitignore | 2 + ...adjust-docker.service-for-downstream.patch | 34 ++ docker.service | 38 -- docker.sysconfig | 10 - generate-docs.sh | 12 - go-vendor-tools.toml | 20 + macros.moby | 4 + moby-engine.spec | 372 +++++++----------- provides.spec.inc | 108 ----- sources | 5 +- 10 files changed, 210 insertions(+), 395 deletions(-) create mode 100644 0001-systemd-adjust-docker.service-for-downstream.patch delete mode 100644 docker.service delete mode 100644 docker.sysconfig delete mode 100644 generate-docs.sh create mode 100644 go-vendor-tools.toml create mode 100644 macros.moby delete mode 100644 provides.spec.inc diff --git a/.gitignore b/.gitignore index d310b09..cca4de0 100644 --- a/.gitignore +++ b/.gitignore @@ -57,3 +57,5 @@ moby-v20.10.10.tar.gz /tini-0b44d36.tar.gz /cli-24.0.5.tar.gz /moby-24.0.5.tar.gz +/moby-26.0.0.tar.gz +/moby-26.0.0-vendor.tar.bz2 diff --git a/0001-systemd-adjust-docker.service-for-downstream.patch b/0001-systemd-adjust-docker.service-for-downstream.patch new file mode 100644 index 0000000..42db4f3 --- /dev/null +++ b/0001-systemd-adjust-docker.service-for-downstream.patch @@ -0,0 +1,34 @@ +From 5b6aae1885d02aa0a1ab0846834b86d87c989b79 Mon Sep 17 00:00:00 2001 +From: Maxwell G +Date: Fri, 15 Mar 2024 00:28:34 +0000 +Subject: [PATCH] systemd: adjust docker.service for downstream + +For now, we just enable selinux support and hardcode the paths for +docker-proxy and docker-init. +For `--init-path`, we use the tini-static binary directly instead of +bundling tini in this package. +--- + contrib/init/systemd/docker.service | 7 ++++++- + 1 file changed, 6 insertions(+), 1 deletion(-) + +diff --git a/contrib/init/systemd/docker.service b/contrib/init/systemd/docker.service +index d8c7867..e305616 100644 +--- a/contrib/init/systemd/docker.service ++++ b/contrib/init/systemd/docker.service +@@ -10,7 +10,12 @@ Type=notify + # the default is not to use systemd for cgroups because the delegate issues still + # exists and systemd currently does not support the cgroup feature set required + # for containers run by docker +-ExecStart=/usr/bin/dockerd -H fd:// --containerd=/run/containerd/containerd.sock ++ExecStart=/usr/bin/dockerd \ ++ -H fd:// \ ++ --containerd=/run/containerd/containerd.sock \ ++ --selinux-enabled \ ++ --userland-proxy-path /usr/bin/docker-proxy \ ++ --init-path /usr/bin/tini-static + ExecReload=/bin/kill -s HUP $MAINPID + TimeoutStartSec=0 + RestartSec=2 +-- +2.44.0 + diff --git a/docker.service b/docker.service deleted file mode 100644 index 41cb0e3..0000000 --- a/docker.service +++ /dev/null @@ -1,38 +0,0 @@ -[Unit] -Description=Docker Application Container Engine -Documentation=https://docs.docker.com -After=docker.socket network-online.target firewalld.service -Requires=docker.socket -Wants=network-online.target - -[Service] -Type=notify -EnvironmentFile=-/etc/sysconfig/docker -# the default is not to use systemd for cgroups because the delegate issues still -# exists and systemd currently does not support the cgroup feature set required -# for containers run by docker -ExecStart=/usr/bin/dockerd \ - --host=fd:// \ - --exec-opt native.cgroupdriver=systemd \ - $OPTIONS -ExecReload=/bin/kill -s HUP $MAINPID -# Having non-zero Limit*s causes performance problems due to accounting overhead -# in the kernel. We recommend using cgroups to do container-local accounting. -LimitNOFILE=infinity -LimitNPROC=infinity -LimitCORE=infinity -# Uncomment TasksMax if your systemd version supports it. -# Only systemd 226 and above support this version. -#TasksMax=infinity -TimeoutStartSec=0 -# set delegate yes so that systemd does not reset the cgroups of docker containers -#Delegate=yes -# kill only the docker process, not all processes in the cgroup -KillMode=process -# restart the docker process if it exits prematurely -Restart=on-failure -StartLimitBurst=3 -StartLimitInterval=60s - -[Install] -WantedBy=multi-user.target diff --git a/docker.sysconfig b/docker.sysconfig deleted file mode 100644 index 6ba9fd7..0000000 --- a/docker.sysconfig +++ /dev/null @@ -1,10 +0,0 @@ -# /etc/sysconfig/docker - -# Modify these options if you want to change the way the docker daemon runs -OPTIONS="--selinux-enabled \ - --log-driver=journald \ - --live-restore \ - --default-ulimit nofile=1024:1024 \ - --init-path /usr/libexec/docker/docker-init \ - --userland-proxy-path /usr/libexec/docker/docker-proxy \ -" diff --git a/generate-docs.sh b/generate-docs.sh deleted file mode 100644 index 09fb5cb..0000000 --- a/generate-docs.sh +++ /dev/null @@ -1,12 +0,0 @@ -cd man -for FILE in *.md; do - base="$(basename "$FILE")" - name="${base%.md}" - num="${name##*.}" - if [ -z "$num" ] || [ "$name" = "$num" ]; then - # skip files that aren't of the format xxxx.N.md (like README.md) - continue - fi - mkdir -p "./man${num}" - (set -x ;go-md2man -in "$FILE" -out "./man${num}/${name}") -done diff --git a/go-vendor-tools.toml b/go-vendor-tools.toml new file mode 100644 index 0000000..af903c2 --- /dev/null +++ b/go-vendor-tools.toml @@ -0,0 +1,20 @@ +[licensing] +detector = "trivy" + +[[licensing.licenses]] +path = "vendor/github.com/google/shlex/COPYING" +sha256sum = "cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30" +expression = "Apache-2.0" + +[[licensing.licenses]] +path = "vendor/github.com/spdx/tools-golang/LICENSE.code" +sha256sum = "e914fb1f3927226e04b0438e0b541b3c6e3c65de4d64aa8f5cdaa803f05448fd" +expression = "Apache-2.0 OR GPL-2.0-or-later" + +[archive] +pre_commands = [ + # This project has a setup where go.mod and go.sum are not always present. + # We write those files manually. + ["cp", "-p", "vendor.mod", "go.mod"], + ["cp", "-p", "vendor.sum", "go.sum"], +] diff --git a/macros.moby b/macros.moby new file mode 100644 index 0000000..4a7ae04 --- /dev/null +++ b/macros.moby @@ -0,0 +1,4 @@ +# SPDX-FileCopyrightText: 2024 Maxwell G +# SPDX-License-Identifier: Apache-2.0 + +%moby_cli_plugins_dir %{_libexecdir}/docker/cli-plugins diff --git a/moby-engine.spec b/moby-engine.spec index 6a4ede5..717477f 100644 --- a/moby-engine.spec +++ b/moby-engine.spec @@ -1,247 +1,178 @@ # This specfile is licensed under: # SPDX-FileCopyrightText: Fedora Project Authors -# SPDX-FileCopyrightText: 2022 Maxwell G +# SPDX-FileCopyrightText: 2024 Maxwell G # SPDX-License-Identifier: MIT # License Text: https://spdx.org/licenses/MIT.html -# moby -%global goipath_moby github.com/docker/docker -%global git_moby https://%%{goipath_moby} -#%%global commit_moby 9fdeb9c3de2f2d9f5799be373f27b2f9df44609d -#%%global shortcommit_moby %%(c=%%{commit_moby}; echo ${c:0:7}) +# Generated by go2rpm 1.11.0 +%bcond_without check -# cli -%global goipath_cli github.com/docker/cli -%global git_cli https://%%{goipath_cli} -#%%global commit_cli baeda1f82a10204ec5708d5fbba130ad76cfee49 -#%%global shortcommit_cli %%(c=%%{commit_cli}; echo ${c:0:7}) +# https://github.com/moby/moby +%global goipath github.com/docker/docker +%global forgeurl https://github.com/moby/moby +Version: 26.0.0 -# tini -%global git_tini https://github.com/krallin/tini -%global commit_tini 0b44d3665869e46ccbac7414241b8256d6234dc4 -%global shortcommit_tini %(c=%{commit_tini}; echo ${c:0:7}) +%gometa -L -f -Name: moby-engine -Version: 24.0.5 -Release: %autorelease -Summary: The open-source application container engine -License: Apache-2.0 -Source0: %{git_moby}/archive/v%{version}/moby-%{version}.tar.gz -Source1: %{git_cli}/archive/v%{version}/cli-%{version}.tar.gz -Source2: %{git_tini}/archive/%{commit_tini}/tini-%{shortcommit_tini}.tar.gz -Source3: docker.service -Source4: docker.sysconfig -Source5: moby-engine-systemd-sysusers.conf -Source6: generate-docs.sh - -# Seperate file containing virtual provides for bundled deps that's %%include'd in the specfile. -Source100: provides.spec.inc - -URL: https://www.docker.com - -ExclusiveArch: %{golang_arches} - -BuildRequires: golang(github.com/docker/docker/libnetwork) -BuildRequires: pkgconfig(libbtrfsutil) -BuildRequires: pkgconfig(devmapper) -BuildRequires: golang -BuildRequires: go-rpm-macros -BuildRequires: go-md2man -BuildRequires: pkgconfig(libseccomp) >= 2.3.0 -BuildRequires: make -BuildRequires: pkgconfig(audit) -BuildRequires: pkgconfig(systemd) -BuildRequires: systemd-rpm-macros -BuildRequires: firewalld-filesystem - -# Build dependencies for tini -BuildRequires: cmake -BuildRequires: glibc-static - -# required packages on install -Requires: container-selinux -Requires: containerd -Requires: iptables -Requires: pigz -Requires: runc -Requires: systemd -Requires: tar -Requires: xz - -# Resolves: rhbz#1165615 -Requires: device-mapper-libs >= 1.02.90-1 - -# Replace the old Docker packages -Provides: docker = %{version}-%{release} -Provides: docker-latest = %{version}-%{release} - -# conflicting packages -Conflicts: docker-ce -Conflicts: docker-ce-cli -Conflicts: docker-common -Conflicts: docker-ee -Conflicts: docker-engine-cs -Conflicts: docker-io -Conflicts: podman-docker - -%include %{SOURCE100} - -%description +%global common_description %{expand: Docker is an open source project to build, ship and run any application as a lightweight container. Docker containers are both hardware-agnostic and platform-agnostic. This means they can run anywhere, from your laptop to the largest EC2 compute instance and -everything in between - and they don't require you to use a particular +everything in between — and they do not require you to use a particular language, framework or packaging system. That makes them great building blocks for deploying and scaling web apps, databases, and backend services without depending on a particular stack or provider. +} -%package fish-completion -Summary: Fish completion files for %{name} -BuildArch: noarch -Requires: %{name} = %{version}-%{release} -Requires: fish -Provides: docker-fish-completion = %{version}-%{release} +Name: moby-engine +Release: %autorelease +Summary: The open-source application container engine -%description fish-completion -This package installs %{summary}. +# Generated with go-vendor-tools +License: Apache-2.0 AND BSD-2-Clause AND BSD-3-Clause AND ISC AND MIT AND MPL-2.0 AND (Apache-2.0 OR GPL-2.0-or-later) +URL: %{gourl} +Source0: %{gosource} +# Generated with go-vendor-tools +Source1: %{archivename}-vendor.tar.bz2 +Source2: go-vendor-tools.toml +Source3: moby-engine-systemd-sysusers.conf +Source4: macros.moby -%package zsh-completion -Summary: Zsh completion files for %{name} -BuildArch: noarch -Requires: %{name} = %{version}-%{release} -Requires: zsh -Provides: docker-zsh-completion = %{version}-%{release} +Patch: 0001-systemd-adjust-docker.service-for-downstream.patch + +BuildRequires: git-core +BuildRequires: go-vendor-tools +BuildRequires: make +BuildRequires: pkg-config +BuildRequires: systemd-devel + +# docker.service depends on containerd +Requires: containerd +# The docker CLI is provided as a separate package to ease maintenace and avoid +# overcomplicating the specfile +Requires: docker-cli >= %{version} +Requires: moby-filesystem = %{?epoch:%{epoch}:}%{version}-%{release} +# tini-static is used as the docker-init binary +Requires: tini-static + +# Other runtime packages (sorted) +Requires: container-selinux +Requires: iptables +Requires: libseccomp +Requires: systemd +Requires: tar +Requires: xz + +# Provide docker name to help users who "dnf install docker" +Provides: docker = %{version}-%{release} + +# Conflict with upstream packages +Conflicts: docker-ce +Conflicts: docker-ee + +%description %{common_description} -%description zsh-completion -This package installs %{summary}. %package nano Summary: GNU nano syntax highlighting files for Moby BuildArch: noarch Requires: %{name} = %{version}-%{release} Requires: nano +Supplements: moby-engine -%description nano +%description nano %{common_description} This package installs %{summary}. +%package -n moby-filesystem +Summary: Filesystem package for docker cli plugins and other directories +BuildArch: noarch +License: LicenseRef-Not-Copyrightable + +%description -n moby-filesystem %{common_description} +%{summary}. + +%package -n moby-rpm-macros +Summary: RPM Macros for packaging moby plugins +BuildArch: noarch + +%description -n moby-rpm-macros %{common_description} +%{summary}. + %prep -%setup -q -a 1 -a 2 -n moby-%{version} +%goprep -A +%setup -q -T -D -a1 %{forgesetupargs} +%autopatch -p1 +cp -p %{S:3} %{S:4} . + +%generate_buildrequires +%go_vendor_license_buildrequires -c %{S:2} -# correct rpmlint errors for bash completion -sed -i '/env bash/d' cli-%{version}/contrib/completion/bash/docker -cp %{SOURCE6} cli-%{version}/scripts/docs/generate-man.sh %build -mkdir -p _build/bin - -# build docker-proxy / libnetwork -( - - # Build binary using `golang-github-docker-libnetwork-devel` - # (github.com/docker/libnetwork) installed in system GOPATH. - export GOPATH="%{_datadir}/gocode" - %gobuild -o _build/bin/docker-proxy github.com/docker/docker/cmd/docker-proxy -) - -# build tini (installed as docker-init) -( - cd tini-%{commit_tini} - %cmake - make tini-static -C "%{__cmake_builddir}" -) - -%global buildtime %(date --utc --date="@${SOURCE_DATE_EPOCH:-$(date +%s)}" +"%Y-%m-%dT%H:%M:%SZ") -# build engine -( - mkdir -p src/github.com/docker - # Link source and vendored deps into local GOPATH. - ln -fns ../../.. src/%{goipath_moby} - # Build using source and vendored deps in local GOPATH. - export GOPATH="${PWD}" - export GO111MODULE=off - 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=%{buildtime}'" - export DOCKER_BUILDTAGS="seccomp selinux journald" - export BUILDTAGS="${DOCKER_BUILDTAGS}" - export GOBUILDTAGS="${BUILDTAGS}" - %gobuild -o _build/bin/dockerd %{goipath_moby}/cmd/dockerd - # VERSION=%%{version} DOCKER_GITCOMMIT=%%{shortcommit_moby} bash sh dynbinary - # mv bundles/dynbinary-daemon/dockerd-%%{version} _build/bin/dockerd -) - -# build cli -( - cd cli-%{version} - mkdir -p src/github.com/docker - # Link source and vendored deps into local GOPATH. - ln -fns ../../.. src/%{goipath_cli} - # export DISABLE_WARN_OUTSIDE_CONTAINER=1 - # Build using source and vendored deps in local GOPATH. - export GOPATH="${PWD}" - export GO111MODULE=off - export LDFLAGS="\ - -w \ - -X \"github.com/docker/cli/cli/version.GitCommit=%{shortcommit_cli}\" \ - -X \"github.com/docker/cli/cli/version.BuildTime=%{buildtime}\" \ - -X \"github.com/docker/cli/cli/version.Version=%{version}\" \ - " - export BUILDTAGS="pkcs11" - export GOBUILDTAGS="${BUILDTAGS}" - %gobuild -o ../_build/bin/docker %{goipath_cli}/cmd/docker - # make VERSION=%%{version} GITCOMMIT=%%{shortcommit_cli} dynbinary - - scripts/docs/generate-man.sh -) +GO_LDFLAGS="" GO_BUILDTAGS="" +# DOCKER_DEBUG: Ensure that all debuginfo is preserved +BUILDFLAGS="%{gocompilerflags} -a -v -x" \ +DOCKER_BUILDTAGS="rpm_crashback journald" \ +DOCKER_GITCOMMIT=%{release} \ +DOCKER_DEBUG=1 \ +DOCKER_LDFLAGS=%{gobuild_ldflags_shescaped} \ +LDFLAGS=%{gobuild_ldflags_shescaped} \ +VERSION=%{version} \ +GOPATH=%{gobuilddir} \ + bash -x ./hack/make.sh dynbinary %install -# install binary -install -Dpm 755 _build/bin/docker _build/bin/dockerd -t %{buildroot}%{_bindir}/ - -# install proxy -install -Dpm 755 _build/bin/docker-proxy -t %{buildroot}%{_libexecdir}/docker/ - -# install tini -install -Dpm 755 tini-%{commit_tini}/%{__cmake_builddir}/tini-static %{buildroot}%{_libexecdir}/docker/docker-init - -# install udev rules -install -Dpm 644 contrib/udev/80-docker.rules -t %{buildroot}%{_usr}/lib/udev/rules.d/ - -# add init scripts -install -Dpm 644 %{SOURCE3} contrib/init/systemd/docker.socket -t %{buildroot}%{_unitdir}/ - -# for additional args -install -Dpm 644 %{SOURCE4} %{buildroot}%{_sysconfdir}/sysconfig/docker - -# Install sysusers configuration -install -Dpm 0644 %{SOURCE5} %{buildroot}%{_sysusersdir}/moby-engine.conf - -# add bash, zsh, and fish completions -install -Dpm 644 cli-%{version}/contrib/completion/bash/docker -t %{buildroot}%{_datadir}/bash-completion/completions/ -install -Dpm 644 cli-%{version}/contrib/completion/zsh/_docker -t %{buildroot}%{_datadir}/zsh/site-functions/ -install -Dpm 644 cli-%{version}/contrib/completion/fish/docker.fish -t %{buildroot}%{_datadir}/fish/vendor_completions.d/ - -# install manpages -install -Dpm 644 cli-%{version}/man/man1/*.1 -t %{buildroot}%{_mandir}/man1/ -install -Dpm 644 cli-%{version}/man/man5/*.5 -t %{buildroot}%{_mandir}/man5/ -install -Dpm 644 cli-%{version}/man/man8/*.8 -t %{buildroot}%{_mandir}/man8/ - -# add nano files +# Install licenses +%go_vendor_license_install -c %{S:2} +# Install binaries +install -Dpm 0755 bundles/dynbinary*/* -t %{buildroot}%{_bindir} +# Install systemd configuration +install -Dpm 0644 contrib/init/systemd/* -t %{buildroot}%{_unitdir} +# Install sysusers config +install -Dpm 0644 moby-engine-systemd-sysusers.conf %{buildroot}%{_sysusersdir}/moby-engine.conf +# Install udev rules +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/ -for cli_file in LICENSE MAINTAINERS NOTICE README.md; do - cp "cli-%{version}/$cli_file" "cli-$cli_file" +# moby-filesystem +mkdir -p %{buildroot}%{_libexecdir}/docker +mkdir -p %{buildroot}%{_libexecdir}/docker/cli-plugins + +# moby-rpm-macros +install -Dpm 0644 macros.moby -t %{buildroot}%{_rpmmacrodir} + +%check +%go_vendor_license_check -c %{S:2} +%if %{with check} +# Manually skip specific tests +for test in \ + "TestSCTP4Proxy" \ + %dnl Failed to enter netns: operation not permitted + "TestIfaceAddrs" \ + %dnl failed to mount resolved path: operation not permitted + "TestJoinGoodSymlink" \ + "TestJoinWithSymlinkReplace" \ + "TestJoinCloseInvalidates" +do + awk -i inplace '/^func.*'"${test}"'\(/ { print; print "\tt.Skip(\"disabled failing test\")"; next}1' \ + $(grep -rl "${test}") done +export PATH="%{buildroot}%{_bindir}:${PATH}" +# graphdriver tests require extra permissions +# integration tests require a running docker daemon +# libnetwork tests cannot create netns in mock +# pkg/archive do not work in mock, either +%gocheck -t daemon/graphdriver -t integration -t libnetwork -d pkg/archive +%endif + %pre -%sysusers_create_compat %{SOURCE5} +%sysusers_create_compat %{S:3} %post %systemd_post docker.service docker.socket -%firewalld_reload %preun %systemd_preun docker.service docker.socket @@ -249,34 +180,27 @@ done %postun %systemd_postun_with_restart docker.service -%files -%license LICENSE cli-LICENSE -%doc AUTHORS CONTRIBUTING.md MAINTAINERS NOTICE README.md -%doc cli-MAINTAINERS cli-NOTICE cli-README.md -%config(noreplace) %{_sysconfdir}/sysconfig/docker -%{_bindir}/docker +%files -f %{go_vendor_license_filelist} +%license vendor/modules.txt +%doc README.md +%{_bindir}/docker-proxy %{_bindir}/dockerd -%dir %{_libexecdir}/docker/ -%{_libexecdir}/docker/docker-proxy -%{_libexecdir}/docker/docker-init -%{_usr}/lib/udev/rules.d/80-docker.rules +%{_sysusersdir}/moby-engine.conf +%{_udevrulesdir}/80-docker.rules %{_unitdir}/docker.service %{_unitdir}/docker.socket -%{_sysusersdir}/moby-engine.conf -%{_datadir}/bash-completion/completions/docker -%{_mandir}/man1/docker*.1* -%{_mandir}/man5/{Dockerfile,docker-config-json}.5* -%{_mandir}/man8/dockerd.8* - -%files zsh-completion -%{_datadir}/zsh/site-functions/_docker - -%files fish-completion -%{_datadir}/fish/vendor_completions.d/docker.fish %files nano -%dir %{_datadir}/nano +%license AUTHORS LICENSE NOTICE %{_datadir}/nano/Dockerfile.nanorc +%files -n moby-filesystem +%dir %{_libexecdir}/docker +%dir %{_libexecdir}/docker/cli-plugins + +%files -n moby-rpm-macros +%license LICENSE +%{_rpmmacrodir}/macros.moby + %changelog %autochangelog diff --git a/provides.spec.inc b/provides.spec.inc deleted file mode 100644 index 847f007..0000000 --- a/provides.spec.inc +++ /dev/null @@ -1,108 +0,0 @@ -# Bundled dependencies -Provides: bundled(tini-static) -Provides: bundled(golang(github.com/docker/docker)) -Provides: bundled(golang(github.com/docker/cli)) -# grep -v -e '^$' -e '^#' cli-24.0.5/vendor/github.com/docker/distribution/vendor.conf | sort | awk '{print "Provides: bundled(golang("$1")) = "$2}' -Provides: bundled(golang(github.com/aws/aws-sdk-go)) = f831d5a0822a1ad72420ab18c6269bca1ddaf490 -Provides: bundled(golang(github.com/Azure/azure-sdk-for-go)) = 4650843026a7fdec254a8d9cf893693a254edd0b -Provides: bundled(golang(github.com/Azure/go-autorest)) = eaa7994b2278094c904d31993d26f56324db3052 -Provides: bundled(golang(github.com/beorn7/perks)) = 4c0e84591b9aa9e6dcfdf3e020114cd81f89d5f9 -Provides: bundled(golang(github.com/bshuster-repo/logrus-logstash-hook)) = d2c0ecc1836d91814e15e23bb5dc309c3ef51f4a -Provides: bundled(golang(github.com/bugsnag/bugsnag-go)) = b1d153021fcd90ca3f080db36bec96dc690fb274 -Provides: bundled(golang(github.com/bugsnag/osext)) = 0dd3f918b21bec95ace9dc86c7e70266cfc5c702 -Provides: bundled(golang(github.com/bugsnag/panicwrap)) = e2c28503fcd0675329da73bf48b33404db873782 -Provides: bundled(golang(github.com/denverdino/aliyungo)) = afedced274aa9a7fcdd47ac97018f0f8db4e5de2 -Provides: bundled(golang(github.com/dgrijalva/jwt-go)) = 4bbdd8ac624fc7a9ef7aec841c43d99b5fe65a29 -Provides: bundled(golang(github.com/docker/go-metrics)) = 399ea8c73916000c64c2c76e8da00ca82f8387ab -Provides: bundled(golang(github.com/docker/libtrust)) = fa567046d9b14f6aa788882a950d69651d230b21 -Provides: bundled(golang(github.com/garyburd/redigo)) = 535138d7bcd717d6531c701ef5933d98b1866257 -Provides: bundled(golang(github.com/go-ini/ini)) = 2ba15ac2dc9cdf88c110ec2dc0ced7fa45f5678c -Provides: bundled(golang(github.com/golang/protobuf)) = 8d92cf5fc15a4382f8964b08e1f42a75c0591aa3 -Provides: bundled(golang(github.com/gorilla/handlers)) = 60c7bfde3e33c201519a200a4507a158cc03a17b -Provides: bundled(golang(github.com/gorilla/mux)) = 599cba5e7b6137d46ddf58fb1765f5d928e69604 -Provides: bundled(golang(github.com/inconshreveable/mousetrap)) = 76626ae9c91c4f2a10f34cad8ce83ea42c93bb75 -Provides: bundled(golang(github.com/jmespath/go-jmespath)) = bd40a432e4c76585ef6b72d3fd96fb9b6dc7b68d -Provides: bundled(golang(github.com/marstr/guid)) = 8bd9a64bf37eb297b492a4101fb28e80ac0b290f -Provides: bundled(golang(github.com/matttproud/golang_protobuf_extensions)) = c12348ce28de40eed0136aa2b644d0ee0650e56c -Provides: bundled(golang(github.com/miekg/dns)) = 271c58e0c14f552178ea321a545ff9af38930f39 -Provides: bundled(golang(github.com/mitchellh/mapstructure)) = 482a9fd5fa83e8c4e7817413b80f3eb8feec03ef -Provides: bundled(golang(github.com/ncw/swift)) = a0320860b16212c2b59b4912bb6508cda1d7cee6 -Provides: bundled(golang(github.com/opencontainers/go-digest)) = a6d0ee40d4207ea02364bd3b9e8e77b9159ba1eb -Provides: bundled(golang(github.com/opencontainers/image-spec)) = 67d2d5658fe0476ab9bf414cec164077ebff3920 -Provides: bundled(golang(github.com/prometheus/client_golang)) = c332b6f63c0658a65eca15c0e5247ded801cf564 -Provides: bundled(golang(github.com/prometheus/client_model)) = 99fa1f4be8e564e8a6b613da7fa6f46c9edafc6c -Provides: bundled(golang(github.com/prometheus/common)) = 89604d197083d4781071d3c65855d24ecfb0a563 -Provides: bundled(golang(github.com/prometheus/procfs)) = cb4147076ac75738c9a7d279075a253c0cc5acbd -Provides: bundled(golang(github.com/satori/go.uuid)) = f58768cc1a7a7e77a3bd49e98cdd21419399b6a3 -Provides: bundled(golang(github.com/Shopify/logrus-bugsnag)) = 577dee27f20dd8f1a529f82210094af593be12bd -Provides: bundled(golang(github.com/sirupsen/logrus)) = 3d4380f53a34dcdc95f0c1db702615992b38d9a4 -Provides: bundled(golang(github.com/spf13/cobra)) = 312092086bed4968099259622145a0c9ae280064 -Provides: bundled(golang(github.com/spf13/pflag)) = 5644820622454e71517561946e3d94b9f9db6842 -Provides: bundled(golang(github.com/xenolf/lego)) = a9d8cec0e6563575e5868a005359ac97911b5985 -Provides: bundled(golang(github.com/yvasiyarov/go-metrics)) = 57bccd1ccd43f94bb17fdd8bf3007059b802f85e -Provides: bundled(golang(github.com/yvasiyarov/gorelic)) = a9bba5b9ab508a086f9a12b8c51fab68478e2128 -Provides: bundled(golang(github.com/yvasiyarov/newrelic_platform_go)) = b21fdbd4370f3717f3bbd2bf41c223bc273068e6 -Provides: bundled(golang(golang.org/x/crypto)) = c10c31b5e94b6f7a0283272dc2bb27163dcea24b -Provides: bundled(golang(golang.org/x/net)) = 4876518f9e71663000c348837735820161a42df7 -Provides: bundled(golang(golang.org/x/oauth2)) = 045497edb6234273d67dbc25da3f2ddbc4c4cacf -Provides: bundled(golang(golang.org/x/time)) = a4bde12657593d5e90d0533a3e4fd95e635124cb -Provides: bundled(golang(google.golang.org/api)) = 9bf6e6e569ff057f75d9604a46c52928f17d2b54 -Provides: bundled(golang(google.golang.org/appengine)) = 12d5545dc1cfa6047a286d5e853841b6471f4c19 -Provides: bundled(golang(google.golang.org/cloud)) = 975617b05ea8a58727e6c1a06b6161ff4185a9f2 -Provides: bundled(golang(google.golang.org/grpc)) = d3ddb4469d5a1b949fc7a7da7c1d6a0d1b6de994 -Provides: bundled(golang(gopkg.in/check.v1)) = 64131543e7896d5bcc6bd5a76287eb75ea96c673 -Provides: bundled(golang(gopkg.in/square/go-jose.v1)) = 40d457b439244b546f023d056628e5184136899b -Provides: bundled(golang(gopkg.in/yaml.v2)) = v2.2.1 -Provides: bundled(golang(rsc.io/letsencrypt)) = e770c10b0f1a64775ae91d240407ce00d1a5bdeb -# grep -v -e '^$' -e '^#' moby-24.0.5/vendor/github.com/docker/distribution/vendor.conf | sort | awk '{print "Provides: bundled(golang("$1")) = "$2}' -Provides: bundled(golang(github.com/aws/aws-sdk-go)) = f831d5a0822a1ad72420ab18c6269bca1ddaf490 -Provides: bundled(golang(github.com/Azure/azure-sdk-for-go)) = 4650843026a7fdec254a8d9cf893693a254edd0b -Provides: bundled(golang(github.com/Azure/go-autorest)) = eaa7994b2278094c904d31993d26f56324db3052 -Provides: bundled(golang(github.com/beorn7/perks)) = 4c0e84591b9aa9e6dcfdf3e020114cd81f89d5f9 -Provides: bundled(golang(github.com/bshuster-repo/logrus-logstash-hook)) = d2c0ecc1836d91814e15e23bb5dc309c3ef51f4a -Provides: bundled(golang(github.com/bugsnag/bugsnag-go)) = b1d153021fcd90ca3f080db36bec96dc690fb274 -Provides: bundled(golang(github.com/bugsnag/osext)) = 0dd3f918b21bec95ace9dc86c7e70266cfc5c702 -Provides: bundled(golang(github.com/bugsnag/panicwrap)) = e2c28503fcd0675329da73bf48b33404db873782 -Provides: bundled(golang(github.com/denverdino/aliyungo)) = afedced274aa9a7fcdd47ac97018f0f8db4e5de2 -Provides: bundled(golang(github.com/dgrijalva/jwt-go)) = 4bbdd8ac624fc7a9ef7aec841c43d99b5fe65a29 -Provides: bundled(golang(github.com/docker/go-metrics)) = 399ea8c73916000c64c2c76e8da00ca82f8387ab -Provides: bundled(golang(github.com/docker/libtrust)) = fa567046d9b14f6aa788882a950d69651d230b21 -Provides: bundled(golang(github.com/garyburd/redigo)) = 535138d7bcd717d6531c701ef5933d98b1866257 -Provides: bundled(golang(github.com/go-ini/ini)) = 2ba15ac2dc9cdf88c110ec2dc0ced7fa45f5678c -Provides: bundled(golang(github.com/golang/protobuf)) = 8d92cf5fc15a4382f8964b08e1f42a75c0591aa3 -Provides: bundled(golang(github.com/gorilla/handlers)) = 60c7bfde3e33c201519a200a4507a158cc03a17b -Provides: bundled(golang(github.com/gorilla/mux)) = 599cba5e7b6137d46ddf58fb1765f5d928e69604 -Provides: bundled(golang(github.com/inconshreveable/mousetrap)) = 76626ae9c91c4f2a10f34cad8ce83ea42c93bb75 -Provides: bundled(golang(github.com/jmespath/go-jmespath)) = bd40a432e4c76585ef6b72d3fd96fb9b6dc7b68d -Provides: bundled(golang(github.com/marstr/guid)) = 8bd9a64bf37eb297b492a4101fb28e80ac0b290f -Provides: bundled(golang(github.com/matttproud/golang_protobuf_extensions)) = c12348ce28de40eed0136aa2b644d0ee0650e56c -Provides: bundled(golang(github.com/miekg/dns)) = 271c58e0c14f552178ea321a545ff9af38930f39 -Provides: bundled(golang(github.com/mitchellh/mapstructure)) = 482a9fd5fa83e8c4e7817413b80f3eb8feec03ef -Provides: bundled(golang(github.com/ncw/swift)) = a0320860b16212c2b59b4912bb6508cda1d7cee6 -Provides: bundled(golang(github.com/opencontainers/go-digest)) = a6d0ee40d4207ea02364bd3b9e8e77b9159ba1eb -Provides: bundled(golang(github.com/opencontainers/image-spec)) = 67d2d5658fe0476ab9bf414cec164077ebff3920 -Provides: bundled(golang(github.com/prometheus/client_golang)) = c332b6f63c0658a65eca15c0e5247ded801cf564 -Provides: bundled(golang(github.com/prometheus/client_model)) = 99fa1f4be8e564e8a6b613da7fa6f46c9edafc6c -Provides: bundled(golang(github.com/prometheus/common)) = 89604d197083d4781071d3c65855d24ecfb0a563 -Provides: bundled(golang(github.com/prometheus/procfs)) = cb4147076ac75738c9a7d279075a253c0cc5acbd -Provides: bundled(golang(github.com/satori/go.uuid)) = f58768cc1a7a7e77a3bd49e98cdd21419399b6a3 -Provides: bundled(golang(github.com/Shopify/logrus-bugsnag)) = 577dee27f20dd8f1a529f82210094af593be12bd -Provides: bundled(golang(github.com/sirupsen/logrus)) = 3d4380f53a34dcdc95f0c1db702615992b38d9a4 -Provides: bundled(golang(github.com/spf13/cobra)) = 312092086bed4968099259622145a0c9ae280064 -Provides: bundled(golang(github.com/spf13/pflag)) = 5644820622454e71517561946e3d94b9f9db6842 -Provides: bundled(golang(github.com/xenolf/lego)) = a9d8cec0e6563575e5868a005359ac97911b5985 -Provides: bundled(golang(github.com/yvasiyarov/go-metrics)) = 57bccd1ccd43f94bb17fdd8bf3007059b802f85e -Provides: bundled(golang(github.com/yvasiyarov/gorelic)) = a9bba5b9ab508a086f9a12b8c51fab68478e2128 -Provides: bundled(golang(github.com/yvasiyarov/newrelic_platform_go)) = b21fdbd4370f3717f3bbd2bf41c223bc273068e6 -Provides: bundled(golang(golang.org/x/crypto)) = c10c31b5e94b6f7a0283272dc2bb27163dcea24b -Provides: bundled(golang(golang.org/x/net)) = 4876518f9e71663000c348837735820161a42df7 -Provides: bundled(golang(golang.org/x/oauth2)) = 045497edb6234273d67dbc25da3f2ddbc4c4cacf -Provides: bundled(golang(golang.org/x/time)) = a4bde12657593d5e90d0533a3e4fd95e635124cb -Provides: bundled(golang(google.golang.org/api)) = 9bf6e6e569ff057f75d9604a46c52928f17d2b54 -Provides: bundled(golang(google.golang.org/appengine)) = 12d5545dc1cfa6047a286d5e853841b6471f4c19 -Provides: bundled(golang(google.golang.org/cloud)) = 975617b05ea8a58727e6c1a06b6161ff4185a9f2 -Provides: bundled(golang(google.golang.org/grpc)) = d3ddb4469d5a1b949fc7a7da7c1d6a0d1b6de994 -Provides: bundled(golang(gopkg.in/check.v1)) = 64131543e7896d5bcc6bd5a76287eb75ea96c673 -Provides: bundled(golang(gopkg.in/square/go-jose.v1)) = 40d457b439244b546f023d056628e5184136899b -Provides: bundled(golang(gopkg.in/yaml.v2)) = v2.2.1 -Provides: bundled(golang(rsc.io/letsencrypt)) = e770c10b0f1a64775ae91d240407ce00d1a5bdeb diff --git a/sources b/sources index 185f3bb..72ae186 100644 --- a/sources +++ b/sources @@ -1,3 +1,2 @@ -SHA512 (cli-24.0.5.tar.gz) = 765c67634d91d248b156d3e407398b98b7a0a89507bbac0310d4a68b95aa1a05e3af43c8b90bc10166748749d8cc36670619fc9efca110beefbdcd4385dc96be -SHA512 (moby-24.0.5.tar.gz) = cde2e47e7658b153399ee29154ec21eebf54b292185e07d43b968895dcfdfead95e4507fefb713859a4540f21d8007116d3ebeaa1fb7ba305fb2a0449ba1bee6 -SHA512 (tini-0b44d36.tar.gz) = 5294e877c369177b09c2a34f759e911f612f6977e960a63d46b6e5ebea790455dad972e91ca10c478693da637a5479d4e0b904efcfb5ae291e87e7e66674c752 +SHA512 (moby-26.0.0.tar.gz) = 8bdc8ed9f8f45a84d7eb4d877113d31cd65f9f821085e6da13a6ba08c9bf660be9d981dba59d089fa057fc8de73ccb335ff14fc24f7963bcc423ddffbfec06e5 +SHA512 (moby-26.0.0-vendor.tar.bz2) = ae964a076a41d4ed205d574a05a8cb6909ba1dd2b533963a05cc8f1eeb682d5c4c0bfa64f7230e63ce19efcd8e95b0a41f72f19c52bcda829f5b33649e96eb11 From b5ad539d487d1b3b5e6f8e0369f420c21637bf44 Mon Sep 17 00:00:00 2001 From: Maxwell G Date: Fri, 12 Apr 2024 21:49:35 +0000 Subject: [PATCH 101/163] Update to 26.0.1. --- .gitignore | 2 ++ moby-engine.spec | 2 +- sources | 4 ++-- 3 files changed, 5 insertions(+), 3 deletions(-) diff --git a/.gitignore b/.gitignore index cca4de0..1f42c45 100644 --- a/.gitignore +++ b/.gitignore @@ -59,3 +59,5 @@ moby-v20.10.10.tar.gz /moby-24.0.5.tar.gz /moby-26.0.0.tar.gz /moby-26.0.0-vendor.tar.bz2 +/moby-26.0.1.tar.gz +/moby-26.0.1-vendor.tar.bz2 diff --git a/moby-engine.spec b/moby-engine.spec index 717477f..280fa35 100644 --- a/moby-engine.spec +++ b/moby-engine.spec @@ -10,7 +10,7 @@ # https://github.com/moby/moby %global goipath github.com/docker/docker %global forgeurl https://github.com/moby/moby -Version: 26.0.0 +Version: 26.0.1 %gometa -L -f diff --git a/sources b/sources index 72ae186..6b59154 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -SHA512 (moby-26.0.0.tar.gz) = 8bdc8ed9f8f45a84d7eb4d877113d31cd65f9f821085e6da13a6ba08c9bf660be9d981dba59d089fa057fc8de73ccb335ff14fc24f7963bcc423ddffbfec06e5 -SHA512 (moby-26.0.0-vendor.tar.bz2) = ae964a076a41d4ed205d574a05a8cb6909ba1dd2b533963a05cc8f1eeb682d5c4c0bfa64f7230e63ce19efcd8e95b0a41f72f19c52bcda829f5b33649e96eb11 +SHA512 (moby-26.0.1.tar.gz) = 65ddc01539202d23924933235bcafc7c9144d408be02dde321f1dc3de125cb0d007d30dd11cf7011ef784422bc5df7fc2bd4e973466373d168c12c13f07a6b3d +SHA512 (moby-26.0.1-vendor.tar.bz2) = a235c017e96a096c4978fe806e4d766c433ca805b9c572a24ac0769c1c4e3229d61c724f4e3ad59ed2bdee4ddfc212449e9cb51e0ed02d36b2e83c1e5e0936c2 From dba714b7dddaf89818cc330376d4315734177fb2 Mon Sep 17 00:00:00 2001 From: Maxwell G Date: Sat, 13 Apr 2024 00:59:15 +0000 Subject: [PATCH 102/163] Re-enable i686 builds We cannot do this without also removing i686 from moby-engine's dependents. --- moby-engine.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/moby-engine.spec b/moby-engine.spec index 280fa35..52a6ba0 100644 --- a/moby-engine.spec +++ b/moby-engine.spec @@ -12,7 +12,7 @@ %global forgeurl https://github.com/moby/moby Version: 26.0.1 -%gometa -L -f +%gometa -L %global common_description %{expand: Docker is an open source project to build, ship and run any application as a From 475d7d05cd1efdd8017ef20f0c43c93540efb5a6 Mon Sep 17 00:00:00 2001 From: Maxwell G Date: Sat, 13 Apr 2024 01:03:54 +0000 Subject: [PATCH 103/163] go-vendor-tools: exclude dev scripts from license detection [skip changelog] --- go-vendor-tools.toml | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/go-vendor-tools.toml b/go-vendor-tools.toml index af903c2..15c1e80 100644 --- a/go-vendor-tools.toml +++ b/go-vendor-tools.toml @@ -1,5 +1,10 @@ [licensing] detector = "trivy" +exclude_files = [ + "vendor/go.opentelemetry.io/otel/get_main_pkgs.sh", + "vendor/go.opentelemetry.io/otel/verify_examples.sh", + "vendor/google.golang.org/grpc/regenerate.sh", +] [[licensing.licenses]] path = "vendor/github.com/google/shlex/COPYING" From d78e1865d803ed41db0d6942769007e29282f284 Mon Sep 17 00:00:00 2001 From: Maxwell G Date: Sat, 13 Apr 2024 00:12:41 +0000 Subject: [PATCH 104/163] Remove -filesystem and -rpm-macros subpackages These are moving to a separate component to avoid a circular dependency. [skip changelog] --- macros.moby | 4 ---- moby-engine.spec | 34 ++-------------------------------- 2 files changed, 2 insertions(+), 36 deletions(-) delete mode 100644 macros.moby diff --git a/macros.moby b/macros.moby deleted file mode 100644 index 4a7ae04..0000000 --- a/macros.moby +++ /dev/null @@ -1,4 +0,0 @@ -# SPDX-FileCopyrightText: 2024 Maxwell G -# SPDX-License-Identifier: Apache-2.0 - -%moby_cli_plugins_dir %{_libexecdir}/docker/cli-plugins diff --git a/moby-engine.spec b/moby-engine.spec index 52a6ba0..028bc48 100644 --- a/moby-engine.spec +++ b/moby-engine.spec @@ -38,7 +38,6 @@ Source0: %{gosource} Source1: %{archivename}-vendor.tar.bz2 Source2: go-vendor-tools.toml Source3: moby-engine-systemd-sysusers.conf -Source4: macros.moby Patch: 0001-systemd-adjust-docker.service-for-downstream.patch @@ -53,7 +52,7 @@ Requires: containerd # The docker CLI is provided as a separate package to ease maintenace and avoid # overcomplicating the specfile Requires: docker-cli >= %{version} -Requires: moby-filesystem = %{?epoch:%{epoch}:}%{version}-%{release} +Requires: moby-filesystem # tini-static is used as the docker-init binary Requires: tini-static @@ -85,26 +84,12 @@ Supplements: moby-engine %description nano %{common_description} This package installs %{summary}. -%package -n moby-filesystem -Summary: Filesystem package for docker cli plugins and other directories -BuildArch: noarch -License: LicenseRef-Not-Copyrightable - -%description -n moby-filesystem %{common_description} -%{summary}. - -%package -n moby-rpm-macros -Summary: RPM Macros for packaging moby plugins -BuildArch: noarch - -%description -n moby-rpm-macros %{common_description} -%{summary}. %prep %goprep -A %setup -q -T -D -a1 %{forgesetupargs} %autopatch -p1 -cp -p %{S:3} %{S:4} . +cp -p %{S:3} . %generate_buildrequires %go_vendor_license_buildrequires -c %{S:2} @@ -136,13 +121,6 @@ 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/ -# moby-filesystem -mkdir -p %{buildroot}%{_libexecdir}/docker -mkdir -p %{buildroot}%{_libexecdir}/docker/cli-plugins - -# moby-rpm-macros -install -Dpm 0644 macros.moby -t %{buildroot}%{_rpmmacrodir} - %check %go_vendor_license_check -c %{S:2} %if %{with check} @@ -194,13 +172,5 @@ export PATH="%{buildroot}%{_bindir}:${PATH}" %license AUTHORS LICENSE NOTICE %{_datadir}/nano/Dockerfile.nanorc -%files -n moby-filesystem -%dir %{_libexecdir}/docker -%dir %{_libexecdir}/docker/cli-plugins - -%files -n moby-rpm-macros -%license LICENSE -%{_rpmmacrodir}/macros.moby - %changelog %autochangelog From 88df40029bc346fcc66ceb27e215f4bdac24427d Mon Sep 17 00:00:00 2001 From: Maxwell G Date: Sat, 13 Apr 2024 22:45:12 +0000 Subject: [PATCH 105/163] Set CGO_CFLAGS and CGO_LDFLAGS [skip changelog] --- moby-engine.spec | 2 ++ 1 file changed, 2 insertions(+) diff --git a/moby-engine.spec b/moby-engine.spec index 028bc48..4101ab9 100644 --- a/moby-engine.spec +++ b/moby-engine.spec @@ -98,6 +98,8 @@ cp -p %{S:3} . GO_LDFLAGS="" GO_BUILDTAGS="" # DOCKER_DEBUG: Ensure that all debuginfo is preserved BUILDFLAGS="%{gocompilerflags} -a -v -x" \ +CGO_CFLAGS="%{build_cflags}" \ +CGO_LDFLAGS="%{build_ldflags}" \ DOCKER_BUILDTAGS="rpm_crashback journald" \ DOCKER_GITCOMMIT=%{release} \ DOCKER_DEBUG=1 \ From c64b093abb8095c63a33f406c4c3a1b82c5eff70 Mon Sep 17 00:00:00 2001 From: Maxwell G Date: Tue, 23 Apr 2024 22:15:25 +0000 Subject: [PATCH 106/163] Update to 26.1.0. --- .gitignore | 2 ++ moby-engine.spec | 2 +- sources | 4 ++-- 3 files changed, 5 insertions(+), 3 deletions(-) diff --git a/.gitignore b/.gitignore index 1f42c45..3ae3565 100644 --- a/.gitignore +++ b/.gitignore @@ -61,3 +61,5 @@ moby-v20.10.10.tar.gz /moby-26.0.0-vendor.tar.bz2 /moby-26.0.1.tar.gz /moby-26.0.1-vendor.tar.bz2 +/moby-26.1.0.tar.gz +/moby-26.1.0-vendor.tar.bz2 diff --git a/moby-engine.spec b/moby-engine.spec index 4101ab9..9ff7cb2 100644 --- a/moby-engine.spec +++ b/moby-engine.spec @@ -10,7 +10,7 @@ # https://github.com/moby/moby %global goipath github.com/docker/docker %global forgeurl https://github.com/moby/moby -Version: 26.0.1 +Version: 26.1.0 %gometa -L diff --git a/sources b/sources index 6b59154..f37f131 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -SHA512 (moby-26.0.1.tar.gz) = 65ddc01539202d23924933235bcafc7c9144d408be02dde321f1dc3de125cb0d007d30dd11cf7011ef784422bc5df7fc2bd4e973466373d168c12c13f07a6b3d -SHA512 (moby-26.0.1-vendor.tar.bz2) = a235c017e96a096c4978fe806e4d766c433ca805b9c572a24ac0769c1c4e3229d61c724f4e3ad59ed2bdee4ddfc212449e9cb51e0ed02d36b2e83c1e5e0936c2 +SHA512 (moby-26.1.0.tar.gz) = 47b6b9af9947016884614b6bc25977e1db281da95c9b8b34c753c21c664a737a893f9fa65d92cbb897735aae3893567e106e6bababb5507e069b1e0981e48d50 +SHA512 (moby-26.1.0-vendor.tar.bz2) = d63e405231ca00c5a1ddd7d904991864a696ee5b6e4e2de4e5cf0f52c444f8e13b2d99f69fcea0b4e199bdbcc1cc66dc83736435d5042856cd7d97889217d85d From cf111aa8683aa0cc753dab5dfaf48a4ca61fc181 Mon Sep 17 00:00:00 2001 From: Maxwell G Date: Fri, 14 Jun 2024 13:46:40 -0500 Subject: [PATCH 107/163] Update to 26.1.4. --- .gitignore | 2 ++ moby-engine.spec | 2 +- sources | 4 ++-- 3 files changed, 5 insertions(+), 3 deletions(-) diff --git a/.gitignore b/.gitignore index 3ae3565..363e161 100644 --- a/.gitignore +++ b/.gitignore @@ -63,3 +63,5 @@ moby-v20.10.10.tar.gz /moby-26.0.1-vendor.tar.bz2 /moby-26.1.0.tar.gz /moby-26.1.0-vendor.tar.bz2 +/moby-26.1.4.tar.gz +/moby-26.1.4-vendor.tar.bz2 diff --git a/moby-engine.spec b/moby-engine.spec index 9ff7cb2..35d3419 100644 --- a/moby-engine.spec +++ b/moby-engine.spec @@ -10,7 +10,7 @@ # https://github.com/moby/moby %global goipath github.com/docker/docker %global forgeurl https://github.com/moby/moby -Version: 26.1.0 +Version: 26.1.4 %gometa -L diff --git a/sources b/sources index f37f131..465f41f 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -SHA512 (moby-26.1.0.tar.gz) = 47b6b9af9947016884614b6bc25977e1db281da95c9b8b34c753c21c664a737a893f9fa65d92cbb897735aae3893567e106e6bababb5507e069b1e0981e48d50 -SHA512 (moby-26.1.0-vendor.tar.bz2) = d63e405231ca00c5a1ddd7d904991864a696ee5b6e4e2de4e5cf0f52c444f8e13b2d99f69fcea0b4e199bdbcc1cc66dc83736435d5042856cd7d97889217d85d +SHA512 (moby-26.1.4.tar.gz) = ef26e47fb45c6a641f6e3620d9449f9c3c55d3712b74de647978609b6d3500d02273b00bb8b8346589301ca8b90d4c7dc228f6c3f275e0e3936ae3680e7d5c3d +SHA512 (moby-26.1.4-vendor.tar.bz2) = 0959119d4cfe50a29bb94b5879987f13bbbd40c346a16434b2c30d7e7db4a3842dfb5f2d4ef2167ca93e6bed7870c91ed143b0b07fe6416d56120386b854a4c9 From 5123903a7199dcb82140704a7e843042401ed21d Mon Sep 17 00:00:00 2001 From: Maxwell G Date: Wed, 31 Jul 2024 23:34:15 -0500 Subject: [PATCH 108/163] Update to 27.1.1. - Merge docker-cli and moby-packaging into a single source package --- .gitignore | 8 + ...st-generate-man-for-Fedora-build-env.patch | 62 +++++ LICENSE.macros | 10 + cli_go-vendor-tools.toml | 23 ++ ...-tools.toml => engine_go-vendor-tools.toml | 0 macros.moby | 5 + mkvendor.sh | 22 ++ moby-engine.spec | 252 +++++++++++++++--- sources | 6 +- update.sh | 44 --- 10 files changed, 355 insertions(+), 77 deletions(-) create mode 100644 0001-scripts-adjust-generate-man-for-Fedora-build-env.patch create mode 100644 LICENSE.macros create mode 100644 cli_go-vendor-tools.toml rename go-vendor-tools.toml => engine_go-vendor-tools.toml (100%) create mode 100644 macros.moby create mode 100755 mkvendor.sh delete mode 100755 update.sh diff --git a/.gitignore b/.gitignore index 363e161..8b064f9 100644 --- a/.gitignore +++ b/.gitignore @@ -1,3 +1,7 @@ +# Ignore unpacked source directories +/moby-*/ +/cli-*/ + /2d0083d657f82c47044c8d3948ba434b622fe2fd.tar.gz /425e105d5a03fabd737a126ad93d62a9eeede87f.tar.gz /894b81a4b802e4eb2a91d1ce216b8817763c29fb.tar.gz @@ -65,3 +69,7 @@ moby-v20.10.10.tar.gz /moby-26.1.0-vendor.tar.bz2 /moby-26.1.4.tar.gz /moby-26.1.4-vendor.tar.bz2 +/moby-27.1.1.tar.gz +/cli-27.1.1.tar.gz +/moby-27.1.1-vendor.tar.bz2 +/cli-27.1.1-vendor.tar.bz2 diff --git a/0001-scripts-adjust-generate-man-for-Fedora-build-env.patch b/0001-scripts-adjust-generate-man-for-Fedora-build-env.patch new file mode 100644 index 0000000..216327a --- /dev/null +++ b/0001-scripts-adjust-generate-man-for-Fedora-build-env.patch @@ -0,0 +1,62 @@ +From d51def98a5f42620275c3e45eca98b4d07f8786c Mon Sep 17 00:00:00 2001 +From: Maxwell G +Date: Fri, 15 Mar 2024 20:24:28 +0000 +Subject: [PATCH] scripts: adjust generate-man for Fedora build env + +--- + scripts/docs/generate-man.sh | 31 +++++-------------------------- + 1 file changed, 5 insertions(+), 26 deletions(-) + +diff --git a/scripts/docs/generate-man.sh b/scripts/docs/generate-man.sh +index 12a4b81..d4798ce 100755 +--- a/scripts/docs/generate-man.sh ++++ b/scripts/docs/generate-man.sh +@@ -6,33 +6,12 @@ set -eu + + export GO111MODULE=auto + +-function clean { +- rm -rf "$buildir" +-} +- +-buildir=$(mktemp -d -t docker-cli-docsgen.XXXXXXXXXX) +-trap clean EXIT +- +-( +- set -x +- cp -r . "$buildir/" +- cd "$buildir" +- # init dummy go.mod +- ./scripts/vendor init +- # install go-md2man and copy man/tools.go in root folder +- # to be able to fetch the required dependencies +- go mod edit -modfile=vendor.mod -require=github.com/cpuguy83/go-md2man/v2@${MD2MAN_VERSION} +- cp man/tools.go . +- # update vendor +- ./scripts/vendor update +- # build gen-manpages +- go build -mod=vendor -modfile=vendor.mod -tags manpages -o /tmp/gen-manpages ./man/generate.go +- # build go-md2man +- go build -mod=vendor -modfile=vendor.mod -o /tmp/go-md2man ./vendor/github.com/cpuguy83/go-md2man/v2 +-) ++# Remove dummy go.mod. ++rm -f man/go.mod ++go build -tags manpages -o gen-manpages ./man/generate.go + + mkdir -p man/man1 +-(set -x ; /tmp/gen-manpages --root "." --target "$(pwd)/man/man1") ++(set -x ; ./gen-manpages --root "." --target "$(pwd)/man/man1") + + ( + cd man +@@ -45,6 +24,6 @@ mkdir -p man/man1 + continue + fi + mkdir -p "./man${num}" +- (set -x ; /tmp/go-md2man -in "$FILE" -out "./man${num}/${name}") ++ (set -x ; go-md2man -in "$FILE" -out "./man${num}/${name}") + done + ) +-- +2.44.0 + diff --git a/LICENSE.macros b/LICENSE.macros new file mode 100644 index 0000000..764ec97 --- /dev/null +++ b/LICENSE.macros @@ -0,0 +1,10 @@ +MIT License + +Copyright (C) 2024 Maxwell G +Copyright (C) Fedora Project Authors + +Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions: + +The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. + +THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. diff --git a/cli_go-vendor-tools.toml b/cli_go-vendor-tools.toml new file mode 100644 index 0000000..8b00d77 --- /dev/null +++ b/cli_go-vendor-tools.toml @@ -0,0 +1,23 @@ +[licensing] +detector = "trivy" +exclude_files = [ + "vendor/go.opentelemetry.io/otel/get_main_pkgs.sh", + "vendor/go.opentelemetry.io/otel/verify_examples.sh", + "vendor/google.golang.org/grpc/regenerate.sh", +] + +[[licensing.licenses]] +path = "vendor/github.com/google/shlex/COPYING" +sha256sum = "cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30" +expression = "Apache-2.0" + +[archive] +pre_commands = [ + # Remove dummy go.mod so the docs dependencies are included in the vendor + # tarball + ["rm", "man/go.mod"], + # This project has a setup where go.mod and go.sum are not always present. + # We write those files manually. + ["cp", "-p", "vendor.mod", "go.mod"], + ["cp", "-p", "vendor.sum", "go.sum"], +] diff --git a/go-vendor-tools.toml b/engine_go-vendor-tools.toml similarity index 100% rename from go-vendor-tools.toml rename to engine_go-vendor-tools.toml diff --git a/macros.moby b/macros.moby new file mode 100644 index 0000000..4488433 --- /dev/null +++ b/macros.moby @@ -0,0 +1,5 @@ +# Copyright (C) 2024 Maxwell G +# Copyright (C) Fedora Project Authors +# SPDX-License-Identifier: MIT + +%moby_cli_plugins_dir %{_libexecdir}/docker/cli-plugins diff --git a/mkvendor.sh b/mkvendor.sh new file mode 100755 index 0000000..98396d5 --- /dev/null +++ b/mkvendor.sh @@ -0,0 +1,22 @@ +#!/bin/bash +# Copyright (C) 2024 Maxwell G +# SPDX-License-Identifier: MIT +set -euo pipefail + +# Source0: %{gosource0} +# Source1: %{gosource1} +# Source2: %{archivename0}-vendor.tar.bz2 +# Source3: %{archivename1}-vendor.tar.bz2 + +sources=() +while read -r source; do + filename="$(awk '{print $2}' <<< "${source}" | awk -F '/' '{print $NF}')" + sources+=( "${filename}" ) +done < <(spectool --sources ./*.spec) + +set -x +go_vendor_archive create --config ./engine_go-vendor-tools.toml --idempotent \ + --output "${sources[2]}" "${sources[0]}" + +go_vendor_archive create --config ./cli_go-vendor-tools.toml --idempotent \ + --output "${sources[3]}" "${sources[1]}" diff --git a/moby-engine.spec b/moby-engine.spec index 35d3419..9846b9b 100644 --- a/moby-engine.spec +++ b/moby-engine.spec @@ -10,9 +10,15 @@ # https://github.com/moby/moby %global goipath github.com/docker/docker %global forgeurl https://github.com/moby/moby -Version: 26.1.4 +%global version0 27.1.1 -%gometa -L +# https://github.com/docker/cli +%global goipath1 github.com/docker/cli +%global version1 %{version0} + +%gometa -L -a -f +%global engine_dir ../%{topdir0} +%global cli_dir ../%{topdir1} %global common_description %{expand: Docker is an open source project to build, ship and run any application as a @@ -27,32 +33,46 @@ depending on a particular stack or provider. } Name: moby-engine +Version: %{forgeversion} Release: %autorelease Summary: The open-source application container engine # Generated with go-vendor-tools License: Apache-2.0 AND BSD-2-Clause AND BSD-3-Clause AND ISC AND MIT AND MPL-2.0 AND (Apache-2.0 OR GPL-2.0-or-later) URL: %{gourl} -Source0: %{gosource} -# Generated with go-vendor-tools -Source1: %{archivename}-vendor.tar.bz2 -Source2: go-vendor-tools.toml -Source3: moby-engine-systemd-sysusers.conf +Source0: %{gosource0} +Source1: %{gosource1} +# We create our own vendor tarballs instead of using the built-in directoies. +# This allows us to include the manpage build dependencies for docker-cli +# and make any of our own changes to the deps included as necessary. +Source2: %{archivename0}-vendor.tar.bz2 +Source3: %{archivename1}-vendor.tar.bz2 -Patch: 0001-systemd-adjust-docker.service-for-downstream.patch +Source100: moby-engine-systemd-sysusers.conf +Source101: macros.moby +Source102: LICENSE.macros + +Source200: engine_go-vendor-tools.toml +Source201: cli_go-vendor-tools.toml + +Patch0: 0001-systemd-adjust-docker.service-for-downstream.patch + +Patch1000: 0001-scripts-adjust-generate-man-for-Fedora-build-env.patch BuildRequires: git-core BuildRequires: go-vendor-tools BuildRequires: make BuildRequires: pkg-config BuildRequires: systemd-devel +BuildRequires: /usr/bin/go-md2man + # docker.service depends on containerd Requires: containerd -# The docker CLI is provided as a separate package to ease maintenace and avoid -# overcomplicating the specfile -Requires: docker-cli >= %{version} -Requires: moby-filesystem +# The docker CLI is provided as a separate package +Requires: docker-cli = %{version}-%{release} +# moby-filesystem owns the libexecdir/docker directory +Requires: moby-filesystem = %{version}-%{release} # tini-static is used as the docker-init binary Requires: tini-static @@ -77,7 +97,6 @@ Conflicts: docker-ee %package nano Summary: GNU nano syntax highlighting files for Moby BuildArch: noarch -Requires: %{name} = %{version}-%{release} Requires: nano Supplements: moby-engine @@ -85,17 +104,96 @@ Supplements: moby-engine This package installs %{summary}. +# We name this package docker-cli, as that's the name of the upstream project. +# moby-engine is github.com/moby/moby. +%package -n docker-cli +Version: %{forgeversion -z1} +Summary: The Docker CLI +# Generated with go-vendor-tools +%global cli_license Apache-2.0 AND BSD-2-Clause AND BSD-3-Clause AND MIT +License: %{cli_license} +Requires: moby-filesystem = %{version}-%{release} +# Recommend main moby-engine package with the docker daemon +# We don't use a strict dependency, as it's possible to use the docker CLI with +# a different host. +Recommends: moby-engine +# docker buildx is the new supported way to run builds; docker build is deprecated. +Recommends: docker-buildx + +# Conflict with older moby-engine versions +Conflicts: moby-engine < %{version}-%{release} +Conflicts: moby-engine > %{version}-%{release} + +# Conflict with upstream packages +Conflicts: docker-ce-cli +Conflicts: docker-ee-cli +# Conflict with podman-docker that also contains /usr/bin/docker +Conflicts: podman-docker + +# Obsolete old separate shell completions packages +Obsoletes: moby-engine-fish-completion < 24.0.5-6 +Obsoletes: moby-engine-zsh-completion < 24.0.5-6 + +%description -n docker-cli %{common_description} + +This package provides the Docker CLI. + + +%package -n moby-filesystem +Summary: Filesystem package for the Moby/Docker stack +License: LicenseRef-Not-Copyrightable + +%description -n moby-filesystem %{common_description} + +This is the filesystem subpackage for the Moby/Docker stack. + + +%package -n moby-rpm-macros +Summary: RPM Macros for the Moby/Docker stack +License: MIT + +%description -n moby-rpm-macros %{common_description} + +This package provides RPM macros for the Moby/Docker stack. + + %prep -%goprep -A -%setup -q -T -D -a1 %{forgesetupargs} -%autopatch -p1 -cp -p %{S:3} . +%goprep -a -A + +# moby-engine +cd %{_builddir}/%{extractdir0} +# Unpack vendor archive +%__rpmuncompress -x %{S:2} +# Apply patches 0-1000 +%autopatch -M999 -p1 +cp -p %{S:100} %{S:101} %{S:102} . +# See comment in go-vendor-tools.toml +cp go.mod vendor.mod +cp go.sum vendor.sum + +# docker-cli +cd %{cli_dir} +# Unpack vendor archive +%__rpmuncompress -x %{S:3} +# Apply patches 1000+. +%autopatch -m1000 -p1 +# See comment in go-vendor-tools.toml +cp go.mod vendor.mod +cp go.sum vendor.sum +rm -f man/go.mod + %generate_buildrequires -%go_vendor_license_buildrequires -c %{S:2} +# moby-engine +%go_vendor_license_buildrequires -c %{S:200} +# docker-cli +%go_vendor_license_buildrequires -c %{S:201} %build GO_LDFLAGS="" GO_BUILDTAGS="" + +# moby-engine +cd %{engine_dir} # DOCKER_DEBUG: Ensure that all debuginfo is preserved BUILDFLAGS="%{gocompilerflags} -a -v -x" \ CGO_CFLAGS="%{build_cflags}" \ @@ -109,9 +207,21 @@ VERSION=%{version} \ GOPATH=%{gobuilddir} \ bash -x ./hack/make.sh dynbinary +# docker-cli +cd %{cli_dir} +%make_build dynbinary \ + DISABLE_WARN_OUTSIDE_CONTAINER=1 \ + GITCOMMIT=%{release} \ + GO_BUILDTAGS="rpm_crashback" \ + GO_LDFLAGS=%{gobuild_ldflags_shescaped} \ + VERSION=%{version} \ +dynbinary manpages + %install +# moby-engine +cd %{engine_dir} # Install licenses -%go_vendor_license_install -c %{S:2} +%go_vendor_license_install -c %{S:200} # Install binaries install -Dpm 0755 bundles/dynbinary*/* -t %{buildroot}%{_bindir} # Install systemd configuration @@ -123,11 +233,51 @@ 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/ +# docker-cli +cd %{cli_dir} +# Install licenses +%go_vendor_license_install -c %{S:201} +# Install docker-cli +install -Dpm 0755 build/docker -t %{buildroot}%{_bindir} +# Install shell completions +install -Dpm 644 contrib/completion/bash/docker -t %{buildroot}%{bash_completions_dir} +install -Dpm 644 contrib/completion/zsh/_docker -t %{buildroot}%{zsh_completions_dir} +install -Dpm 644 contrib/completion/fish/docker.fish -t %{buildroot}%{fish_completions_dir} +# 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 +mkdir -p %{buildroot}%{_libexecdir}/docker +mkdir %{buildroot}%{_libexecdir}/docker/cli-plugins + +# moby-rpm-macros +install -Dpm 0644 macros.moby -t %{buildroot}%{_rpmmacrodir} + %check -%go_vendor_license_check -c %{S:2} +skiptest() { + for test in "$@"; do + awk -i inplace '/^func.*'"${test}"'\(/ { print; print "\tt.Skip(\"disabled failing test\")"; next}1' \ + $(grep -rl "${test}") + done +} +export PATH="%{buildroot}%{_bindir}:${PATH}" TZ=utc + +# moby-engine +cd %{engine_dir} +%go_vendor_license_check -c %{S:200} + +# docker-cli +cd %{cli_dir} +%go_vendor_license_check -c %{S:201} %{cli_license} + %if %{with check} +# moby-engine +cd %{engine_dir} # Manually skip specific tests -for test in \ +skiptest \ "TestSCTP4Proxy" \ %dnl Failed to enter netns: operation not permitted "TestIfaceAddrs" \ @@ -135,34 +285,48 @@ for test in \ "TestJoinGoodSymlink" \ "TestJoinWithSymlinkReplace" \ "TestJoinCloseInvalidates" -do - awk -i inplace '/^func.*'"${test}"'\(/ { print; print "\tt.Skip(\"disabled failing test\")"; next}1' \ - $(grep -rl "${test}") -done -export PATH="%{buildroot}%{_bindir}:${PATH}" # graphdriver tests require extra permissions # integration tests require a running docker daemon # libnetwork tests cannot create netns in mock # pkg/archive do not work in mock, either +# daemon/graphdriver/fuse-overlayfs tests fail with permission errors %gocheck -t daemon/graphdriver -t integration -t libnetwork -d pkg/archive + +# docker-cli +cd %{cli_dir} +skiptest \ + "TestInitializeFromClientHangs" \ + %dnl Needs network + "TestRunBuildFromGitHubSpecialCase" \ + %dnl Test is flaky + "TestConnectAndWait" \ + %dnl Test panics + "TestRunAttachTermination" + +%gocheck -z1 -t e2e %endif + %pre -%sysusers_create_compat %{S:3} +%sysusers_create_compat %{S:100} + %post %systemd_post docker.service docker.socket + %preun %systemd_preun docker.service docker.socket + %postun %systemd_postun_with_restart docker.service -%files -f %{go_vendor_license_filelist} -%license vendor/modules.txt -%doc README.md + +%files -f %{engine_dir}/%{go_vendor_license_filelist} +%license %{engine_dir}/vendor/modules.txt +%doc %{engine_dir}/README.md %{_bindir}/docker-proxy %{_bindir}/dockerd %{_sysusersdir}/moby-engine.conf @@ -170,9 +334,35 @@ export PATH="%{buildroot}%{_bindir}:${PATH}" %{_unitdir}/docker.service %{_unitdir}/docker.socket + %files nano -%license AUTHORS LICENSE NOTICE +%license %{engine_dir}/AUTHORS +%license %{engine_dir}/LICENSE +%license %{engine_dir}/NOTICE %{_datadir}/nano/Dockerfile.nanorc + +%files -n docker-cli -f %{cli_dir}/%{go_vendor_license_filelist} +%license %{cli_dir}/vendor/modules.txt +%doc %{cli_dir}/README.md +%{_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 + + +%files -n moby-filesystem +%dir %{_libexecdir}/docker +%dir %{_libexecdir}/docker/cli-plugins + + +%files -n moby-rpm-macros +%license %{engine_dir}/LICENSE.macros +%{_rpmmacrodir}/macros.moby + + %changelog %autochangelog diff --git a/sources b/sources index 465f41f..58513a8 100644 --- a/sources +++ b/sources @@ -1,2 +1,4 @@ -SHA512 (moby-26.1.4.tar.gz) = ef26e47fb45c6a641f6e3620d9449f9c3c55d3712b74de647978609b6d3500d02273b00bb8b8346589301ca8b90d4c7dc228f6c3f275e0e3936ae3680e7d5c3d -SHA512 (moby-26.1.4-vendor.tar.bz2) = 0959119d4cfe50a29bb94b5879987f13bbbd40c346a16434b2c30d7e7db4a3842dfb5f2d4ef2167ca93e6bed7870c91ed143b0b07fe6416d56120386b854a4c9 +SHA512 (moby-27.1.1.tar.gz) = 59a7771d80c2d48344f87356991f95d59978977ceab0ae6f4d2ca725e173bce3efa11acbbf7a2beed714df7ccf64bee5b7ecc56538b87e7dc730520fe9faf0f3 +SHA512 (cli-27.1.1.tar.gz) = 18fc3ef3c6fe22d8eb18ebbf58b912eb366fa96862db3737054a24bed0f47b15bb5c966241d271ac99cc319e2cca875c76b92fe14aeea4c84e5247384d370621 +SHA512 (moby-27.1.1-vendor.tar.bz2) = 0c01d80b04547d7a34164fc6a357e8874602d4c5a4476ddaa8a0f7271e544502be2e803ebd9440afe55b952dd7b86ee9b9126a46a54a7d3f01d3a58d51abf11c +SHA512 (cli-27.1.1-vendor.tar.bz2) = 58a9a6d868231f07e5b9e8bc85cda755989dbf92068d256969438977fbe3e26137023d8576d89428d1944606621872bb1128c88820a06914d557ac25656c2354 diff --git a/update.sh b/update.sh deleted file mode 100755 index 3089ca4..0000000 --- a/update.sh +++ /dev/null @@ -1,44 +0,0 @@ -#!/usr/bin/env bash -# SPDX-FileCopyrightText: 2022 Maxwell G (@gotmax23) -# SPDX-License-Identifier: MIT - -# USAGE: After bumping the version in moby-engine.spec and downloading the new -# sources, run this script in moby-engine's distgit repository to update the -# package's virtual Provides. - -set -euo pipefail - -# Note(gotmax23): I have a separate update.sh script in my $PATH. -# When that exists, this script will run that first. -# You can ignore this. -if command -v update.sh && [ "$#" -gt 0 ]; then - update.sh "$@" -fi - -spectool -g moby-engine.spec --define "_sourcedir ." -fedpkg prep - -version="$(rpmspec -D '_sourcedir %(pwd)' -q --srpm --qf '%{version}\n' *.spec)" - -cat << EOF > provides.spec.inc -# Bundled dependencies -Provides: bundled(tini-static) -Provides: bundled(golang(github.com/docker/docker)) -Provides: bundled(golang(github.com/docker/cli)) -# grep -v -e '^$' -e '^#' cli-${version}/vendor/github.com/docker/distribution/vendor.conf | sort | awk '{print "Provides: bundled(golang("\$1")) = "\$2}' -EOF - -grep -v -e '^$' -e '^#' "moby-${version}/cli-${version}/vendor/github.com/docker/distribution/vendor.conf" | sort | awk '{print "Provides: bundled(golang("$1")) = "$2}' >> provides.spec.inc - -cat << EOF >> provides.spec.inc -# grep -v -e '^$' -e '^#' moby-${version}/vendor/github.com/docker/distribution/vendor.conf | sort | awk '{print "Provides: bundled(golang("\$1")) = "\$2}' -EOF - -grep -v -e '^$' -e '^#' "moby-${version}/vendor/github.com/docker/distribution/vendor.conf" | sort | awk '{print "Provides: bundled(golang("$1")) = "$2}' >> provides.spec.inc - -# Note(gotmax23): Ignore this also. My script commits the specfile, -# and then this ammends that commit to add the updated provides.spec.inc. -if command -v update.sh && [ "$#" -gt 0 ]; then - git add provides.spec.inc - git commit --gpg-sign --amend --no-edit -fi From 26f88e332b01d16b62e5b08f37c3baa74f89c541 Mon Sep 17 00:00:00 2001 From: Maxwell G Date: Fri, 2 Aug 2024 11:29:27 -0500 Subject: [PATCH 109/163] Always set CGO_ENABLED=1. --- moby-engine.spec | 1 + 1 file changed, 1 insertion(+) diff --git a/moby-engine.spec b/moby-engine.spec index 9846b9b..674eb05 100644 --- a/moby-engine.spec +++ b/moby-engine.spec @@ -191,6 +191,7 @@ rm -f man/go.mod %build GO_LDFLAGS="" GO_BUILDTAGS="" +export CGO_ENABLED=1 # moby-engine cd %{engine_dir} From 4e92ce38a7c8a3a52d5c10215c141b04226d00d8 Mon Sep 17 00:00:00 2001 From: Maxwell G Date: Fri, 2 Aug 2024 11:53:47 -0500 Subject: [PATCH 110/163] Handle s390x test failures --- moby-engine.spec | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/moby-engine.spec b/moby-engine.spec index 674eb05..dd2ec1d 100644 --- a/moby-engine.spec +++ b/moby-engine.spec @@ -285,7 +285,11 @@ skiptest \ %dnl failed to mount resolved path: operation not permitted "TestJoinGoodSymlink" \ "TestJoinWithSymlinkReplace" \ - "TestJoinCloseInvalidates" + "TestJoinCloseInvalidates" \ + %ifarch s390x + %dnl Test timeout + "TestCloseRunningCommand" \ + %endif # graphdriver tests require extra permissions # integration tests require a running docker daemon From 1d6c1789b915d5ee19c51c56a8a216412e03edbe Mon Sep 17 00:00:00 2001 From: Mikel Olasagasti Uranga Date: Sat, 3 Aug 2024 16:56:46 +0200 Subject: [PATCH 111/163] Make moby-filesystem and moby-rpm-macros noarch --- moby-engine.spec | 2 ++ 1 file changed, 2 insertions(+) diff --git a/moby-engine.spec b/moby-engine.spec index dd2ec1d..38c9fad 100644 --- a/moby-engine.spec +++ b/moby-engine.spec @@ -142,6 +142,7 @@ This package provides the Docker CLI. %package -n moby-filesystem Summary: Filesystem package for the Moby/Docker stack License: LicenseRef-Not-Copyrightable +BuildArch: noarch %description -n moby-filesystem %{common_description} @@ -151,6 +152,7 @@ This is the filesystem subpackage for the Moby/Docker stack. %package -n moby-rpm-macros Summary: RPM Macros for the Moby/Docker stack License: MIT +BuildArch: noarch %description -n moby-rpm-macros %{common_description} From dc0ec01835d1a58930da7076031412dc42604548 Mon Sep 17 00:00:00 2001 From: Bradley G Smith Date: Thu, 1 Aug 2024 12:32:36 -0700 Subject: [PATCH 112/163] Add source 0,1 download to mkvendor.sh For maintainer convenience. Uses spectool to download Source 0,1 if not already present. Maintainer can check out a fresh copy of the repository or update spec file with new release version tag. One command to download source file and generate vendor archives. --- mkvendor.sh | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/mkvendor.sh b/mkvendor.sh index 98396d5..d461575 100755 --- a/mkvendor.sh +++ b/mkvendor.sh @@ -15,6 +15,11 @@ while read -r source; do done < <(spectool --sources ./*.spec) set -x + +# Retrieve Source0 and Source1 if not already present +spectool -g -s 0,1 moby-engine.spec + +# (re)create vendor archives go_vendor_archive create --config ./engine_go-vendor-tools.toml --idempotent \ --output "${sources[2]}" "${sources[0]}" From 25fce270a302f20905a400c767151753c189db32 Mon Sep 17 00:00:00 2001 From: Bradley G Smith Date: Thu, 1 Aug 2024 12:53:14 -0700 Subject: [PATCH 113/163] Add simple maintainer's notes to README.md A few simple steps for new maintainers to follow when building this package. [skip changelog] --- README.md | 32 +++++++++++++++++++++++++++++++- 1 file changed, 31 insertions(+), 1 deletion(-) diff --git a/README.md b/README.md index 57607ed..1c0e108 100644 --- a/README.md +++ b/README.md @@ -1,3 +1,33 @@ # moby-engine -The moby-engine package \ No newline at end of file +The moby-engine package + +## Maintainers Notes + +The following steps can be followed to build this package. + +1. Use your favorite git client to clone out the repository if not already present. + + ``` + git clone ssh://yourfedoraID@pkgs.fedoraproject.org/rpms/moby-engine.git + ``` + +1. Update ```moby-engine.spec``` using your favorite editor to the target release version. + + ``` + # vi example + vi moby-engine.spec + ``` + +1. Run ```./mkvendor.sh``` to download upstream source files and generate vendor archives. + + ``` + ./mkvendor.sh + ``` + +1. Follow the usual Fedora package maintainers build package and generate rpms. + + ``` + # fedpkg mockbuild example + fedpkg --release rawhide mockbuild + ``` From 7d2d62a39565401b2dec251577ae15d11940d10c Mon Sep 17 00:00:00 2001 From: Maxwell G Date: Fri, 2 Aug 2024 21:27:39 -0500 Subject: [PATCH 114/163] Apply gotmax23's suggestions - Fix up grammar and conciseness and markdown syntax - Use explicit language for code blocks (Pagure's markdown renerder doesn't support code block syntax highlighting but maybe our next forge will...) Thanks buckaroogeek for all your work on this. It's great! [skip changelog] --- README.md | 26 +++++++++++++------------- 1 file changed, 13 insertions(+), 13 deletions(-) diff --git a/README.md b/README.md index 1c0e108..72f2ba6 100644 --- a/README.md +++ b/README.md @@ -2,32 +2,32 @@ The moby-engine package -## Maintainers Notes +## Maintainer notes -The following steps can be followed to build this package. +Follow these steps to build this package. -1. Use your favorite git client to clone out the repository if not already present. +1. Use your favorite git client to check out the repository if not already present. - ``` - git clone ssh://yourfedoraID@pkgs.fedoraproject.org/rpms/moby-engine.git + ``` bash + fedpkg clone moby-engine ``` -1. Update ```moby-engine.spec``` using your favorite editor to the target release version. +1. Update `moby-engine.spec` to the target release version + using `rpmdev-bumpspec` or manually with your preferred text editor. - ``` - # vi example - vi moby-engine.spec + ``` bash + rpmdev-bumpspec --new ${version} moby-engine.spec ``` -1. Run ```./mkvendor.sh``` to download upstream source files and generate vendor archives. +1. Run `./mkvendor.sh` to download upstream source files and generate vendor archives. - ``` + ``` bash ./mkvendor.sh ``` -1. Follow the usual Fedora package maintainers build package and generate rpms. +1. Build and test the package locally. - ``` + ``` bash # fedpkg mockbuild example fedpkg --release rawhide mockbuild ``` From 8b1d7bbd796f8206a01294599a0efb5870315592 Mon Sep 17 00:00:00 2001 From: Bradley G Smith Date: Sat, 3 Aug 2024 10:52:11 -0700 Subject: [PATCH 115/163] Remove bash annotation on code blocks It seems that the pagure markdown renderer does not support using a bash source annotation. Removing for improved readability. --- README.md | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/README.md b/README.md index 72f2ba6..f7c64ec 100644 --- a/README.md +++ b/README.md @@ -8,26 +8,26 @@ Follow these steps to build this package. 1. Use your favorite git client to check out the repository if not already present. - ``` bash + ``` fedpkg clone moby-engine ``` 1. Update `moby-engine.spec` to the target release version using `rpmdev-bumpspec` or manually with your preferred text editor. - ``` bash + ``` rpmdev-bumpspec --new ${version} moby-engine.spec ``` 1. Run `./mkvendor.sh` to download upstream source files and generate vendor archives. - ``` bash + ``` ./mkvendor.sh ``` 1. Build and test the package locally. - ``` bash + ``` # fedpkg mockbuild example fedpkg --release rawhide mockbuild ``` From ed0ab8b3d5637693250e2c2f60816e34a9cdd3cf Mon Sep 17 00:00:00 2001 From: Maxwell G Date: Wed, 21 Aug 2024 10:37:32 -0500 Subject: [PATCH 116/163] doc README: don't recommend rpmdev-bumpspec --new This is not compatible with `%{forgeversion}`. My bad for suggesting this in the first place. [skip changelog] --- README.md | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/README.md b/README.md index f7c64ec..787ceab 100644 --- a/README.md +++ b/README.md @@ -12,11 +12,11 @@ Follow these steps to build this package. fedpkg clone moby-engine ``` -1. Update `moby-engine.spec` to the target release version - using `rpmdev-bumpspec` or manually with your preferred text editor. +1. Update the `%version0` macro in `moby-engine.spec` to the target version + using your preferred text editor. ``` - rpmdev-bumpspec --new ${version} moby-engine.spec + vim moby-engine.spec ``` 1. Run `./mkvendor.sh` to download upstream source files and generate vendor archives. From 4e91fc014aa4c7c50c2a52d80dce43a83f23b1d8 Mon Sep 17 00:00:00 2001 From: Maxwell G Date: Wed, 21 Aug 2024 10:37:10 -0500 Subject: [PATCH 117/163] Update to 27.1.2. Fixes rhbz#2274717. --- .gitignore | 4 ++++ moby-engine.spec | 2 +- sources | 8 ++++---- 3 files changed, 9 insertions(+), 5 deletions(-) diff --git a/.gitignore b/.gitignore index 8b064f9..5af874c 100644 --- a/.gitignore +++ b/.gitignore @@ -73,3 +73,7 @@ moby-v20.10.10.tar.gz /cli-27.1.1.tar.gz /moby-27.1.1-vendor.tar.bz2 /cli-27.1.1-vendor.tar.bz2 +/moby-27.1.2.tar.gz +/cli-27.1.2.tar.gz +/moby-27.1.2-vendor.tar.bz2 +/cli-27.1.2-vendor.tar.bz2 diff --git a/moby-engine.spec b/moby-engine.spec index 38c9fad..15aafdc 100644 --- a/moby-engine.spec +++ b/moby-engine.spec @@ -10,7 +10,7 @@ # https://github.com/moby/moby %global goipath github.com/docker/docker %global forgeurl https://github.com/moby/moby -%global version0 27.1.1 +%global version0 27.1.2 # https://github.com/docker/cli %global goipath1 github.com/docker/cli diff --git a/sources b/sources index 58513a8..349dc08 100644 --- a/sources +++ b/sources @@ -1,4 +1,4 @@ -SHA512 (moby-27.1.1.tar.gz) = 59a7771d80c2d48344f87356991f95d59978977ceab0ae6f4d2ca725e173bce3efa11acbbf7a2beed714df7ccf64bee5b7ecc56538b87e7dc730520fe9faf0f3 -SHA512 (cli-27.1.1.tar.gz) = 18fc3ef3c6fe22d8eb18ebbf58b912eb366fa96862db3737054a24bed0f47b15bb5c966241d271ac99cc319e2cca875c76b92fe14aeea4c84e5247384d370621 -SHA512 (moby-27.1.1-vendor.tar.bz2) = 0c01d80b04547d7a34164fc6a357e8874602d4c5a4476ddaa8a0f7271e544502be2e803ebd9440afe55b952dd7b86ee9b9126a46a54a7d3f01d3a58d51abf11c -SHA512 (cli-27.1.1-vendor.tar.bz2) = 58a9a6d868231f07e5b9e8bc85cda755989dbf92068d256969438977fbe3e26137023d8576d89428d1944606621872bb1128c88820a06914d557ac25656c2354 +SHA512 (moby-27.1.2.tar.gz) = 26f85a1437ba4361dc050861dd9c3ba900f80e4fdc0eaf2bfcba33b6419c5d981c9ee5ab3bea9af208502eca372a2f76c42325abe9e3d2c1b2f725fe7b10df92 +SHA512 (cli-27.1.2.tar.gz) = 5c75d32c8e9598282de32ac8a2ebbc2eda712a010449edbd6e66f0652c4e02b124df70596d9f1076de3c4a95920b4cc16c35fb343624de1363557ab48976e153 +SHA512 (moby-27.1.2-vendor.tar.bz2) = 4340d5704545d8781e0a6852904138037b13a06b51b78fa44d9d4af04996e32d1d45e564a41c97fe731746f210835d1d37aa5c484163234477189e763de810bf +SHA512 (cli-27.1.2-vendor.tar.bz2) = 5fc3b0a319b28dec45aebd14c3ebb7fa7da14091c2fa090dfb554cc0a40392c9ef27bfc771490845427e157439c24cd0b6604dd39abe8b065000eb539b5d0767 From 4776d5a1b4acaefe271116391cbd03621450a435 Mon Sep 17 00:00:00 2001 From: Maxwell G Date: Sat, 7 Sep 2024 13:20:06 -0500 Subject: [PATCH 118/163] Fix spelling error in LICENSE.macros copyright --- LICENSE.macros | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/LICENSE.macros b/LICENSE.macros index 764ec97..c511b5a 100644 --- a/LICENSE.macros +++ b/LICENSE.macros @@ -1,6 +1,6 @@ MIT License -Copyright (C) 2024 Maxwell G +Copyright (C) 2024 Maxwell G Copyright (C) Fedora Project Authors Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions: From e0d25aad0d0eb0dad8679c1c20c4a8491e78bda5 Mon Sep 17 00:00:00 2001 From: Bradley G Smith Date: Wed, 28 Aug 2024 12:51:15 -0700 Subject: [PATCH 119/163] Update to v27.2.0 Resolves rhbz#2308340 New features, bug fixes and enhancements. See https://github.com/moby/moby/releases/tag/v27.2.0 for full list. - CLI: Add support for device-code flow login when authenticating to the official registry. - containerd image store: docker image ls now supports --tree flag that shows a multiplatform-aware image list. This is experimental and may change at any time without any backwards compatibility. --- .gitignore | 4 ++++ moby-engine.spec | 2 +- sources | 8 ++++---- 3 files changed, 9 insertions(+), 5 deletions(-) diff --git a/.gitignore b/.gitignore index 5af874c..b242436 100644 --- a/.gitignore +++ b/.gitignore @@ -77,3 +77,7 @@ moby-v20.10.10.tar.gz /cli-27.1.2.tar.gz /moby-27.1.2-vendor.tar.bz2 /cli-27.1.2-vendor.tar.bz2 +/cli-27.2.0.tar.gz +/cli-27.2.0-vendor.tar.bz2 +/moby-27.2.0.tar.gz +/moby-27.2.0-vendor.tar.bz2 diff --git a/moby-engine.spec b/moby-engine.spec index 15aafdc..cce319e 100644 --- a/moby-engine.spec +++ b/moby-engine.spec @@ -10,7 +10,7 @@ # https://github.com/moby/moby %global goipath github.com/docker/docker %global forgeurl https://github.com/moby/moby -%global version0 27.1.2 +%global version0 27.2.0 # https://github.com/docker/cli %global goipath1 github.com/docker/cli diff --git a/sources b/sources index 349dc08..e74fc96 100644 --- a/sources +++ b/sources @@ -1,4 +1,4 @@ -SHA512 (moby-27.1.2.tar.gz) = 26f85a1437ba4361dc050861dd9c3ba900f80e4fdc0eaf2bfcba33b6419c5d981c9ee5ab3bea9af208502eca372a2f76c42325abe9e3d2c1b2f725fe7b10df92 -SHA512 (cli-27.1.2.tar.gz) = 5c75d32c8e9598282de32ac8a2ebbc2eda712a010449edbd6e66f0652c4e02b124df70596d9f1076de3c4a95920b4cc16c35fb343624de1363557ab48976e153 -SHA512 (moby-27.1.2-vendor.tar.bz2) = 4340d5704545d8781e0a6852904138037b13a06b51b78fa44d9d4af04996e32d1d45e564a41c97fe731746f210835d1d37aa5c484163234477189e763de810bf -SHA512 (cli-27.1.2-vendor.tar.bz2) = 5fc3b0a319b28dec45aebd14c3ebb7fa7da14091c2fa090dfb554cc0a40392c9ef27bfc771490845427e157439c24cd0b6604dd39abe8b065000eb539b5d0767 +SHA512 (cli-27.2.0.tar.gz) = 5dce9e974a96b2518a73d50a9421d12feeb9cc792bb89000f26e04a91fdddade2648dea39aa721e48c9b07bfc18f7a6676fb7e286ae779556753886ec45e86c3 +SHA512 (cli-27.2.0-vendor.tar.bz2) = 70080d4ab87fb7b3d6fef884012c7f70df30cb0f1beccb1ff814524df9068a5dc15c72891da45a668a803638e0643b41b2435de90476a9321d7f09c48bc3fff4 +SHA512 (moby-27.2.0.tar.gz) = 97abaf56d2249c1514beacf17fc9096848b960846e064f1a9bd800a59762a1f1888b32e83b3e8289e23656496ca0293fea65931210d68faaa8a713aab6e48b65 +SHA512 (moby-27.2.0-vendor.tar.bz2) = 734655b7f1ad9861746b4d1700e685595bdc6f7671b32cb79b19f1a030ad5f8ed0754feff6a9f7d96b881a8a55b9fcae437af8b93e720ce6d91ce0bda140f6df From 998b05cd0a48748a2189e931636e8398293915e6 Mon Sep 17 00:00:00 2001 From: Bradley G Smith Date: Mon, 9 Sep 2024 08:30:03 -0700 Subject: [PATCH 120/163] Update to v27.2.1 Resolves rhbz# 2308340. From upstream: - containerd image store: Fix non-container images being hidden in the docker image ls output. - containerd image store: Improve docker pull error message when the image platform doesn't match. - CLI: Fix issue causing docker login to not remove repository names from passed in registry addresses, resulting in credentials being stored under the wrong key. - CLI: Fix issue that will sometimes cause the browser-login flow to fail if the CLI process is suspended and then resumed while waiting for the user to authenticate. - CLI: docker login now returns an error instead of hanging if called non-interactively with --password or --password-stdin but without --user. --- .gitignore | 4 ++++ moby-engine.spec | 2 +- sources | 8 ++++---- 3 files changed, 9 insertions(+), 5 deletions(-) diff --git a/.gitignore b/.gitignore index b242436..76c2e42 100644 --- a/.gitignore +++ b/.gitignore @@ -81,3 +81,7 @@ moby-v20.10.10.tar.gz /cli-27.2.0-vendor.tar.bz2 /moby-27.2.0.tar.gz /moby-27.2.0-vendor.tar.bz2 +/cli-27.2.1.tar.gz +/cli-27.2.1-vendor.tar.bz2 +/moby-27.2.1.tar.gz +/moby-27.2.1-vendor.tar.bz2 diff --git a/moby-engine.spec b/moby-engine.spec index cce319e..12908e9 100644 --- a/moby-engine.spec +++ b/moby-engine.spec @@ -10,7 +10,7 @@ # https://github.com/moby/moby %global goipath github.com/docker/docker %global forgeurl https://github.com/moby/moby -%global version0 27.2.0 +%global version0 27.2.1 # https://github.com/docker/cli %global goipath1 github.com/docker/cli diff --git a/sources b/sources index e74fc96..e577992 100644 --- a/sources +++ b/sources @@ -1,4 +1,4 @@ -SHA512 (cli-27.2.0.tar.gz) = 5dce9e974a96b2518a73d50a9421d12feeb9cc792bb89000f26e04a91fdddade2648dea39aa721e48c9b07bfc18f7a6676fb7e286ae779556753886ec45e86c3 -SHA512 (cli-27.2.0-vendor.tar.bz2) = 70080d4ab87fb7b3d6fef884012c7f70df30cb0f1beccb1ff814524df9068a5dc15c72891da45a668a803638e0643b41b2435de90476a9321d7f09c48bc3fff4 -SHA512 (moby-27.2.0.tar.gz) = 97abaf56d2249c1514beacf17fc9096848b960846e064f1a9bd800a59762a1f1888b32e83b3e8289e23656496ca0293fea65931210d68faaa8a713aab6e48b65 -SHA512 (moby-27.2.0-vendor.tar.bz2) = 734655b7f1ad9861746b4d1700e685595bdc6f7671b32cb79b19f1a030ad5f8ed0754feff6a9f7d96b881a8a55b9fcae437af8b93e720ce6d91ce0bda140f6df +SHA512 (cli-27.2.1.tar.gz) = 2e89062fc906eec6879787b21a76d291159fb5e22c6a30c78d915c7a1c76ae03fca0cb7e4fc7f78e1747120fb64b652dbc9ca925a77c41ec9df44136bb2a83fa +SHA512 (cli-27.2.1-vendor.tar.bz2) = 0f1d4819e36d00f2b72d364172a6a55c261d8d6abf4a0e049c8b27f6719411d90aa9f2ec1277bc7fb590a98bb2a8955e43edadfc98d650a4094c598e9aaba185 +SHA512 (moby-27.2.1.tar.gz) = 2ca29e53074c1ff7b527f709ae542daa2754cfc35c70ae92bd71b4c7d5d54cd6d373ab078c811900dc694347cb149387681f6cf26634c81651a8e91e31790de7 +SHA512 (moby-27.2.1-vendor.tar.bz2) = a62eba52d240db93e8a168182a91993be3ea9891821fffb386fb84bf1de10bda2cfc9dddc545dfad261ee9e4b1bc45d6ad4cb7f29dafc44bfa7ebcaecf3f7ad5 From 3ff91c05da682a755ae19a847f48765d455fa521 Mon Sep 17 00:00:00 2001 From: Bradley G Smith Date: Fri, 20 Sep 2024 16:59:49 -0700 Subject: [PATCH 121/163] Update to v27.3.1 - Resolve rhbz#2308340 --- .gitignore | 4 ++++ moby-engine.spec | 2 +- sources | 8 ++++---- 3 files changed, 9 insertions(+), 5 deletions(-) diff --git a/.gitignore b/.gitignore index 76c2e42..5a37bbe 100644 --- a/.gitignore +++ b/.gitignore @@ -85,3 +85,7 @@ moby-v20.10.10.tar.gz /cli-27.2.1-vendor.tar.bz2 /moby-27.2.1.tar.gz /moby-27.2.1-vendor.tar.bz2 +/cli-27.3.1.tar.gz +/cli-27.3.1-vendor.tar.bz2 +/moby-27.3.1.tar.gz +/moby-27.3.1-vendor.tar.bz2 diff --git a/moby-engine.spec b/moby-engine.spec index 12908e9..c23e833 100644 --- a/moby-engine.spec +++ b/moby-engine.spec @@ -10,7 +10,7 @@ # https://github.com/moby/moby %global goipath github.com/docker/docker %global forgeurl https://github.com/moby/moby -%global version0 27.2.1 +%global version0 27.3.1 # https://github.com/docker/cli %global goipath1 github.com/docker/cli diff --git a/sources b/sources index e577992..85b429b 100644 --- a/sources +++ b/sources @@ -1,4 +1,4 @@ -SHA512 (cli-27.2.1.tar.gz) = 2e89062fc906eec6879787b21a76d291159fb5e22c6a30c78d915c7a1c76ae03fca0cb7e4fc7f78e1747120fb64b652dbc9ca925a77c41ec9df44136bb2a83fa -SHA512 (cli-27.2.1-vendor.tar.bz2) = 0f1d4819e36d00f2b72d364172a6a55c261d8d6abf4a0e049c8b27f6719411d90aa9f2ec1277bc7fb590a98bb2a8955e43edadfc98d650a4094c598e9aaba185 -SHA512 (moby-27.2.1.tar.gz) = 2ca29e53074c1ff7b527f709ae542daa2754cfc35c70ae92bd71b4c7d5d54cd6d373ab078c811900dc694347cb149387681f6cf26634c81651a8e91e31790de7 -SHA512 (moby-27.2.1-vendor.tar.bz2) = a62eba52d240db93e8a168182a91993be3ea9891821fffb386fb84bf1de10bda2cfc9dddc545dfad261ee9e4b1bc45d6ad4cb7f29dafc44bfa7ebcaecf3f7ad5 +SHA512 (cli-27.3.1.tar.gz) = 6e80e94a0e9e16aaf2b19bc97c99ead39184745f601aea94e47c066a19b6436850d5269962e0802e9f7fa9f7dcb357ec0756c9466afa2c0a6ae239d61ef15961 +SHA512 (cli-27.3.1-vendor.tar.bz2) = 1dcfda283b2b8544b3ef7145f0777de319d60f098932745752fd17da928b0d4db2485dd794783ca5df1664a93b85a095425afa3c1b5ccd791cf3f7c93431faa2 +SHA512 (moby-27.3.1.tar.gz) = 0fddcc8314eed2e7b131af78f1fa01292cfc4fcb7fd0af94b79d5435349ab54a21b0a78cffbf29dd4c58747d8bcd1f47473cc5f5ab2596e133828b2e6540d172 +SHA512 (moby-27.3.1-vendor.tar.bz2) = 95737c4acb4f8da5a3188357d48c8b7a6be02251ee7ed1e87aac3b850d41d1c9437772fb6d9244839f2249da9a3510f705c436106f672bec687bc0b50977ec27 From 495175fe6eb347a297eec94c4ed02ee2adf8fa8e Mon Sep 17 00:00:00 2001 From: Bradley G Smith Date: Tue, 24 Sep 2024 12:37:12 -0700 Subject: [PATCH 122/163] Restore pigz as a runtime requirement Resolves rhbz#2314398. Improves layer decompression performance. See https://bugzilla.redhat.com/show_bug.cgi?id=2314398 for more detail on rationale and benefit. --- moby-engine.spec | 1 + 1 file changed, 1 insertion(+) diff --git a/moby-engine.spec b/moby-engine.spec index c23e833..fb717a9 100644 --- a/moby-engine.spec +++ b/moby-engine.spec @@ -80,6 +80,7 @@ Requires: tini-static Requires: container-selinux Requires: iptables Requires: libseccomp +Requires: pigz Requires: systemd Requires: tar Requires: xz From 1304eed7bb08a74633e20831e92fbe8563a1fee2 Mon Sep 17 00:00:00 2001 From: Bradley G Smith Date: Thu, 5 Dec 2024 14:43:23 -0800 Subject: [PATCH 123/163] Update to release v27.4.0-rc.4 - Resolves rhbz#2330680 - Release candidate 4. Significant changes from v27.3. See upstream change log. --- .gitignore | 4 ++++ moby-engine.spec | 7 ++++++- sources | 8 ++++---- 3 files changed, 14 insertions(+), 5 deletions(-) diff --git a/.gitignore b/.gitignore index 5a37bbe..b6a5c38 100644 --- a/.gitignore +++ b/.gitignore @@ -89,3 +89,7 @@ moby-v20.10.10.tar.gz /cli-27.3.1-vendor.tar.bz2 /moby-27.3.1.tar.gz /moby-27.3.1-vendor.tar.bz2 +/moby-27.4.0-rc.4-vendor.tar.bz2 +/moby-27.4.0-rc.4.tar.gz +/cli-27.4.0-rc.4.tar.gz +/cli-27.4.0-rc.4-vendor.tar.bz2 diff --git a/moby-engine.spec b/moby-engine.spec index fb717a9..48a3cc2 100644 --- a/moby-engine.spec +++ b/moby-engine.spec @@ -10,11 +10,16 @@ # https://github.com/moby/moby %global goipath github.com/docker/docker %global forgeurl https://github.com/moby/moby -%global version0 27.3.1 +# 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.4.0~rc.4 +%global tag0 v%gsub %{version0} ~ - # https://github.com/docker/cli %global goipath1 github.com/docker/cli %global version1 %{version0} +%global tag1 %{tag0} %gometa -L -a -f %global engine_dir ../%{topdir0} diff --git a/sources b/sources index 85b429b..51bc034 100644 --- a/sources +++ b/sources @@ -1,4 +1,4 @@ -SHA512 (cli-27.3.1.tar.gz) = 6e80e94a0e9e16aaf2b19bc97c99ead39184745f601aea94e47c066a19b6436850d5269962e0802e9f7fa9f7dcb357ec0756c9466afa2c0a6ae239d61ef15961 -SHA512 (cli-27.3.1-vendor.tar.bz2) = 1dcfda283b2b8544b3ef7145f0777de319d60f098932745752fd17da928b0d4db2485dd794783ca5df1664a93b85a095425afa3c1b5ccd791cf3f7c93431faa2 -SHA512 (moby-27.3.1.tar.gz) = 0fddcc8314eed2e7b131af78f1fa01292cfc4fcb7fd0af94b79d5435349ab54a21b0a78cffbf29dd4c58747d8bcd1f47473cc5f5ab2596e133828b2e6540d172 -SHA512 (moby-27.3.1-vendor.tar.bz2) = 95737c4acb4f8da5a3188357d48c8b7a6be02251ee7ed1e87aac3b850d41d1c9437772fb6d9244839f2249da9a3510f705c436106f672bec687bc0b50977ec27 +SHA512 (moby-27.4.0-rc.4-vendor.tar.bz2) = b76d08892747c0f4ef529c5a17b6729294f2315ed62fc1159f7518398f10ab162b47bf5eab8b420247c2d3287bd1fe0e0be0c6ddf627e8b6c35611e9673d98ed +SHA512 (moby-27.4.0-rc.4.tar.gz) = 106dc47fe820d9457963d44f4f3fc67c0fc6dbcc0741e74b1671f0eb05a0220a89949e1d60a7a41adfa5e70e4e8bcfad33e32c2b2082925f0769c6bc61b7bc1a +SHA512 (cli-27.4.0-rc.4.tar.gz) = ac8aea03c4bd8e3cb839d490575229e0468e8474a02c12b68b9af1d19b0d641489c4985d0951693b2ac51f233f9e7bf4ab261580852b66744fc78ba720b8b901 +SHA512 (cli-27.4.0-rc.4-vendor.tar.bz2) = 59c02b1514d7c72f67e70ea1c660b8d81ce912fc7259401bc49321b810f42b9d60bac9878523d013f483d72a78ffcb65943acb4022dda4d5b0558f1123081685 From 7eace5e29a640e44223675635a62e0232e92632d Mon Sep 17 00:00:00 2001 From: Bradley G Smith Date: Fri, 6 Dec 2024 09:55:46 -0800 Subject: [PATCH 124/163] Improve tag0 syntax Thanks to @gotmax23 and Kan-Ru Chen for improvements to using gsub macro to set tag0. --- moby-engine.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/moby-engine.spec b/moby-engine.spec index 48a3cc2..14e96cb 100644 --- a/moby-engine.spec +++ b/moby-engine.spec @@ -14,7 +14,7 @@ # in version0. tag0 reverses the substitution # e.g. global version0 27.4.0~rc.4 %global version0 27.4.0~rc.4 -%global tag0 v%gsub %{version0} ~ - +%global tag0 v%{gsub %{version0} ~ -} # https://github.com/docker/cli %global goipath1 github.com/docker/cli From f00f1470fd7381b5f7aba967038d491d93f45f60 Mon Sep 17 00:00:00 2001 From: Bradley G Smith Date: Mon, 9 Dec 2024 11:38:09 -0800 Subject: [PATCH 125/163] Update to release v27.4.0 - Resolves rhbz#2331204 - Significant bug fixes and enhancements. See upstream change log. --- .gitignore | 4 ++++ moby-engine.spec | 2 +- sources | 8 ++++---- 3 files changed, 9 insertions(+), 5 deletions(-) diff --git a/.gitignore b/.gitignore index b6a5c38..a8c702f 100644 --- a/.gitignore +++ b/.gitignore @@ -93,3 +93,7 @@ moby-v20.10.10.tar.gz /moby-27.4.0-rc.4.tar.gz /cli-27.4.0-rc.4.tar.gz /cli-27.4.0-rc.4-vendor.tar.bz2 +/cli-27.4.0.tar.gz +/cli-27.4.0-vendor.tar.bz2 +/moby-27.4.0.tar.gz +/moby-27.4.0-vendor.tar.bz2 diff --git a/moby-engine.spec b/moby-engine.spec index 14e96cb..c9f2ca3 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.4.0~rc.4 +%global version0 27.4.0 %global tag0 v%{gsub %{version0} ~ -} # https://github.com/docker/cli diff --git a/sources b/sources index 51bc034..2cc24ac 100644 --- a/sources +++ b/sources @@ -1,4 +1,4 @@ -SHA512 (moby-27.4.0-rc.4-vendor.tar.bz2) = b76d08892747c0f4ef529c5a17b6729294f2315ed62fc1159f7518398f10ab162b47bf5eab8b420247c2d3287bd1fe0e0be0c6ddf627e8b6c35611e9673d98ed -SHA512 (moby-27.4.0-rc.4.tar.gz) = 106dc47fe820d9457963d44f4f3fc67c0fc6dbcc0741e74b1671f0eb05a0220a89949e1d60a7a41adfa5e70e4e8bcfad33e32c2b2082925f0769c6bc61b7bc1a -SHA512 (cli-27.4.0-rc.4.tar.gz) = ac8aea03c4bd8e3cb839d490575229e0468e8474a02c12b68b9af1d19b0d641489c4985d0951693b2ac51f233f9e7bf4ab261580852b66744fc78ba720b8b901 -SHA512 (cli-27.4.0-rc.4-vendor.tar.bz2) = 59c02b1514d7c72f67e70ea1c660b8d81ce912fc7259401bc49321b810f42b9d60bac9878523d013f483d72a78ffcb65943acb4022dda4d5b0558f1123081685 +SHA512 (cli-27.4.0.tar.gz) = 432ebf450b03f2e4ca6e7230bbb2b37d5c8372bc62bf3c4c24469d1015974231f9f5cadf949a2340fa1e8d3ba82c88cadae604a029141a9e037ee1fd6ff89355 +SHA512 (cli-27.4.0-vendor.tar.bz2) = 59c02b1514d7c72f67e70ea1c660b8d81ce912fc7259401bc49321b810f42b9d60bac9878523d013f483d72a78ffcb65943acb4022dda4d5b0558f1123081685 +SHA512 (moby-27.4.0.tar.gz) = f684d6e91bf0a00247605ea88ea6421cc13b9152239b8f51eb640a568b43b3898ea6bcd22ef64a0e263d6e795362160473db849490672dd1fd39d174ad6f45a0 +SHA512 (moby-27.4.0-vendor.tar.bz2) = b76d08892747c0f4ef529c5a17b6729294f2315ed62fc1159f7518398f10ab162b47bf5eab8b420247c2d3287bd1fe0e0be0c6ddf627e8b6c35611e9673d98ed From c1835325f87f0a068dec42243a35ab3a3963a8e3 Mon Sep 17 00:00:00 2001 From: Bradley G Smith Date: Wed, 18 Dec 2024 07:29:37 -0800 Subject: [PATCH 126/163] Update to release v27.4.1 - Resolves rhbz#2331204 --- .gitignore | 4 ++++ moby-engine.spec | 2 +- sources | 8 ++++---- 3 files changed, 9 insertions(+), 5 deletions(-) diff --git a/.gitignore b/.gitignore index a8c702f..e72e2a0 100644 --- a/.gitignore +++ b/.gitignore @@ -97,3 +97,7 @@ moby-v20.10.10.tar.gz /cli-27.4.0-vendor.tar.bz2 /moby-27.4.0.tar.gz /moby-27.4.0-vendor.tar.bz2 +/cli-27.4.1.tar.gz +/cli-27.4.1-vendor.tar.bz2 +/moby-27.4.1.tar.gz +/moby-27.4.1-vendor.tar.bz2 diff --git a/moby-engine.spec b/moby-engine.spec index c9f2ca3..e71464d 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.4.0 +%global version0 27.4.1 %global tag0 v%{gsub %{version0} ~ -} # https://github.com/docker/cli diff --git a/sources b/sources index 2cc24ac..3e0e113 100644 --- a/sources +++ b/sources @@ -1,4 +1,4 @@ -SHA512 (cli-27.4.0.tar.gz) = 432ebf450b03f2e4ca6e7230bbb2b37d5c8372bc62bf3c4c24469d1015974231f9f5cadf949a2340fa1e8d3ba82c88cadae604a029141a9e037ee1fd6ff89355 -SHA512 (cli-27.4.0-vendor.tar.bz2) = 59c02b1514d7c72f67e70ea1c660b8d81ce912fc7259401bc49321b810f42b9d60bac9878523d013f483d72a78ffcb65943acb4022dda4d5b0558f1123081685 -SHA512 (moby-27.4.0.tar.gz) = f684d6e91bf0a00247605ea88ea6421cc13b9152239b8f51eb640a568b43b3898ea6bcd22ef64a0e263d6e795362160473db849490672dd1fd39d174ad6f45a0 -SHA512 (moby-27.4.0-vendor.tar.bz2) = b76d08892747c0f4ef529c5a17b6729294f2315ed62fc1159f7518398f10ab162b47bf5eab8b420247c2d3287bd1fe0e0be0c6ddf627e8b6c35611e9673d98ed +SHA512 (cli-27.4.1.tar.gz) = 5880053d44e169b93fe50f3d4b13fa2f8f60de32a96f8ee2923a3291385532c1903027f0654a65a8eab51f29caf7b805857b491c0bfeee2e1983f822e579851e +SHA512 (cli-27.4.1-vendor.tar.bz2) = 8e8f6921717108289796ef31d4a4c08398026d58b8c77ad7de83db91be65d374e38b7d94a2f1bad62b59470e225a57f35398e02db3f9cb397fae83429e46878d +SHA512 (moby-27.4.1.tar.gz) = 3d77708f7373c1b58b1c46428c2cfc9e8985076e494e40ab86709f37a686cf92b9e2c9db5aa34293f728bb7ccd6a7e08e0cbb1c6d20acfd025c4c787d5908dc0 +SHA512 (moby-27.4.1-vendor.tar.bz2) = b76d08892747c0f4ef529c5a17b6729294f2315ed62fc1159f7518398f10ab162b47bf5eab8b420247c2d3287bd1fe0e0be0c6ddf627e8b6c35611e9673d98ed From ef4956e68be93536b0fb9bdfe36e2ae806559c00 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Fri, 17 Jan 2025 18:48:59 +0000 Subject: [PATCH 127/163] Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild From 117436efa5f35b15eee514d6f132a4fcb604a081 Mon Sep 17 00:00:00 2001 From: Bradley G Smith Date: Mon, 13 Jan 2025 12:28:48 -0800 Subject: [PATCH 128/163] Update to release v27.5.0 - Resolves rhbz#2337409 - Upstream enhancements and fixes --- .gitignore | 4 ++++ moby-engine.spec | 2 +- sources | 8 ++++---- 3 files changed, 9 insertions(+), 5 deletions(-) diff --git a/.gitignore b/.gitignore index e72e2a0..b85115b 100644 --- a/.gitignore +++ b/.gitignore @@ -101,3 +101,7 @@ moby-v20.10.10.tar.gz /cli-27.4.1-vendor.tar.bz2 /moby-27.4.1.tar.gz /moby-27.4.1-vendor.tar.bz2 +/cli-27.5.0.tar.gz +/cli-27.5.0-vendor.tar.bz2 +/moby-27.5.0.tar.gz +/moby-27.5.0-vendor.tar.bz2 diff --git a/moby-engine.spec b/moby-engine.spec index e71464d..2421b6a 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.4.1 +%global version0 27.5.0 %global tag0 v%{gsub %{version0} ~ -} # https://github.com/docker/cli diff --git a/sources b/sources index 3e0e113..7d8f137 100644 --- a/sources +++ b/sources @@ -1,4 +1,4 @@ -SHA512 (cli-27.4.1.tar.gz) = 5880053d44e169b93fe50f3d4b13fa2f8f60de32a96f8ee2923a3291385532c1903027f0654a65a8eab51f29caf7b805857b491c0bfeee2e1983f822e579851e -SHA512 (cli-27.4.1-vendor.tar.bz2) = 8e8f6921717108289796ef31d4a4c08398026d58b8c77ad7de83db91be65d374e38b7d94a2f1bad62b59470e225a57f35398e02db3f9cb397fae83429e46878d -SHA512 (moby-27.4.1.tar.gz) = 3d77708f7373c1b58b1c46428c2cfc9e8985076e494e40ab86709f37a686cf92b9e2c9db5aa34293f728bb7ccd6a7e08e0cbb1c6d20acfd025c4c787d5908dc0 -SHA512 (moby-27.4.1-vendor.tar.bz2) = b76d08892747c0f4ef529c5a17b6729294f2315ed62fc1159f7518398f10ab162b47bf5eab8b420247c2d3287bd1fe0e0be0c6ddf627e8b6c35611e9673d98ed +SHA512 (cli-27.5.0.tar.gz) = 3c7c709f38fffd4d4e134d2abd7e6dc606e1cba765d36924a53f9470d6077be2282983eb23995bd56d772da253a69a854fe3112fea1a7ed2c9a1b70d2cc45b57 +SHA512 (cli-27.5.0-vendor.tar.bz2) = 9ed57d9fae0cfa099542e9b3a9079e7e3ab14329000d3e04550a83f7f70f17f21fbebe0814ddc6b09f8c91c1d4a7de0ef54969ee3c92c70b889cab55ba9a7764 +SHA512 (moby-27.5.0.tar.gz) = 89245805edebd7d43d5b47a38aba115239c20448fc10bce5a1605f99951a303ba360456a54815ffc5346cdd97ddd08657df1881c97f79066e9e2bd075af542da +SHA512 (moby-27.5.0-vendor.tar.bz2) = 419eb5cc0c2d397ac2bc001d919890f22f6c90020d863afbfd86a338c267100d8e0d597ab0ddbf5da34814d242de09c116a55323ef742407aa76ed1c79445697 From f47c17fdacf747b73cba5f85269a40708e8a2b02 Mon Sep 17 00:00:00 2001 From: Bradley G Smith Date: Wed, 22 Jan 2025 13:16:15 -0800 Subject: [PATCH 129/163] Update to release v27.5.1 - Resolves rhbz#2340056 - Upstream fix and enhancement --- .gitignore | 4 ++++ moby-engine.spec | 2 +- sources | 8 ++++---- 3 files changed, 9 insertions(+), 5 deletions(-) diff --git a/.gitignore b/.gitignore index b85115b..158f3f4 100644 --- a/.gitignore +++ b/.gitignore @@ -105,3 +105,7 @@ moby-v20.10.10.tar.gz /cli-27.5.0-vendor.tar.bz2 /moby-27.5.0.tar.gz /moby-27.5.0-vendor.tar.bz2 +/cli-27.5.1.tar.gz +/cli-27.5.1-vendor.tar.bz2 +/moby-27.5.1.tar.gz +/moby-27.5.1-vendor.tar.bz2 diff --git a/moby-engine.spec b/moby-engine.spec index 2421b6a..d1dc62b 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.0 +%global version0 27.5.1 %global tag0 v%{gsub %{version0} ~ -} # https://github.com/docker/cli diff --git a/sources b/sources index 7d8f137..04ddca1 100644 --- a/sources +++ b/sources @@ -1,4 +1,4 @@ -SHA512 (cli-27.5.0.tar.gz) = 3c7c709f38fffd4d4e134d2abd7e6dc606e1cba765d36924a53f9470d6077be2282983eb23995bd56d772da253a69a854fe3112fea1a7ed2c9a1b70d2cc45b57 -SHA512 (cli-27.5.0-vendor.tar.bz2) = 9ed57d9fae0cfa099542e9b3a9079e7e3ab14329000d3e04550a83f7f70f17f21fbebe0814ddc6b09f8c91c1d4a7de0ef54969ee3c92c70b889cab55ba9a7764 -SHA512 (moby-27.5.0.tar.gz) = 89245805edebd7d43d5b47a38aba115239c20448fc10bce5a1605f99951a303ba360456a54815ffc5346cdd97ddd08657df1881c97f79066e9e2bd075af542da -SHA512 (moby-27.5.0-vendor.tar.bz2) = 419eb5cc0c2d397ac2bc001d919890f22f6c90020d863afbfd86a338c267100d8e0d597ab0ddbf5da34814d242de09c116a55323ef742407aa76ed1c79445697 +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 From 5ff1ceeb3f7b284eeac5101ebab95b186603e94b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Zbigniew=20J=C4=99drzejewski-Szmek?= Date: Tue, 11 Feb 2025 17:44:43 +0100 Subject: [PATCH 130/163] Drop call to %sysusers_create_compat After https://fedoraproject.org/wiki/Changes/RPMSuportForSystemdSysusers, rpm will handle account creation automatically. --- moby-engine.spec | 2 -- 1 file changed, 2 deletions(-) diff --git a/moby-engine.spec b/moby-engine.spec index d1dc62b..0dbf159 100644 --- a/moby-engine.spec +++ b/moby-engine.spec @@ -321,8 +321,6 @@ skiptest \ %endif -%pre -%sysusers_create_compat %{S:100} %post From d00a968edcd63325746247750d9df146f4fc6f04 Mon Sep 17 00:00:00 2001 From: Bradley G Smith Date: Thu, 20 Feb 2025 08:48:54 -0800 Subject: [PATCH 131/163] Update to v28.0.0 - Resolves: rhbz#2346768 - Upstream new features and fixes - man8 moved back to moby-engine in upstream - Two (2) tests added to skiptest but commented out. Needed when building in COPR for unknown reason --- .gitignore | 4 ++++ moby-engine.spec | 14 +++++++++++--- sources | 8 ++++---- 3 files changed, 19 insertions(+), 7 deletions(-) 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 From 455c8c486d252d399debe0036c004872fd6ab346 Mon Sep 17 00:00:00 2001 From: Bradley G Smith Date: Wed, 26 Feb 2025 07:13:46 -0800 Subject: [PATCH 132/163] Update to release v28.0.1 - Resolves rhbz#2348422 - Reverts several networking changes introduced in v28.0.0. - Additional fixes and new features. - See release notes at https://github.com/moby/moby/releases/tag/v28.0.1 Signed-off-by: Bradley G Smith --- .gitignore | 4 ++++ moby-engine.spec | 2 +- sources | 8 ++++---- 3 files changed, 9 insertions(+), 5 deletions(-) diff --git a/.gitignore b/.gitignore index bb3e060..09fa0cb 100644 --- a/.gitignore +++ b/.gitignore @@ -113,3 +113,7 @@ moby-v20.10.10.tar.gz /cli-28.0.0-vendor.tar.bz2 /moby-28.0.0.tar.gz /moby-28.0.0-vendor.tar.bz2 +/cli-28.0.1.tar.gz +/cli-28.0.1-vendor.tar.bz2 +/moby-28.0.1.tar.gz +/moby-28.0.1-vendor.tar.bz2 diff --git a/moby-engine.spec b/moby-engine.spec index e5b02bc..5a0b763 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 28.0.0 +%global version0 28.0.1 %global tag0 v%{gsub %{version0} ~ -} # https://github.com/docker/cli diff --git a/sources b/sources index b510c13..1280134 100644 --- a/sources +++ b/sources @@ -1,4 +1,4 @@ -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 +SHA512 (cli-28.0.1.tar.gz) = c3d7ca21b88c5f6925f6c99519a67581fd6c264cc96e6c0bc00751f87de6580a2d443cbe59b2e36771e37a78fe05ea054e292675e19bc4d73fcacfda047e0490 +SHA512 (cli-28.0.1-vendor.tar.bz2) = e7d5fd8dcb81978aa250629ddf806e721aacc042377dea429c10ae72315839885936e023e2af8be83e9c5478e33e3bef0846ce2b959eb6e27d0b7191a09f94a3 +SHA512 (moby-28.0.1.tar.gz) = 58c77ae139e5d32c4c263fa14ec4457f50240a15cd7934b4d2576af0295bfb5b62abbeef0ba78815f9041a01dbe3a8b35351eaebea1f584f54ef0d4192734048 +SHA512 (moby-28.0.1-vendor.tar.bz2) = d7c7f8f9fdfeb1c005b3f395942c34dde30a59b5ccebd07aec7642ca0d50fb541dc1e112b41e1ff779a852a5e9fc70d39dd23c7e70d49439ff3674b07580b05a From 08910c1c8e35ae9691a0afb2be3027d215a342d2 Mon Sep 17 00:00:00 2001 From: Bradley G Smith Date: Wed, 19 Mar 2025 10:04:20 -0700 Subject: [PATCH 133/163] Update to release v28.0.2 - Resolves: rhbz#2353390, rhbz#2353100 - Upstream fixes and feature updates Signed-off-by: Bradley G Smith --- .gitignore | 4 ++++ moby-engine.spec | 2 +- sources | 8 ++++---- 3 files changed, 9 insertions(+), 5 deletions(-) diff --git a/.gitignore b/.gitignore index 09fa0cb..247d802 100644 --- a/.gitignore +++ b/.gitignore @@ -117,3 +117,7 @@ moby-v20.10.10.tar.gz /cli-28.0.1-vendor.tar.bz2 /moby-28.0.1.tar.gz /moby-28.0.1-vendor.tar.bz2 +/cli-28.0.2-vendor.tar.bz2 +/cli-28.0.2.tar.gz +/moby-28.0.2-vendor.tar.bz2 +/moby-28.0.2.tar.gz diff --git a/moby-engine.spec b/moby-engine.spec index 5a0b763..748fcd7 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 28.0.1 +%global version0 28.0.2 %global tag0 v%{gsub %{version0} ~ -} # https://github.com/docker/cli diff --git a/sources b/sources index 1280134..02aebac 100644 --- a/sources +++ b/sources @@ -1,4 +1,4 @@ -SHA512 (cli-28.0.1.tar.gz) = c3d7ca21b88c5f6925f6c99519a67581fd6c264cc96e6c0bc00751f87de6580a2d443cbe59b2e36771e37a78fe05ea054e292675e19bc4d73fcacfda047e0490 -SHA512 (cli-28.0.1-vendor.tar.bz2) = e7d5fd8dcb81978aa250629ddf806e721aacc042377dea429c10ae72315839885936e023e2af8be83e9c5478e33e3bef0846ce2b959eb6e27d0b7191a09f94a3 -SHA512 (moby-28.0.1.tar.gz) = 58c77ae139e5d32c4c263fa14ec4457f50240a15cd7934b4d2576af0295bfb5b62abbeef0ba78815f9041a01dbe3a8b35351eaebea1f584f54ef0d4192734048 -SHA512 (moby-28.0.1-vendor.tar.bz2) = d7c7f8f9fdfeb1c005b3f395942c34dde30a59b5ccebd07aec7642ca0d50fb541dc1e112b41e1ff779a852a5e9fc70d39dd23c7e70d49439ff3674b07580b05a +SHA512 (cli-28.0.2-vendor.tar.bz2) = ae27df238332cc304198948d3edc4fef3bad29bddcefaaf24d80835039e4343fa14b8afbce438076fa8378201a61f219e6f1c4508d91c5e89a45047b20c960b2 +SHA512 (cli-28.0.2.tar.gz) = fbf6195bc1db025863c169fc8bd90de5bd481779406361f6a3fb6b539ead90acc349ff664ade4efc24c1a450d96c253688529917d1640da1979ae4426382d9fb +SHA512 (moby-28.0.2-vendor.tar.bz2) = 17d6cd4e3f03f3a2c73d8f241c6b3ca80fd5a2f532be7425873767d1b6d5454160cb8f770033e3b756b6b05ec39294cd64a54f934368d3356940c9b1f9616ca3 +SHA512 (moby-28.0.2.tar.gz) = 36c3d14a7fee86b46b1e62fc95e7a966c0c28e48d61f4bc42e5bf9d7b07af16ad2da1b9a414b06738182f194652980c57f08bf064f966bda427c2d2cf2a7e2a7 From fe720caaf7d4fca34018823b111950babbd68725 Mon Sep 17 00:00:00 2001 From: Maxwell G Date: Sat, 22 Mar 2025 21:44:57 -0500 Subject: [PATCH 134/163] mkvendor: verify and replace license expression --- mkvendor.sh | 28 +++++++++++++++++++++------- moby-engine.spec | 20 ++++++++++---------- 2 files changed, 31 insertions(+), 17 deletions(-) diff --git a/mkvendor.sh b/mkvendor.sh index d461575..8a2f297 100755 --- a/mkvendor.sh +++ b/mkvendor.sh @@ -4,9 +4,9 @@ set -euo pipefail # Source0: %{gosource0} -# Source1: %{gosource1} -# Source2: %{archivename0}-vendor.tar.bz2 -# Source3: %{archivename1}-vendor.tar.bz2 +# Source1: %{archivename0}-vendor.tar.bz2 +# Source2: %{gosource2} +# Source3: %{archivename2}-vendor.tar.bz2 sources=() while read -r source; do @@ -15,13 +15,27 @@ while read -r source; do done < <(spectool --sources ./*.spec) set -x +temp="$(mktemp -d)" +trap 'rm -rf $temp' EXIT +here="$(pwd)" # Retrieve Source0 and Source1 if not already present spectool -g -s 0,1 moby-engine.spec # (re)create vendor archives -go_vendor_archive create --config ./engine_go-vendor-tools.toml --idempotent \ - --output "${sources[2]}" "${sources[0]}" +config="${here}/engine_go-vendor-tools.toml" +go_vendor_archive create --config "${config}" --idempotent \ + --output "${sources[1]}" "${sources[0]}" +go_vendor_license --config "${config}" --path "moby-engine.spec" \ + report expression --update-spec -go_vendor_archive create --config ./cli_go-vendor-tools.toml --idempotent \ - --output "${sources[3]}" "${sources[1]}" +config="${here}/cli_go-vendor-tools.toml" +go_vendor_archive create --config "${config}" --idempotent \ + --output "${sources[3]}" "${sources[2]}" +mkdir -p "${temp}/cli" +cd "${temp}/cli" +tar xf "${here}/${sources[2]}" +cd ./* +tar xf "${here}/${sources[3]}" +expr="$(go_vendor_license --config "${config}" --path "." report expression)" +sed -i -E "s|(\%global cli_license).*|\1 ${expr}|" "${here}/moby-engine.spec" diff --git a/moby-engine.spec b/moby-engine.spec index 748fcd7..cf868d8 100644 --- a/moby-engine.spec +++ b/moby-engine.spec @@ -17,13 +17,13 @@ %global tag0 v%{gsub %{version0} ~ -} # https://github.com/docker/cli -%global goipath1 github.com/docker/cli -%global version1 %{version0} -%global tag1 %{tag0} +%global goipath2 github.com/docker/cli +%global version2 %{version0} +%global tag2 %{tag0} %gometa -L -a -f %global engine_dir ../%{topdir0} -%global cli_dir ../%{topdir1} +%global cli_dir ../%{topdir2} %global common_description %{expand: Docker is an open source project to build, ship and run any application as a @@ -45,13 +45,13 @@ Summary: The open-source application container engine # Generated with go-vendor-tools License: Apache-2.0 AND BSD-2-Clause AND BSD-3-Clause AND ISC AND MIT AND MPL-2.0 AND (Apache-2.0 OR GPL-2.0-or-later) URL: %{gourl} -Source0: %{gosource0} -Source1: %{gosource1} # We create our own vendor tarballs instead of using the built-in directoies. # This allows us to include the manpage build dependencies for docker-cli # and make any of our own changes to the deps included as necessary. -Source2: %{archivename0}-vendor.tar.bz2 -Source3: %{archivename1}-vendor.tar.bz2 +Source0: %{gosource0} +Source1: %{archivename0}-vendor.tar.bz2 +Source2: %{gosource2} +Source3: %{archivename2}-vendor.tar.bz2 Source100: moby-engine-systemd-sysusers.conf Source101: macros.moby @@ -171,7 +171,7 @@ This package provides RPM macros for the Moby/Docker stack. # moby-engine cd %{_builddir}/%{extractdir0} # Unpack vendor archive -%__rpmuncompress -x %{S:2} +%__rpmuncompress -x %{S:1} # Apply patches 0-1000 %autopatch -M999 -p1 cp -p %{S:100} %{S:101} %{S:102} . @@ -325,7 +325,7 @@ skiptest \ %dnl Test panics "TestRunAttachTermination" -%gocheck -z1 -t e2e +%gocheck -z2 -t e2e %endif From 45d40fa7a66df07b7f3be9cf779a9ca5c398f619 Mon Sep 17 00:00:00 2001 From: Maxwell G Date: Sun, 23 Mar 2025 00:42:23 -0500 Subject: [PATCH 135/163] Add missing licensing files not detected by trivy The absence of these licenses will become an error in the next version of go-vendor-tools. --- cli_go-vendor-tools.toml | 8 ++++++++ engine_go-vendor-tools.toml | 26 ++++++++++++++++++++++++-- 2 files changed, 32 insertions(+), 2 deletions(-) diff --git a/cli_go-vendor-tools.toml b/cli_go-vendor-tools.toml index 8b00d77..45516fc 100644 --- a/cli_go-vendor-tools.toml +++ b/cli_go-vendor-tools.toml @@ -10,6 +10,14 @@ exclude_files = [ path = "vendor/github.com/google/shlex/COPYING" sha256sum = "cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30" expression = "Apache-2.0" +[[licensing.licenses]] +path = "vendor/github.com/moby/sys/symlink/LICENSE.APACHE" +sha256sum = "e6abacaae15d29c132fc8688f098a3b9c89088bc434ea33992261e19e34e6723" +expression = "Apache-2.0" +[[licensing.licenses]] +path = "vendor/github.com/moby/sys/symlink/LICENSE.BSD" +sha256sum = "81205fa54813e578a0d361c671c21ae35ca5b1b575f39e82f5cdab68b8539a1d" +expression = "BSD-3-Clause" [archive] pre_commands = [ diff --git a/engine_go-vendor-tools.toml b/engine_go-vendor-tools.toml index 15c1e80..3ef42f1 100644 --- a/engine_go-vendor-tools.toml +++ b/engine_go-vendor-tools.toml @@ -10,12 +10,34 @@ exclude_files = [ path = "vendor/github.com/google/shlex/COPYING" sha256sum = "cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30" expression = "Apache-2.0" - [[licensing.licenses]] path = "vendor/github.com/spdx/tools-golang/LICENSE.code" sha256sum = "e914fb1f3927226e04b0438e0b541b3c6e3c65de4d64aa8f5cdaa803f05448fd" expression = "Apache-2.0 OR GPL-2.0-or-later" - +[[licensing.licenses]] +path = "internal/test/suite/testify.LICENSE" +sha256sum = "dad2b0b2cc2dbdbf95ad5d800ef7588956e74dc2479014829d42be295125c25d" +expression = "MIT" +[[licensing.licenses]] +path = "vendor/github.com/miekg/dns/COPYRIGHT" +sha256sum = "66550c0ad5ca7ec1e08683e5f872cc45c741f311eee3b8ee484206ecbf9c740d" +expression = "BSD-3-Clause" +[[licensing.licenses]] +path = "vendor/github.com/moby/sys/symlink/LICENSE.APACHE" +sha256sum = "e6abacaae15d29c132fc8688f098a3b9c89088bc434ea33992261e19e34e6723" +expression = "Apache-2.0" +[[licensing.licenses]] +path = "vendor/github.com/moby/sys/symlink/LICENSE.BSD" +sha256sum = "81205fa54813e578a0d361c671c21ae35ca5b1b575f39e82f5cdab68b8539a1d" +expression = "BSD-3-Clause" +[[licensing.licenses]] +path = "vendor/github.com/shibumi/go-pathspec/GO-LICENSE" +sha256sum = "dd26a7abddd02e2d0aba97805b31f248ef7835d9e10da289b22e3b8ab78b324d" +expression = "BSD-3-Clause" +[[licensing.licenses]] +path = "vendor/sigs.k8s.io/yaml/goyaml.v2/LICENSE.libyaml" +sha256sum = "a94710b55e03b5285f77d048c5ba61bb9d6ee04a06c0eb90e68821e11b0c707a" +expression = "MIT" [archive] pre_commands = [ # This project has a setup where go.mod and go.sum are not always present. From f6b57cedf4fc797c76b97fb1baae9814351dbfda Mon Sep 17 00:00:00 2001 From: Maxwell G Date: Sun, 23 Mar 2025 12:30:26 -0500 Subject: [PATCH 136/163] engine_go-vendor-tools: exclude LICENSE.macros This file only applies to the macros subpackage. [skip changelog] --- engine_go-vendor-tools.toml | 1 + 1 file changed, 1 insertion(+) diff --git a/engine_go-vendor-tools.toml b/engine_go-vendor-tools.toml index 3ef42f1..3688c12 100644 --- a/engine_go-vendor-tools.toml +++ b/engine_go-vendor-tools.toml @@ -4,6 +4,7 @@ exclude_files = [ "vendor/go.opentelemetry.io/otel/get_main_pkgs.sh", "vendor/go.opentelemetry.io/otel/verify_examples.sh", "vendor/google.golang.org/grpc/regenerate.sh", + "LICENSE.macros", ] [[licensing.licenses]] From ddb5895da2dd2e781482950fd1a68edfed788a57 Mon Sep 17 00:00:00 2001 From: Maxwell G Date: Thu, 27 Mar 2025 11:53:54 -0500 Subject: [PATCH 137/163] Update to 28.0.4. Fixes rhbz#2354877. * Remove the manpage patch, as upstream changes rendered it unnecessary. --- .gitignore | 4 ++ ...st-generate-man-for-Fedora-build-env.patch | 62 ------------------- cli_go-vendor-tools.toml | 3 - mkvendor.sh | 4 +- moby-engine.spec | 8 ++- sources | 8 +-- 6 files changed, 16 insertions(+), 73 deletions(-) delete mode 100644 0001-scripts-adjust-generate-man-for-Fedora-build-env.patch diff --git a/.gitignore b/.gitignore index 247d802..68b5004 100644 --- a/.gitignore +++ b/.gitignore @@ -121,3 +121,7 @@ moby-v20.10.10.tar.gz /cli-28.0.2.tar.gz /moby-28.0.2-vendor.tar.bz2 /moby-28.0.2.tar.gz +/moby-28.0.4.tar.gz +/moby-28.0.4-vendor.tar.bz2 +/cli-28.0.4.tar.gz +/cli-28.0.4-vendor.tar.bz2 diff --git a/0001-scripts-adjust-generate-man-for-Fedora-build-env.patch b/0001-scripts-adjust-generate-man-for-Fedora-build-env.patch deleted file mode 100644 index 216327a..0000000 --- a/0001-scripts-adjust-generate-man-for-Fedora-build-env.patch +++ /dev/null @@ -1,62 +0,0 @@ -From d51def98a5f42620275c3e45eca98b4d07f8786c Mon Sep 17 00:00:00 2001 -From: Maxwell G -Date: Fri, 15 Mar 2024 20:24:28 +0000 -Subject: [PATCH] scripts: adjust generate-man for Fedora build env - ---- - scripts/docs/generate-man.sh | 31 +++++-------------------------- - 1 file changed, 5 insertions(+), 26 deletions(-) - -diff --git a/scripts/docs/generate-man.sh b/scripts/docs/generate-man.sh -index 12a4b81..d4798ce 100755 ---- a/scripts/docs/generate-man.sh -+++ b/scripts/docs/generate-man.sh -@@ -6,33 +6,12 @@ set -eu - - export GO111MODULE=auto - --function clean { -- rm -rf "$buildir" --} -- --buildir=$(mktemp -d -t docker-cli-docsgen.XXXXXXXXXX) --trap clean EXIT -- --( -- set -x -- cp -r . "$buildir/" -- cd "$buildir" -- # init dummy go.mod -- ./scripts/vendor init -- # install go-md2man and copy man/tools.go in root folder -- # to be able to fetch the required dependencies -- go mod edit -modfile=vendor.mod -require=github.com/cpuguy83/go-md2man/v2@${MD2MAN_VERSION} -- cp man/tools.go . -- # update vendor -- ./scripts/vendor update -- # build gen-manpages -- go build -mod=vendor -modfile=vendor.mod -tags manpages -o /tmp/gen-manpages ./man/generate.go -- # build go-md2man -- go build -mod=vendor -modfile=vendor.mod -o /tmp/go-md2man ./vendor/github.com/cpuguy83/go-md2man/v2 --) -+# Remove dummy go.mod. -+rm -f man/go.mod -+go build -tags manpages -o gen-manpages ./man/generate.go - - mkdir -p man/man1 --(set -x ; /tmp/gen-manpages --root "." --target "$(pwd)/man/man1") -+(set -x ; ./gen-manpages --root "." --target "$(pwd)/man/man1") - - ( - cd man -@@ -45,6 +24,6 @@ mkdir -p man/man1 - continue - fi - mkdir -p "./man${num}" -- (set -x ; /tmp/go-md2man -in "$FILE" -out "./man${num}/${name}") -+ (set -x ; go-md2man -in "$FILE" -out "./man${num}/${name}") - done - ) --- -2.44.0 - diff --git a/cli_go-vendor-tools.toml b/cli_go-vendor-tools.toml index 45516fc..d1c680b 100644 --- a/cli_go-vendor-tools.toml +++ b/cli_go-vendor-tools.toml @@ -21,9 +21,6 @@ expression = "BSD-3-Clause" [archive] pre_commands = [ - # Remove dummy go.mod so the docs dependencies are included in the vendor - # tarball - ["rm", "man/go.mod"], # This project has a setup where go.mod and go.sum are not always present. # We write those files manually. ["cp", "-p", "vendor.mod", "go.mod"], diff --git a/mkvendor.sh b/mkvendor.sh index 8a2f297..9038dda 100755 --- a/mkvendor.sh +++ b/mkvendor.sh @@ -19,8 +19,8 @@ temp="$(mktemp -d)" trap 'rm -rf $temp' EXIT here="$(pwd)" -# Retrieve Source0 and Source1 if not already present -spectool -g -s 0,1 moby-engine.spec +# Retrieve remote sources +spectool -g moby-engine.spec # (re)create vendor archives config="${here}/engine_go-vendor-tools.toml" diff --git a/moby-engine.spec b/moby-engine.spec index cf868d8..127d1ae 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 28.0.2 +%global version0 28.0.4 %global tag0 v%{gsub %{version0} ~ -} # https://github.com/docker/cli @@ -60,9 +60,11 @@ Source102: LICENSE.macros Source200: engine_go-vendor-tools.toml Source201: cli_go-vendor-tools.toml +# Patches 0-999 are for moby/moby Patch0: 0001-systemd-adjust-docker.service-for-downstream.patch -Patch1000: 0001-scripts-adjust-generate-man-for-Fedora-build-env.patch +# Patches 1000+ are for docker/cli +# Patch1000: BuildRequires: git-core BuildRequires: go-vendor-tools @@ -173,6 +175,7 @@ cd %{_builddir}/%{extractdir0} # Unpack vendor archive %__rpmuncompress -x %{S:1} # Apply patches 0-1000 +# Leave this here despite warnings so we can easily add and remove patches. %autopatch -M999 -p1 cp -p %{S:100} %{S:101} %{S:102} . # See comment in go-vendor-tools.toml @@ -184,6 +187,7 @@ cd %{cli_dir} # Unpack vendor archive %__rpmuncompress -x %{S:3} # Apply patches 1000+. +# Leave this here despite warnings so we can easily add and remove patches. %autopatch -m1000 -p1 # See comment in go-vendor-tools.toml cp go.mod vendor.mod diff --git a/sources b/sources index 02aebac..b263369 100644 --- a/sources +++ b/sources @@ -1,4 +1,4 @@ -SHA512 (cli-28.0.2-vendor.tar.bz2) = ae27df238332cc304198948d3edc4fef3bad29bddcefaaf24d80835039e4343fa14b8afbce438076fa8378201a61f219e6f1c4508d91c5e89a45047b20c960b2 -SHA512 (cli-28.0.2.tar.gz) = fbf6195bc1db025863c169fc8bd90de5bd481779406361f6a3fb6b539ead90acc349ff664ade4efc24c1a450d96c253688529917d1640da1979ae4426382d9fb -SHA512 (moby-28.0.2-vendor.tar.bz2) = 17d6cd4e3f03f3a2c73d8f241c6b3ca80fd5a2f532be7425873767d1b6d5454160cb8f770033e3b756b6b05ec39294cd64a54f934368d3356940c9b1f9616ca3 -SHA512 (moby-28.0.2.tar.gz) = 36c3d14a7fee86b46b1e62fc95e7a966c0c28e48d61f4bc42e5bf9d7b07af16ad2da1b9a414b06738182f194652980c57f08bf064f966bda427c2d2cf2a7e2a7 +SHA512 (moby-28.0.4.tar.gz) = dfa6bc18c7cecf82c80e45c6a615e0cccb866a993ad2b6c3134e0f0d5d069b5abb0b8201029019a5396353f666252b5fd36b6a34080723af46291d3fda1c2608 +SHA512 (moby-28.0.4-vendor.tar.bz2) = fda513701e3ac12882f1d8be1e8f89aed5f6900b1f37878f6129d2c2e48d0e20df2f655c1a80438ed193d0789ae8d62c639bb17e2256a3e5d8e622a08dc4d1e0 +SHA512 (cli-28.0.4.tar.gz) = fd7562815686fece20a0ea95501612e049e90192305464b06770643ae864baa87b0fb87fddadeb4f9beb33352940cef63ffd24af8b989e309cd5be5f32eddf62 +SHA512 (cli-28.0.4-vendor.tar.bz2) = a8b1860f0e30b16b6705d11bba94d3a1036c66dea794ce7adcab62bb4ea2c76468f018e63c08fd250755a9373f8137b5edcb97c89b744a01c73338086f9c050e From e2ee0ce1c1dcf11fc60c0a8564838923c803a4cc Mon Sep 17 00:00:00 2001 From: Bradley G Smith Date: Fri, 18 Apr 2025 07:38:21 -0700 Subject: [PATCH 138/163] Update to release v28.1.1 - Resolves rhbz#2360751 - Upstream new features and fixes --- .gitignore | 4 ++++ moby-engine.spec | 2 +- sources | 8 ++++---- 3 files changed, 9 insertions(+), 5 deletions(-) diff --git a/.gitignore b/.gitignore index 68b5004..f1a4e9e 100644 --- a/.gitignore +++ b/.gitignore @@ -125,3 +125,7 @@ moby-v20.10.10.tar.gz /moby-28.0.4-vendor.tar.bz2 /cli-28.0.4.tar.gz /cli-28.0.4-vendor.tar.bz2 +/cli-28.1.1.tar.gz +/cli-28.1.1-vendor.tar.bz2 +/moby-28.1.1.tar.gz +/moby-28.1.1-vendor.tar.bz2 diff --git a/moby-engine.spec b/moby-engine.spec index 127d1ae..1c1df94 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 28.0.4 +%global version0 28.1.1 %global tag0 v%{gsub %{version0} ~ -} # https://github.com/docker/cli diff --git a/sources b/sources index b263369..ee04018 100644 --- a/sources +++ b/sources @@ -1,4 +1,4 @@ -SHA512 (moby-28.0.4.tar.gz) = dfa6bc18c7cecf82c80e45c6a615e0cccb866a993ad2b6c3134e0f0d5d069b5abb0b8201029019a5396353f666252b5fd36b6a34080723af46291d3fda1c2608 -SHA512 (moby-28.0.4-vendor.tar.bz2) = fda513701e3ac12882f1d8be1e8f89aed5f6900b1f37878f6129d2c2e48d0e20df2f655c1a80438ed193d0789ae8d62c639bb17e2256a3e5d8e622a08dc4d1e0 -SHA512 (cli-28.0.4.tar.gz) = fd7562815686fece20a0ea95501612e049e90192305464b06770643ae864baa87b0fb87fddadeb4f9beb33352940cef63ffd24af8b989e309cd5be5f32eddf62 -SHA512 (cli-28.0.4-vendor.tar.bz2) = a8b1860f0e30b16b6705d11bba94d3a1036c66dea794ce7adcab62bb4ea2c76468f018e63c08fd250755a9373f8137b5edcb97c89b744a01c73338086f9c050e +SHA512 (cli-28.1.1.tar.gz) = 39ff5f982779b70311d4fce5f829e52199b058cedf92c0e650786a52004edbf3935f8673db98527affc57f0e33be435f8a8af624c2e06f28c7f8f405ed570746 +SHA512 (cli-28.1.1-vendor.tar.bz2) = 422c791e6d8eb316c72341ea8f5c8c2026b00b76a8f5a16214d123949f487c4a87b017fa5f19512b5fa6a29e310c1e26d54fd1112a7c6d5b2f327ed1e3e6c140 +SHA512 (moby-28.1.1.tar.gz) = 15de0a10dc9d60be5c6047a30be5065ee69b9cde938654363cd27d71103057cc78510f546f7b161ba5f0b8b764dc6167e4ffebbcc9e69b171fe49ee1e09e97b2 +SHA512 (moby-28.1.1-vendor.tar.bz2) = 8094d9495786e4c1ee5e49049be2c718fb852523743e4890eeae8849d74ecde89b778a343bbe4abf79d0fac2e0f734872d1124efab60e49a67f807876d8a9511 From 3b50193bfb65ced16b7ab9794ec15cf19762569d Mon Sep 17 00:00:00 2001 From: Bradley G Smith Date: Tue, 22 Apr 2025 14:36:29 -0700 Subject: [PATCH 139/163] Build with go1.24.2-2 From 7e1008f130133cca1ae08aeb20037a4c6d99b82e Mon Sep 17 00:00:00 2001 From: Bradley G Smith Date: Tue, 22 Apr 2025 14:38:10 -0700 Subject: [PATCH 140/163] Build with go1.24.2-2 From 432919d5aaf1ccccd5d1f0e44bf5912e1b671a87 Mon Sep 17 00:00:00 2001 From: Bradley G Smith Date: Tue, 22 Apr 2025 19:30:25 -0700 Subject: [PATCH 141/163] Update license information - Resolves invalid license information --- cli_go-vendor-tools.toml | 19 ++++++++++++++----- engine_go-vendor-tools.toml | 31 +++++++++++++++++++++++++++++++ 2 files changed, 45 insertions(+), 5 deletions(-) diff --git a/cli_go-vendor-tools.toml b/cli_go-vendor-tools.toml index 8b00d77..9dbb274 100644 --- a/cli_go-vendor-tools.toml +++ b/cli_go-vendor-tools.toml @@ -1,16 +1,25 @@ [licensing] detector = "trivy" -exclude_files = [ - "vendor/go.opentelemetry.io/otel/get_main_pkgs.sh", - "vendor/go.opentelemetry.io/otel/verify_examples.sh", - "vendor/google.golang.org/grpc/regenerate.sh", -] [[licensing.licenses]] path = "vendor/github.com/google/shlex/COPYING" sha256sum = "cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30" expression = "Apache-2.0" +[[licensing.licenses]] +path = "vendor/github.com/moby/sys/symlink/LICENSE.APACHE" +sha256sum = "e6abacaae15d29c132fc8688f098a3b9c89088bc434ea33992261e19e34e6723" +expression = "Apache-2.0" + +[[licensing.licenses]] +path = "vendor/github.com/moby/sys/symlink/LICENSE.BSD" +sha256sum = "81205fa54813e578a0d361c671c21ae35ca5b1b575f39e82f5cdab68b8539a1d" +expression = "BSD-3-Clause" + +[[licensing.licenses]] +path = "vendor/gopkg.in/yaml.v2/LICENSE.libyaml" +sha256sum = "a94710b55e03b5285f77d048c5ba61bb9d6ee04a06c0eb90e68821e11b0c707a" +expression = "MIT" [archive] pre_commands = [ # Remove dummy go.mod so the docs dependencies are included in the vendor diff --git a/engine_go-vendor-tools.toml b/engine_go-vendor-tools.toml index 15c1e80..444c682 100644 --- a/engine_go-vendor-tools.toml +++ b/engine_go-vendor-tools.toml @@ -4,6 +4,7 @@ exclude_files = [ "vendor/go.opentelemetry.io/otel/get_main_pkgs.sh", "vendor/go.opentelemetry.io/otel/verify_examples.sh", "vendor/google.golang.org/grpc/regenerate.sh", + "LICENSE.macros", ] [[licensing.licenses]] @@ -16,6 +17,36 @@ path = "vendor/github.com/spdx/tools-golang/LICENSE.code" sha256sum = "e914fb1f3927226e04b0438e0b541b3c6e3c65de4d64aa8f5cdaa803f05448fd" expression = "Apache-2.0 OR GPL-2.0-or-later" +[[licensing.licenses]] +path = "internal/test/suite/testify.LICENSE" +sha256sum = "dad2b0b2cc2dbdbf95ad5d800ef7588956e74dc2479014829d42be295125c25d" +expression = "MIT" + +[[licensing.licenses]] +path = "vendor/github.com/miekg/dns/COPYRIGHT" +sha256sum = "66550c0ad5ca7ec1e08683e5f872cc45c741f311eee3b8ee484206ecbf9c740d" +expression = "MIT" + +[[licensing.licenses]] +path = "vendor/github.com/moby/sys/symlink/LICENSE.APACHE" +sha256sum = "e6abacaae15d29c132fc8688f098a3b9c89088bc434ea33992261e19e34e6723" +expression = "Apache-2.0" + +[[licensing.licenses]] +path = "vendor/github.com/moby/sys/symlink/LICENSE.BSD" +sha256sum = "81205fa54813e578a0d361c671c21ae35ca5b1b575f39e82f5cdab68b8539a1d" +expression = "BSD-3-Clause" + +[[licensing.licenses]] +path = "vendor/github.com/shibumi/go-pathspec/GO-LICENSE" +sha256sum = "dd26a7abddd02e2d0aba97805b31f248ef7835d9e10da289b22e3b8ab78b324d" +expression = "Apache-2.0" + +[[licensing.licenses]] +path = "vendor/sigs.k8s.io/yaml/goyaml.v2/LICENSE.libyaml" +sha256sum = "a94710b55e03b5285f77d048c5ba61bb9d6ee04a06c0eb90e68821e11b0c707a" +expression = "MIT" + [archive] pre_commands = [ # This project has a setup where go.mod and go.sum are not always present. From 2794c7aafca3796977888123e3340ae95d0fd3c8 Mon Sep 17 00:00:00 2001 From: Bradley G Smith Date: Fri, 30 May 2025 08:16:05 -0700 Subject: [PATCH 142/163] Update to release v28.2.1 - Resolves: rhbz#2369024, rhbz#2354429, rhbz#2353100 - V28.2.1 contains regression fix - V28.2.0 has new features and fixes - Reconcile all branches for possible packit integration --- .gitignore | 7 +++++++ moby-engine.spec | 6 ++++-- sources | 8 ++++---- 3 files changed, 15 insertions(+), 6 deletions(-) diff --git a/.gitignore b/.gitignore index f1a4e9e..30af250 100644 --- a/.gitignore +++ b/.gitignore @@ -2,6 +2,9 @@ /moby-*/ /cli-*/ +# Ignore fedpkg mockbuild artifacts +/results_* + /2d0083d657f82c47044c8d3948ba434b622fe2fd.tar.gz /425e105d5a03fabd737a126ad93d62a9eeede87f.tar.gz /894b81a4b802e4eb2a91d1ce216b8817763c29fb.tar.gz @@ -129,3 +132,7 @@ moby-v20.10.10.tar.gz /cli-28.1.1-vendor.tar.bz2 /moby-28.1.1.tar.gz /moby-28.1.1-vendor.tar.bz2 +/cli-28.2.1.tar.gz +/cli-28.2.1-vendor.tar.bz2 +/moby-28.2.1.tar.gz +/moby-28.2.1-vendor.tar.bz2 diff --git a/moby-engine.spec b/moby-engine.spec index 1c1df94..9ef2d92 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 28.1.1 +%global version0 28.2.1 %global tag0 v%{gsub %{version0} ~ -} # https://github.com/docker/cli @@ -327,7 +327,9 @@ skiptest \ %dnl Test is flaky "TestConnectAndWait" \ %dnl Test panics - "TestRunAttachTermination" + "TestRunAttachTermination" \ + "TestUpgradePromptTermination" + %dnl Unknown test failure %gocheck -z2 -t e2e %endif diff --git a/sources b/sources index ee04018..dc5e070 100644 --- a/sources +++ b/sources @@ -1,4 +1,4 @@ -SHA512 (cli-28.1.1.tar.gz) = 39ff5f982779b70311d4fce5f829e52199b058cedf92c0e650786a52004edbf3935f8673db98527affc57f0e33be435f8a8af624c2e06f28c7f8f405ed570746 -SHA512 (cli-28.1.1-vendor.tar.bz2) = 422c791e6d8eb316c72341ea8f5c8c2026b00b76a8f5a16214d123949f487c4a87b017fa5f19512b5fa6a29e310c1e26d54fd1112a7c6d5b2f327ed1e3e6c140 -SHA512 (moby-28.1.1.tar.gz) = 15de0a10dc9d60be5c6047a30be5065ee69b9cde938654363cd27d71103057cc78510f546f7b161ba5f0b8b764dc6167e4ffebbcc9e69b171fe49ee1e09e97b2 -SHA512 (moby-28.1.1-vendor.tar.bz2) = 8094d9495786e4c1ee5e49049be2c718fb852523743e4890eeae8849d74ecde89b778a343bbe4abf79d0fac2e0f734872d1124efab60e49a67f807876d8a9511 +SHA512 (cli-28.2.1.tar.gz) = 1cbd48cff3bc3368b683f316fcac208d53fccff96d522912aa7469489fe9b7714ba4e178f1f735cc3ff3beb3312ea9438a9fe6c3eb294196e18218288cfedb53 +SHA512 (cli-28.2.1-vendor.tar.bz2) = f4f23288b07fe27e6bae71f7d7b3538917911087046f14a58d3646063bce2205c4844a61c8c0f1512d116faa7d5ec4cb0bab9d3bf62f3f4cee3049a09a8b7de0 +SHA512 (moby-28.2.1.tar.gz) = 98072bbcfaa31ed5d54c96a7ac7cb847c82b09818cdc01324e24b1f04715c17e8b41ea1046401f70fd0e10c16ce9156f107104265d67088865a4bd79eb00561a +SHA512 (moby-28.2.1-vendor.tar.bz2) = 509856466c5d43a3a65ccd80d86324ea28432ae6c679d418055dab1b1de07856c1eaf332be8d85e04a23adc8088696f8189adfbf44378c17e94bb97ce2819945 From d0e27728ef49b8c835fd4dc979956ac11a3a1a2d Mon Sep 17 00:00:00 2001 From: Bradley G Smith Date: Fri, 30 May 2025 15:22:59 -0700 Subject: [PATCH 143/163] Update to release v28.2.2 - Resolves: rhbz # 2369024 - Upstream regression fixes --- .gitignore | 4 ++++ moby-engine.spec | 3 ++- sources | 8 ++++---- 3 files changed, 10 insertions(+), 5 deletions(-) diff --git a/.gitignore b/.gitignore index 30af250..471fa13 100644 --- a/.gitignore +++ b/.gitignore @@ -136,3 +136,7 @@ moby-v20.10.10.tar.gz /cli-28.2.1-vendor.tar.bz2 /moby-28.2.1.tar.gz /moby-28.2.1-vendor.tar.bz2 +/cli-28.2.2-vendor.tar.bz2 +/cli-28.2.2.tar.gz +/moby-28.2.2-vendor.tar.bz2 +/moby-28.2.2.tar.gz diff --git a/moby-engine.spec b/moby-engine.spec index 9ef2d92..05d0e3b 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 28.2.1 +%global version0 28.2.2 %global tag0 v%{gsub %{version0} ~ -} # https://github.com/docker/cli @@ -328,6 +328,7 @@ skiptest \ "TestConnectAndWait" \ %dnl Test panics "TestRunAttachTermination" \ + "TestRunPullTermination" \ "TestUpgradePromptTermination" %dnl Unknown test failure diff --git a/sources b/sources index dc5e070..e19a51d 100644 --- a/sources +++ b/sources @@ -1,4 +1,4 @@ -SHA512 (cli-28.2.1.tar.gz) = 1cbd48cff3bc3368b683f316fcac208d53fccff96d522912aa7469489fe9b7714ba4e178f1f735cc3ff3beb3312ea9438a9fe6c3eb294196e18218288cfedb53 -SHA512 (cli-28.2.1-vendor.tar.bz2) = f4f23288b07fe27e6bae71f7d7b3538917911087046f14a58d3646063bce2205c4844a61c8c0f1512d116faa7d5ec4cb0bab9d3bf62f3f4cee3049a09a8b7de0 -SHA512 (moby-28.2.1.tar.gz) = 98072bbcfaa31ed5d54c96a7ac7cb847c82b09818cdc01324e24b1f04715c17e8b41ea1046401f70fd0e10c16ce9156f107104265d67088865a4bd79eb00561a -SHA512 (moby-28.2.1-vendor.tar.bz2) = 509856466c5d43a3a65ccd80d86324ea28432ae6c679d418055dab1b1de07856c1eaf332be8d85e04a23adc8088696f8189adfbf44378c17e94bb97ce2819945 +SHA512 (cli-28.2.2-vendor.tar.bz2) = ccd84339a2952579173376c19076f6b703e983ee59238037879720f80117e9bdbbbcb2ecbbb46a8e8a00633b720a4d6cc10234fe316b5029c2df5dc4303417ce +SHA512 (cli-28.2.2.tar.gz) = 1ba62398322c65e6994c0c6821b912c9a9b215083593d63557c5255064c407bd25f72044336ebb19977fe6d03215ec47174c6617890a817b9e34ed010535fb6b +SHA512 (moby-28.2.2-vendor.tar.bz2) = 509856466c5d43a3a65ccd80d86324ea28432ae6c679d418055dab1b1de07856c1eaf332be8d85e04a23adc8088696f8189adfbf44378c17e94bb97ce2819945 +SHA512 (moby-28.2.2.tar.gz) = e63ce38bb7badb01de918f678ad9fb216b279170177fe7d7c4120c8a1196add485cc974f9dff239a274220ebab60a2dc6852f07dc2ddafe8cec07c65dbd19a49 From 7ce52976dee1b3738c2257621af4ddb156db6385 Mon Sep 17 00:00:00 2001 From: Bradley G Smith Date: Wed, 25 Jun 2025 07:33:59 -0700 Subject: [PATCH 144/163] Update to release v28.3.0 - Resolves: rhbz#2374709 - Upstream fixes and enhancements --- .gitignore | 4 ++++ moby-engine.spec | 2 +- sources | 8 ++++---- 3 files changed, 9 insertions(+), 5 deletions(-) diff --git a/.gitignore b/.gitignore index 471fa13..4daa8c9 100644 --- a/.gitignore +++ b/.gitignore @@ -140,3 +140,7 @@ moby-v20.10.10.tar.gz /cli-28.2.2.tar.gz /moby-28.2.2-vendor.tar.bz2 /moby-28.2.2.tar.gz +/cli-28.3.0-vendor.tar.bz2 +/cli-28.3.0.tar.gz +/moby-28.3.0-vendor.tar.bz2 +/moby-28.3.0.tar.gz diff --git a/moby-engine.spec b/moby-engine.spec index 05d0e3b..258ba42 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 28.2.2 +%global version0 28.3.0 %global tag0 v%{gsub %{version0} ~ -} # https://github.com/docker/cli diff --git a/sources b/sources index e19a51d..5b5a64c 100644 --- a/sources +++ b/sources @@ -1,4 +1,4 @@ -SHA512 (cli-28.2.2-vendor.tar.bz2) = ccd84339a2952579173376c19076f6b703e983ee59238037879720f80117e9bdbbbcb2ecbbb46a8e8a00633b720a4d6cc10234fe316b5029c2df5dc4303417ce -SHA512 (cli-28.2.2.tar.gz) = 1ba62398322c65e6994c0c6821b912c9a9b215083593d63557c5255064c407bd25f72044336ebb19977fe6d03215ec47174c6617890a817b9e34ed010535fb6b -SHA512 (moby-28.2.2-vendor.tar.bz2) = 509856466c5d43a3a65ccd80d86324ea28432ae6c679d418055dab1b1de07856c1eaf332be8d85e04a23adc8088696f8189adfbf44378c17e94bb97ce2819945 -SHA512 (moby-28.2.2.tar.gz) = e63ce38bb7badb01de918f678ad9fb216b279170177fe7d7c4120c8a1196add485cc974f9dff239a274220ebab60a2dc6852f07dc2ddafe8cec07c65dbd19a49 +SHA512 (cli-28.3.0-vendor.tar.bz2) = 14ad3cad1f67778a802d31c229764a0a151e98f18e3b6ab20f89498e38846ebb73f1f71bd8bfc460594b70ec87de7673d09296c4cdc4fa26941328689f628b24 +SHA512 (cli-28.3.0.tar.gz) = e08f9f65f33b281b0b1c41b6ad1478b10e883c08c5228079fdea4d4a77746e5fbe48439db642d29a04b484a36bceb87f380e423d458db7729c06edb24877f8f7 +SHA512 (moby-28.3.0-vendor.tar.bz2) = 555c1be8f1aa3255718588aaec1304a3dd8dc3faaf072f11da10d4a4f2f4ef3dc450a48b2f481c307c7b965d5f340629e45aed490f00c29f71ed7e6b7ff70e4a +SHA512 (moby-28.3.0.tar.gz) = e4dc18b9623ff7e177c17e55aca5bfeea484ec943da59c84096c8efc8f71212d6e10ea2a0c422031f40bd889f5f9fb635cb02fd1e70726c09d832ccb9267102a From 975fd7b43baecb2ef43b3534a089fa22805bdfe4 Mon Sep 17 00:00:00 2001 From: Bradley G Smith Date: Fri, 4 Jul 2025 13:56:12 -0700 Subject: [PATCH 145/163] Update to v28.3.1 - Resolves: rhbz#2376016 - Upstream fixes --- .gitignore | 4 ++++ moby-engine.spec | 2 +- sources | 8 ++++---- 3 files changed, 9 insertions(+), 5 deletions(-) diff --git a/.gitignore b/.gitignore index 4daa8c9..b5ec4db 100644 --- a/.gitignore +++ b/.gitignore @@ -144,3 +144,7 @@ moby-v20.10.10.tar.gz /cli-28.3.0.tar.gz /moby-28.3.0-vendor.tar.bz2 /moby-28.3.0.tar.gz +/cli-28.3.1.tar.gz +/cli-28.3.1-vendor.tar.bz2 +/moby-28.3.1.tar.gz +/moby-28.3.1-vendor.tar.bz2 diff --git a/moby-engine.spec b/moby-engine.spec index 258ba42..77ad90e 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 28.3.0 +%global version0 28.3.1 %global tag0 v%{gsub %{version0} ~ -} # https://github.com/docker/cli diff --git a/sources b/sources index 5b5a64c..bc6612c 100644 --- a/sources +++ b/sources @@ -1,4 +1,4 @@ -SHA512 (cli-28.3.0-vendor.tar.bz2) = 14ad3cad1f67778a802d31c229764a0a151e98f18e3b6ab20f89498e38846ebb73f1f71bd8bfc460594b70ec87de7673d09296c4cdc4fa26941328689f628b24 -SHA512 (cli-28.3.0.tar.gz) = e08f9f65f33b281b0b1c41b6ad1478b10e883c08c5228079fdea4d4a77746e5fbe48439db642d29a04b484a36bceb87f380e423d458db7729c06edb24877f8f7 -SHA512 (moby-28.3.0-vendor.tar.bz2) = 555c1be8f1aa3255718588aaec1304a3dd8dc3faaf072f11da10d4a4f2f4ef3dc450a48b2f481c307c7b965d5f340629e45aed490f00c29f71ed7e6b7ff70e4a -SHA512 (moby-28.3.0.tar.gz) = e4dc18b9623ff7e177c17e55aca5bfeea484ec943da59c84096c8efc8f71212d6e10ea2a0c422031f40bd889f5f9fb635cb02fd1e70726c09d832ccb9267102a +SHA512 (cli-28.3.1.tar.gz) = 723796834664f2805484d9e3f00ec3fbf70f5dcc9d736c78fc04be90186dc076af5274345d0740dfc896951a1dcb86199f8bb6989f009fe41e5ac9835f911ca8 +SHA512 (cli-28.3.1-vendor.tar.bz2) = 14ad3cad1f67778a802d31c229764a0a151e98f18e3b6ab20f89498e38846ebb73f1f71bd8bfc460594b70ec87de7673d09296c4cdc4fa26941328689f628b24 +SHA512 (moby-28.3.1.tar.gz) = 02b352ab43e165527df247faf0751b2bda9e2239b9dac0307391e744df0224677c36d036608574fb888f814ec38050f6ead66edde2ab6645f77f20b95bc77fa7 +SHA512 (moby-28.3.1-vendor.tar.bz2) = 07364f8e866bcd8f08d628c723f82a2fc61437a0e20397eb7318695fc03826514b2033f7bedfbe50e6a1124c11f576fbde2a750bdf44a6c667ab9f3cb38bf267 From 5fd321035345a5c51ed1adaa03c0bef5f5d78ef7 Mon Sep 17 00:00:00 2001 From: Bradley G Smith Date: Wed, 9 Jul 2025 15:27:40 -0700 Subject: [PATCH 146/163] Update to release v28.3.2 - Resolves: rhbz#2379088 - Upstream fixes and improvements --- .gitignore | 4 ++++ moby-engine.spec | 2 +- sources | 8 ++++---- 3 files changed, 9 insertions(+), 5 deletions(-) diff --git a/.gitignore b/.gitignore index b5ec4db..da9af05 100644 --- a/.gitignore +++ b/.gitignore @@ -148,3 +148,7 @@ moby-v20.10.10.tar.gz /cli-28.3.1-vendor.tar.bz2 /moby-28.3.1.tar.gz /moby-28.3.1-vendor.tar.bz2 +/cli-28.3.2.tar.gz +/cli-28.3.2-vendor.tar.bz2 +/moby-28.3.2.tar.gz +/moby-28.3.2-vendor.tar.bz2 diff --git a/moby-engine.spec b/moby-engine.spec index 77ad90e..a5417fb 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 28.3.1 +%global version0 28.3.2 %global tag0 v%{gsub %{version0} ~ -} # https://github.com/docker/cli diff --git a/sources b/sources index bc6612c..20b95b6 100644 --- a/sources +++ b/sources @@ -1,4 +1,4 @@ -SHA512 (cli-28.3.1.tar.gz) = 723796834664f2805484d9e3f00ec3fbf70f5dcc9d736c78fc04be90186dc076af5274345d0740dfc896951a1dcb86199f8bb6989f009fe41e5ac9835f911ca8 -SHA512 (cli-28.3.1-vendor.tar.bz2) = 14ad3cad1f67778a802d31c229764a0a151e98f18e3b6ab20f89498e38846ebb73f1f71bd8bfc460594b70ec87de7673d09296c4cdc4fa26941328689f628b24 -SHA512 (moby-28.3.1.tar.gz) = 02b352ab43e165527df247faf0751b2bda9e2239b9dac0307391e744df0224677c36d036608574fb888f814ec38050f6ead66edde2ab6645f77f20b95bc77fa7 -SHA512 (moby-28.3.1-vendor.tar.bz2) = 07364f8e866bcd8f08d628c723f82a2fc61437a0e20397eb7318695fc03826514b2033f7bedfbe50e6a1124c11f576fbde2a750bdf44a6c667ab9f3cb38bf267 +SHA512 (cli-28.3.2.tar.gz) = f47c577181ed4b499fdfc35d0ed96e621f78a9abbf2d1c25215b32de6da5139b3618c5a67f68f91c457628186a640ffe8cf184b89c71e9685561789c92a34478 +SHA512 (cli-28.3.2-vendor.tar.bz2) = 2768730c35c9b465aa540f4cd12de63ecc7e05678b996348341ca0458e36d6331c613b882020f22b309b745ac89cf2a0d6ab76738d6550fb225d42241fc18156 +SHA512 (moby-28.3.2.tar.gz) = 577d4b05346d72ce92d72e818ea09620058d9ef4bb1d9877771038adfe1ac6b8a6c1b2fc5470832c93b00ed6e8cc5666c31865cf7f7323525a0a4da7f4608862 +SHA512 (moby-28.3.2-vendor.tar.bz2) = 07364f8e866bcd8f08d628c723f82a2fc61437a0e20397eb7318695fc03826514b2033f7bedfbe50e6a1124c11f576fbde2a750bdf44a6c667ab9f3cb38bf267 From 1277845a98e527cb98dceee9f4c28f9dba49d4bc Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 24 Jul 2025 22:12:44 +0000 Subject: [PATCH 147/163] Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild From 65c31d9d5b7ec8a91a5c781043f68ae6667b8aab Mon Sep 17 00:00:00 2001 From: Bradley G Smith Date: Tue, 29 Jul 2025 08:19:44 -0700 Subject: [PATCH 148/163] Update to release v28.3.3 - Resolves: rhbz#2384219 - Resolves: CVE-2025-54388 / GHSA-x4rx-4gw3-53p4 - Upstream fixes --- .gitignore | 4 ++++ moby-engine.spec | 2 +- sources | 8 ++++---- 3 files changed, 9 insertions(+), 5 deletions(-) diff --git a/.gitignore b/.gitignore index da9af05..83c4dc6 100644 --- a/.gitignore +++ b/.gitignore @@ -152,3 +152,7 @@ moby-v20.10.10.tar.gz /cli-28.3.2-vendor.tar.bz2 /moby-28.3.2.tar.gz /moby-28.3.2-vendor.tar.bz2 +/cli-28.3.3.tar.gz +/cli-28.3.3-vendor.tar.bz2 +/moby-28.3.3.tar.gz +/moby-28.3.3-vendor.tar.bz2 diff --git a/moby-engine.spec b/moby-engine.spec index a5417fb..cff957b 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 28.3.2 +%global version0 28.3.3 %global tag0 v%{gsub %{version0} ~ -} # https://github.com/docker/cli diff --git a/sources b/sources index 20b95b6..6646ff0 100644 --- a/sources +++ b/sources @@ -1,4 +1,4 @@ -SHA512 (cli-28.3.2.tar.gz) = f47c577181ed4b499fdfc35d0ed96e621f78a9abbf2d1c25215b32de6da5139b3618c5a67f68f91c457628186a640ffe8cf184b89c71e9685561789c92a34478 -SHA512 (cli-28.3.2-vendor.tar.bz2) = 2768730c35c9b465aa540f4cd12de63ecc7e05678b996348341ca0458e36d6331c613b882020f22b309b745ac89cf2a0d6ab76738d6550fb225d42241fc18156 -SHA512 (moby-28.3.2.tar.gz) = 577d4b05346d72ce92d72e818ea09620058d9ef4bb1d9877771038adfe1ac6b8a6c1b2fc5470832c93b00ed6e8cc5666c31865cf7f7323525a0a4da7f4608862 -SHA512 (moby-28.3.2-vendor.tar.bz2) = 07364f8e866bcd8f08d628c723f82a2fc61437a0e20397eb7318695fc03826514b2033f7bedfbe50e6a1124c11f576fbde2a750bdf44a6c667ab9f3cb38bf267 +SHA512 (cli-28.3.3.tar.gz) = f7583b07154ad397c3f9a37db37e5dd4644100d1389d1ef3158c769c765a76583e2efc7d736f151ac69869359b3e572565ac581bf0f4f2975088dc698de80af8 +SHA512 (cli-28.3.3-vendor.tar.bz2) = b8aa548cbc125db0ee357798a80faef19d554d98a15649431716e503ba9d29b5355b31fd1038a75e25a28feba994e789be499a024222a85417d0623acf93679e +SHA512 (moby-28.3.3.tar.gz) = c94511b5951d998a892389927382f7b436633ed6e85a6b86a03c1ba1ef9304023a55aafe49b83f1f420e5e7aaf3b94ec6a0864f6c45e7aca714b3fe2165d47bc +SHA512 (moby-28.3.3-vendor.tar.bz2) = 16809382ac2c01da679e593a1233a66c7a8a345adf8f5be6ab2f892a2a5b872752a66c3cf52121f4d9197b32d9ef5b2073a30e71790229358e34ef40d11f8cd7 From 020234dabd4f3c5bb1b4bf545e0dde6b6ffd24f9 Mon Sep 17 00:00:00 2001 From: Maxwell G Date: Fri, 15 Aug 2025 18:28:22 -0500 Subject: [PATCH 149/163] Rebuild for golang-1.25.0 From 7f6da56f08804bfb6339d5ae50fa1c0752278352 Mon Sep 17 00:00:00 2001 From: Bradley G Smith Date: Wed, 3 Sep 2025 15:09:03 -0700 Subject: [PATCH 150/163] Update to release v28.4.0 - Resolves: rhbz#2393003 - Upstream fixes and enhancements Signed-off-by: Bradley G Smith --- .gitignore | 4 ++++ moby-engine.spec | 2 +- sources | 8 ++++---- 3 files changed, 9 insertions(+), 5 deletions(-) diff --git a/.gitignore b/.gitignore index 83c4dc6..528b5a8 100644 --- a/.gitignore +++ b/.gitignore @@ -156,3 +156,7 @@ moby-v20.10.10.tar.gz /cli-28.3.3-vendor.tar.bz2 /moby-28.3.3.tar.gz /moby-28.3.3-vendor.tar.bz2 +/cli-28.4.0.tar.gz +/cli-28.4.0-vendor.tar.bz2 +/moby-28.4.0.tar.gz +/moby-28.4.0-vendor.tar.bz2 diff --git a/moby-engine.spec b/moby-engine.spec index cff957b..6eb6b3e 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 28.3.3 +%global version0 28.4.0 %global tag0 v%{gsub %{version0} ~ -} # https://github.com/docker/cli diff --git a/sources b/sources index 6646ff0..694ba75 100644 --- a/sources +++ b/sources @@ -1,4 +1,4 @@ -SHA512 (cli-28.3.3.tar.gz) = f7583b07154ad397c3f9a37db37e5dd4644100d1389d1ef3158c769c765a76583e2efc7d736f151ac69869359b3e572565ac581bf0f4f2975088dc698de80af8 -SHA512 (cli-28.3.3-vendor.tar.bz2) = b8aa548cbc125db0ee357798a80faef19d554d98a15649431716e503ba9d29b5355b31fd1038a75e25a28feba994e789be499a024222a85417d0623acf93679e -SHA512 (moby-28.3.3.tar.gz) = c94511b5951d998a892389927382f7b436633ed6e85a6b86a03c1ba1ef9304023a55aafe49b83f1f420e5e7aaf3b94ec6a0864f6c45e7aca714b3fe2165d47bc -SHA512 (moby-28.3.3-vendor.tar.bz2) = 16809382ac2c01da679e593a1233a66c7a8a345adf8f5be6ab2f892a2a5b872752a66c3cf52121f4d9197b32d9ef5b2073a30e71790229358e34ef40d11f8cd7 +SHA512 (cli-28.4.0.tar.gz) = ab35867bdcaa07909cfd24e9bc4f5cde10b6930fa42e87d61d4544bb20b365fff146713239483169ef989cacfae7d7493d7f42d269b0f37f86c0c14a9373b445 +SHA512 (cli-28.4.0-vendor.tar.bz2) = 7d107aaabc30a299c35140fad49ec1017f52a7568d6ea17bd443b05566e4e99706b5e5cc9907ceb458886f50cd1165d065bb76daec07e9388236b6050c1e816a +SHA512 (moby-28.4.0.tar.gz) = a98f8012547dc1e61e6a4f420355d29fbd6f6ddb5642601d8762099768e0b284fcf129ee31af155049731f61f43ff4efe42313467055dae32337dc5cc8c8cf78 +SHA512 (moby-28.4.0-vendor.tar.bz2) = 559248307f9d3a4b8216c7a765242e407092fd2b697d62d122bd91eca5a1e3bfe3db1696b62942f2297f464c9e848f7ddfdd9d02550693207d7c4851da1e27ab From 9d2b1e0e54a05bad66410615175ca1de0a314e07 Mon Sep 17 00:00:00 2001 From: Bradley G Smith Date: Wed, 8 Oct 2025 07:53:29 -0700 Subject: [PATCH 151/163] Update to release v28.5.1 - Resolves: rhbz#2401164, rhbz#2384164, rhbz#2384149 - Upstream new features and fixes --- .gitignore | 4 ++++ moby-engine.spec | 2 +- sources | 8 ++++---- 3 files changed, 9 insertions(+), 5 deletions(-) diff --git a/.gitignore b/.gitignore index 528b5a8..f22e146 100644 --- a/.gitignore +++ b/.gitignore @@ -160,3 +160,7 @@ moby-v20.10.10.tar.gz /cli-28.4.0-vendor.tar.bz2 /moby-28.4.0.tar.gz /moby-28.4.0-vendor.tar.bz2 +/cli-28.5.1.tar.gz +/cli-28.5.1-vendor.tar.bz2 +/moby-28.5.1.tar.gz +/moby-28.5.1-vendor.tar.bz2 diff --git a/moby-engine.spec b/moby-engine.spec index 6eb6b3e..92f0da8 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 28.4.0 +%global version0 28.5.1 %global tag0 v%{gsub %{version0} ~ -} # https://github.com/docker/cli diff --git a/sources b/sources index 694ba75..3fef518 100644 --- a/sources +++ b/sources @@ -1,4 +1,4 @@ -SHA512 (cli-28.4.0.tar.gz) = ab35867bdcaa07909cfd24e9bc4f5cde10b6930fa42e87d61d4544bb20b365fff146713239483169ef989cacfae7d7493d7f42d269b0f37f86c0c14a9373b445 -SHA512 (cli-28.4.0-vendor.tar.bz2) = 7d107aaabc30a299c35140fad49ec1017f52a7568d6ea17bd443b05566e4e99706b5e5cc9907ceb458886f50cd1165d065bb76daec07e9388236b6050c1e816a -SHA512 (moby-28.4.0.tar.gz) = a98f8012547dc1e61e6a4f420355d29fbd6f6ddb5642601d8762099768e0b284fcf129ee31af155049731f61f43ff4efe42313467055dae32337dc5cc8c8cf78 -SHA512 (moby-28.4.0-vendor.tar.bz2) = 559248307f9d3a4b8216c7a765242e407092fd2b697d62d122bd91eca5a1e3bfe3db1696b62942f2297f464c9e848f7ddfdd9d02550693207d7c4851da1e27ab +SHA512 (cli-28.5.1.tar.gz) = bdb9e2482f1301012e944dd662bb3a2e4dac40e407c3377e45093fcb8c724d6ff37403e6dafa7d25af7b429b37010b6d8609662bb05235d433418af3164a3468 +SHA512 (cli-28.5.1-vendor.tar.bz2) = 41d499576f2dbedeb9c765cfafb794d2b534b123aba9a91c9a1a9729e838e7ba5d1e35b10db01363149e2c21f4a9ab19a40664504d1c22e7fbd325f8bfb87407 +SHA512 (moby-28.5.1.tar.gz) = fa4364504eec69907bfa642cb657ae45a7ad5d39c1e6db4a1d292c6db735f28108659faf8619adc1888dc4bc3716783df5ac141090e9532202a7dedd9f7caf5d +SHA512 (moby-28.5.1-vendor.tar.bz2) = 0d0f24f1d7e5a775f9ca7fca9a9e1f46b05db0bd63e091bfa6c0301759611a7426515f609df6cb9a09f53e3701d3a883ad37395396055620caeb0747626f24a6 From 1ecc8a1dc2a6976e73541235389c6c3b07d19697 Mon Sep 17 00:00:00 2001 From: Maxwell G Date: Wed, 8 Oct 2025 22:06:28 -0500 Subject: [PATCH 152/163] Make specfile compatible with EPEL 9 I build the package in Copr for EPEL 9, which does not have the gsub or __rpmuncompress macros. --- moby-engine.spec | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/moby-engine.spec b/moby-engine.spec index 92f0da8..68cbb9d 100644 --- a/moby-engine.spec +++ b/moby-engine.spec @@ -14,7 +14,10 @@ # in version0. tag0 reverses the substitution # e.g. global version0 27.4.0~rc.4 %global version0 28.5.1 -%global tag0 v%{gsub %{version0} ~ -} +%{lua: + local version0 = rpm.expand("%{version0}") + rpm.define("tag0 " .. version0:gsub("~", "-")) +} # https://github.com/docker/cli %global goipath2 github.com/docker/cli @@ -173,7 +176,7 @@ This package provides RPM macros for the Moby/Docker stack. # moby-engine cd %{_builddir}/%{extractdir0} # Unpack vendor archive -%__rpmuncompress -x %{S:1} +tar -xf %{S:1} # Apply patches 0-1000 # Leave this here despite warnings so we can easily add and remove patches. %autopatch -M999 -p1 @@ -185,7 +188,7 @@ cp go.sum vendor.sum # docker-cli cd %{cli_dir} # Unpack vendor archive -%__rpmuncompress -x %{S:3} +tar -xf %{S:3} # Apply patches 1000+. # Leave this here despite warnings so we can easily add and remove patches. %autopatch -m1000 -p1 From 00b2f9ff94b786872a9f00cb67f7ae2ea29b12b5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Alejandro=20S=C3=A1ez?= Date: Fri, 10 Oct 2025 14:45:00 +0200 Subject: [PATCH 153/163] rebuild From f6c5e708218af456d983381c1fe025bd0f02cfed Mon Sep 17 00:00:00 2001 From: Bradley G Smith Date: Wed, 5 Nov 2025 10:22:57 -0800 Subject: [PATCH 154/163] Update to release v28.5.2 - Resolves: rhbz#2412743 - Incorporates runc v1.3.3 - Upstream bug fixes --- .gitignore | 4 ++++ moby-engine.spec | 11 ++++++++--- sources | 8 ++++---- 3 files changed, 16 insertions(+), 7 deletions(-) diff --git a/.gitignore b/.gitignore index f22e146..a4840be 100644 --- a/.gitignore +++ b/.gitignore @@ -164,3 +164,7 @@ moby-v20.10.10.tar.gz /cli-28.5.1-vendor.tar.bz2 /moby-28.5.1.tar.gz /moby-28.5.1-vendor.tar.bz2 +/cli-28.5.2-vendor.tar.bz2 +/moby-28.5.2-vendor.tar.bz2 +/cli-28.5.2.tar.gz +/moby-28.5.2.tar.gz diff --git a/moby-engine.spec b/moby-engine.spec index 68cbb9d..f8b8c06 100644 --- a/moby-engine.spec +++ b/moby-engine.spec @@ -13,10 +13,10 @@ # 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 28.5.1 +%global version0 28.5.2 %{lua: - local version0 = rpm.expand("%{version0}") - rpm.define("tag0 " .. version0:gsub("~", "-")) + local version0 = rpm.expand("%{version0}"):gsub("~", "-") + rpm.define("tag0 " .. "v" .. version0) } # https://github.com/docker/cli @@ -309,6 +309,11 @@ skiptest \ "TestJoinGoodSymlink" \ "TestJoinWithSymlinkReplace" \ "TestJoinCloseInvalidates" \ + %dnl no such file or directory \ + "TestImageLoadMissing" \ + %dnl create tmp file - invalid argument \ + "TestContentStoreForPull" \ + "TestManifestStore" \ %ifarch s390x %dnl Test timeout "TestCloseRunningCommand" \ diff --git a/sources b/sources index 3fef518..5bca180 100644 --- a/sources +++ b/sources @@ -1,4 +1,4 @@ -SHA512 (cli-28.5.1.tar.gz) = bdb9e2482f1301012e944dd662bb3a2e4dac40e407c3377e45093fcb8c724d6ff37403e6dafa7d25af7b429b37010b6d8609662bb05235d433418af3164a3468 -SHA512 (cli-28.5.1-vendor.tar.bz2) = 41d499576f2dbedeb9c765cfafb794d2b534b123aba9a91c9a1a9729e838e7ba5d1e35b10db01363149e2c21f4a9ab19a40664504d1c22e7fbd325f8bfb87407 -SHA512 (moby-28.5.1.tar.gz) = fa4364504eec69907bfa642cb657ae45a7ad5d39c1e6db4a1d292c6db735f28108659faf8619adc1888dc4bc3716783df5ac141090e9532202a7dedd9f7caf5d -SHA512 (moby-28.5.1-vendor.tar.bz2) = 0d0f24f1d7e5a775f9ca7fca9a9e1f46b05db0bd63e091bfa6c0301759611a7426515f609df6cb9a09f53e3701d3a883ad37395396055620caeb0747626f24a6 +SHA512 (cli-28.5.2-vendor.tar.bz2) = 8f421f445479d93b524c80c11436e2960ff2b24ee63b63615562c1bb1fbe25c5328f468373a132af5708e896945d06c069c490f1ba916594f81c73439040b01f +SHA512 (moby-28.5.2-vendor.tar.bz2) = 71ea0b33a633666628f5376f7d2eeb5b5410e3f4895b353bb040996bac2c85e4472359bafc4db7d2df3c41480811994c101bfa882435760972a63083cb107b80 +SHA512 (cli-28.5.2.tar.gz) = 35657c67380bd1fd5f1c81146d8edff9d018857be62eadba8e613e0a89834025f6d36609802596490b8e7e33363598e4f82f3876c49db71c13424b6b3a327e72 +SHA512 (moby-28.5.2.tar.gz) = 489e30a3b21543776e5c3c1013717110a3b82810b2b9ce536a8148bc295211aa64a1bb49893f0bc0119257e4d5decdb0095d0aa6ec196fafc98f9ca6a0dfa981 From 39f884308aad48e05f6811b89fa37102994053fd Mon Sep 17 00:00:00 2001 From: Bradley G Smith Date: Mon, 10 Nov 2025 16:34:07 -0800 Subject: [PATCH 155/163] Update to release v29.0.0 - Upstream note: "This release includes several breaking changes and deprecations. Review the release notes carefully before upgrading." - Breaking changes. Upstream new features and fixes --- .gitignore | 4 ++ engine_go-vendor-tools.toml | 18 ++++-- moby-engine.spec | 112 +++++++++++++++++------------------- sources | 8 +-- 4 files changed, 73 insertions(+), 69 deletions(-) diff --git a/.gitignore b/.gitignore index a4840be..1a8aa31 100644 --- a/.gitignore +++ b/.gitignore @@ -168,3 +168,7 @@ moby-v20.10.10.tar.gz /moby-28.5.2-vendor.tar.bz2 /cli-28.5.2.tar.gz /moby-28.5.2.tar.gz +/cli-29.0.0-vendor.tar.bz2 +/moby-docker-v29.0.0.tar.gz +/moby-docker-v29.0.0-vendor.tar.bz2 +/cli-29.0.0.tar.gz diff --git a/engine_go-vendor-tools.toml b/engine_go-vendor-tools.toml index 3688c12..d48854c 100644 --- a/engine_go-vendor-tools.toml +++ b/engine_go-vendor-tools.toml @@ -39,10 +39,16 @@ expression = "BSD-3-Clause" path = "vendor/sigs.k8s.io/yaml/goyaml.v2/LICENSE.libyaml" sha256sum = "a94710b55e03b5285f77d048c5ba61bb9d6ee04a06c0eb90e68821e11b0c707a" expression = "MIT" +[[licensing.licenses]] +path = "vendor/cyphar.com/go-pathrs/COPYING" +sha256sum = "3f3d9e0024b1921b067d6f7f88deb4a60cbe7a78e76c64e3f1d7fc3b779b9d04" +expression = "MPL-2.0" +[[licensing.licenses]] +path = "vendor/github.com/cyphar/filepath-securejoin/LICENSE.BSD" +sha256sum = "26be8a79415737dfe8edf1be62e71afeb8c770ed5a5605a06270d5701830f47c" +expression = "BSD-3-Clause" +[[licensing.licenses]] +path = "vendor/github.com/cyphar/filepath-securejoin/LICENSE.MPL-2.0" +sha256sum = "3f3d9e0024b1921b067d6f7f88deb4a60cbe7a78e76c64e3f1d7fc3b779b9d04" +expression = "BSD-3-Clause" [archive] -pre_commands = [ - # This project has a setup where go.mod and go.sum are not always present. - # We write those files manually. - ["cp", "-p", "vendor.mod", "go.mod"], - ["cp", "-p", "vendor.sum", "go.sum"], -] diff --git a/moby-engine.spec b/moby-engine.spec index f8b8c06..6f4d339 100644 --- a/moby-engine.spec +++ b/moby-engine.spec @@ -8,21 +8,21 @@ %bcond_without check # https://github.com/moby/moby -%global goipath github.com/docker/docker -%global forgeurl https://github.com/moby/moby +%global goipath0 github.com/moby/moby # 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 28.5.2 +%global version0 29.0.0 %{lua: local version0 = rpm.expand("%{version0}"):gsub("~", "-") - rpm.define("tag0 " .. "v" .. version0) + rpm.define("tag0 " .. "docker-v" .. version0) + rpm.define("distprefix0 %{nil}") + rpm.define("tag2 " .. "v" .. version0) } # https://github.com/docker/cli %global goipath2 github.com/docker/cli %global version2 %{version0} -%global tag2 %{tag0} %gometa -L -a -f %global engine_dir ../%{topdir0} @@ -41,7 +41,7 @@ depending on a particular stack or provider. } Name: moby-engine -Version: %{forgeversion} +Version: %{version0} Release: %autorelease Summary: The open-source application container engine @@ -75,6 +75,7 @@ BuildRequires: make BuildRequires: pkg-config BuildRequires: systemd-devel BuildRequires: /usr/bin/go-md2man +BuildRequires: nftables-devel # docker.service depends on containerd @@ -90,6 +91,7 @@ Requires: tini-static Requires: container-selinux Requires: iptables Requires: libseccomp +Requires: nftables Requires: pigz Requires: systemd Requires: tar @@ -181,9 +183,6 @@ tar -xf %{S:1} # Leave this here despite warnings so we can easily add and remove patches. %autopatch -M999 -p1 cp -p %{S:100} %{S:101} %{S:102} . -# See comment in go-vendor-tools.toml -cp go.mod vendor.mod -cp go.sum vendor.sum # docker-cli cd %{cli_dir} @@ -193,8 +192,6 @@ tar -xf %{S:3} # Leave this here despite warnings so we can easily add and remove patches. %autopatch -m1000 -p1 # See comment in go-vendor-tools.toml -cp go.mod vendor.mod -cp go.sum vendor.sum rm -f man/go.mod @@ -205,13 +202,13 @@ rm -f man/go.mod %go_vendor_license_buildrequires -c %{S:201} %build -GO_LDFLAGS="" GO_BUILDTAGS="" -export CGO_ENABLED=1 +export GO_LDFLAGS="" GO_BUILDTAGS="" CGO_ENABLED=1 +%global gomodulesmode GO111MODULE=on # moby-engine cd %{engine_dir} # DOCKER_DEBUG: Ensure that all debuginfo is preserved -BUILDFLAGS="%{gocompilerflags} -a -v -x" \ +BUILDFLAGS="%{gocompilerflags} -a -v" \ CGO_CFLAGS="%{build_cflags}" \ CGO_LDFLAGS="%{build_ldflags}" \ DOCKER_BUILDTAGS="rpm_crashback journald" \ @@ -249,10 +246,6 @@ install -Dpm 0755 bundles/dynbinary*/* -t %{buildroot}%{_bindir} install -Dpm 0644 contrib/init/systemd/* -t %{buildroot}%{_unitdir} # Install sysusers config install -Dpm 0644 moby-engine-systemd-sysusers.conf %{buildroot}%{_sysusersdir}/moby-engine.conf -# Install udev rules -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 @@ -278,12 +271,6 @@ mkdir %{buildroot}%{_libexecdir}/docker/cli-plugins install -Dpm 0644 macros.moby -t %{buildroot}%{_rpmmacrodir} %check -skiptest() { - for test in "$@"; do - awk -i inplace '/^func.*'"${test}"'\(/ { print; print "\tt.Skip(\"disabled failing test\")"; next}1' \ - $(grep -rl "${test}") - done -} export PATH="%{buildroot}%{_bindir}:${PATH}" TZ=utc # moby-engine @@ -298,49 +285,58 @@ cd %{cli_dir} # moby-engine cd %{engine_dir} # Manually skip specific tests -skiptest \ - "TestSCTP4Proxy" \ +%global engine_ignores %{shrink: + %dnl assertion failed + -s "TestC8dSnapshotterWithUsernsRemap" + -s "TestSCTP4Proxy" %dnl Failed to enter netns: operation not permitted - %dnl "TestSCTP4ProxyNoListener" - %dnl "TestSCTP6ProxyNoListener" + %dnl -s "TestSCTP4ProxyNoListener" + %dnl -s "TestSCTP6ProxyNoListener" %dnl network_proxy_linux_test.go:73: protocol not supported; fails in COPR rawhide - "TestIfaceAddrs" \ + -s "TestIfaceAddrs" %dnl failed to mount resolved path: operation not permitted - "TestJoinGoodSymlink" \ - "TestJoinWithSymlinkReplace" \ - "TestJoinCloseInvalidates" \ - %dnl no such file or directory \ - "TestImageLoadMissing" \ - %dnl create tmp file - invalid argument \ - "TestContentStoreForPull" \ - "TestManifestStore" \ - %ifarch s390x + -s "TestJoinGoodSymlink" + -s "TestJoinWithSymlinkReplace" + -s "TestJoinCloseInvalidates" %dnl Test timeout - "TestCloseRunningCommand" \ - %endif - -# graphdriver tests require extra permissions -# integration tests require a running docker daemon -# libnetwork tests cannot create netns in mock -# pkg/archive do not work in mock, either -# daemon/graphdriver/fuse-overlayfs tests fail with permission errors -%gocheck -t daemon/graphdriver -t integration -t libnetwork -d pkg/archive + -s "TestImageLoad" + %dnl doesn't provide the requested platform + -s "TestContentStoreForPull" + -s "TestManifestStore" + %dnl all with error is not nil: create tmp file + %[ "%{_arch}" == "s390x" ? "-s TestCloseRunningCommand" : "" ] + %dnl graphdriver tests require extra permissions + -t daemon/graphdriver + %dnl integration tests require a running docker daemon + -t integration + %dnl libnetwork tests cannot create netns in mock + -t daemon/libnetwork + %dnl integration-cli: we don't want to run integration tests or benchmarks + -d integration-cli + %dnl api and client are separate modules starting with v29.0.0 + -d api + -d client + %dnl man is a separate module + -d man +} +%gocheck2 %{engine_ignores} # docker-cli cd %{cli_dir} -skiptest \ - "TestInitializeFromClientHangs" \ +%global cli_ignores %{shrink: + -s "TestInitializeFromClientHangs" %dnl Needs network - "TestRunBuildFromGitHubSpecialCase" \ + -s "TestRunBuildFromGitHubSpecialCase" %dnl Test is flaky - "TestConnectAndWait" \ + -s "TestConnectAndWait" %dnl Test panics - "TestRunAttachTermination" \ - "TestRunPullTermination" \ - "TestUpgradePromptTermination" - %dnl Unknown test failure - -%gocheck -z2 -t e2e + -s "TestRunAttachTermination" + -s "TestRunPullTermination" + -s "TestUpgradePromptTermination" + %dnl docker-trust a separate module starting with v29.0.0 + -d "cmd/docker-trust" +} +%gocheck2 -t e2e %{cli_ignores} %endif @@ -364,7 +360,6 @@ skiptest \ %{_bindir}/docker-proxy %{_bindir}/dockerd %{_sysusersdir}/moby-engine.conf -%{_udevrulesdir}/80-docker.rules %{_unitdir}/docker.service %{_unitdir}/docker.socket %{_mandir}/man8/dockerd.8* @@ -374,7 +369,6 @@ skiptest \ %license %{engine_dir}/AUTHORS %license %{engine_dir}/LICENSE %license %{engine_dir}/NOTICE -%{_datadir}/nano/Dockerfile.nanorc %files -n docker-cli -f %{cli_dir}/%{go_vendor_license_filelist} diff --git a/sources b/sources index 5bca180..93f14b1 100644 --- a/sources +++ b/sources @@ -1,4 +1,4 @@ -SHA512 (cli-28.5.2-vendor.tar.bz2) = 8f421f445479d93b524c80c11436e2960ff2b24ee63b63615562c1bb1fbe25c5328f468373a132af5708e896945d06c069c490f1ba916594f81c73439040b01f -SHA512 (moby-28.5.2-vendor.tar.bz2) = 71ea0b33a633666628f5376f7d2eeb5b5410e3f4895b353bb040996bac2c85e4472359bafc4db7d2df3c41480811994c101bfa882435760972a63083cb107b80 -SHA512 (cli-28.5.2.tar.gz) = 35657c67380bd1fd5f1c81146d8edff9d018857be62eadba8e613e0a89834025f6d36609802596490b8e7e33363598e4f82f3876c49db71c13424b6b3a327e72 -SHA512 (moby-28.5.2.tar.gz) = 489e30a3b21543776e5c3c1013717110a3b82810b2b9ce536a8148bc295211aa64a1bb49893f0bc0119257e4d5decdb0095d0aa6ec196fafc98f9ca6a0dfa981 +SHA512 (cli-29.0.0-vendor.tar.bz2) = e34100826e3a0127bc0f203c5c68218e5d10d85411053a9c3c274223247dc900ecfa8b47f03d54d6f4719d97132ede12819c87de60186c752a504a742ab84898 +SHA512 (moby-docker-v29.0.0.tar.gz) = e05c96fc30c5ffc74aa23bb1425e47c74c1ee2beda64a55115394d619cb493ffbce3222108025d007c5eea6805efe35dadcb84edfd8daa98f1a4f215a84e0f7d +SHA512 (moby-docker-v29.0.0-vendor.tar.bz2) = 62967e9ec1afc1e94ea5cc79d14755763df9566e47bd4b3ba7185748b9a6c5f14ac9e20e6ceb42f85a8d9154206c335068d94ac2ae6458f993aa8e37d56ee53f +SHA512 (cli-29.0.0.tar.gz) = 06f62a961a221c506a232f7f2b951e7259a607b23caaac1bdc7a4e2396890e8f73863a68056ff02f50ed3c68f0ad50aa0fb48f930da4e5ed0b0988a7f9e7637e From 0615f66077efd381c409450548be179367e6a111 Mon Sep 17 00:00:00 2001 From: Bradley G Smith Date: Tue, 11 Nov 2025 16:51:14 -0800 Subject: [PATCH 156/163] Amend tests in %check - Expand tests found in submodules using -F parameter to gocheck2 - v29.0.0 changes Co-authored-by: Maxwell G Signed-off-by: Bradley G Smith --- moby-engine.spec | 11 ++--------- 1 file changed, 2 insertions(+), 9 deletions(-) diff --git a/moby-engine.spec b/moby-engine.spec index 6f4d339..c5b003e 100644 --- a/moby-engine.spec +++ b/moby-engine.spec @@ -313,13 +313,8 @@ cd %{engine_dir} -t daemon/libnetwork %dnl integration-cli: we don't want to run integration tests or benchmarks -d integration-cli - %dnl api and client are separate modules starting with v29.0.0 - -d api - -d client - %dnl man is a separate module - -d man } -%gocheck2 %{engine_ignores} +%gocheck2 -F %{engine_ignores} # docker-cli cd %{cli_dir} @@ -333,10 +328,8 @@ cd %{cli_dir} -s "TestRunAttachTermination" -s "TestRunPullTermination" -s "TestUpgradePromptTermination" - %dnl docker-trust a separate module starting with v29.0.0 - -d "cmd/docker-trust" } -%gocheck2 -t e2e %{cli_ignores} +%gocheck2 -F -t e2e %{cli_ignores} %endif From 65e6413a3ca53c8edeab54a5417a5312a18aa233 Mon Sep 17 00:00:00 2001 From: Bradley G Smith Date: Sat, 15 Nov 2025 12:15:58 -0800 Subject: [PATCH 157/163] Update to release v29.0.1 - Upstream fixes --- .gitignore | 4 ++++ moby-engine.spec | 2 +- sources | 8 ++++---- 3 files changed, 9 insertions(+), 5 deletions(-) diff --git a/.gitignore b/.gitignore index 1a8aa31..4797b7b 100644 --- a/.gitignore +++ b/.gitignore @@ -172,3 +172,7 @@ moby-v20.10.10.tar.gz /moby-docker-v29.0.0.tar.gz /moby-docker-v29.0.0-vendor.tar.bz2 /cli-29.0.0.tar.gz +/cli-29.0.1-vendor.tar.bz2 +/cli-29.0.1.tar.gz +/moby-docker-v29.0.1.tar.gz +/moby-docker-v29.0.1-vendor.tar.bz2 diff --git a/moby-engine.spec b/moby-engine.spec index c5b003e..f568cde 100644 --- a/moby-engine.spec +++ b/moby-engine.spec @@ -12,7 +12,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 29.0.0 +%global version0 29.0.1 %{lua: local version0 = rpm.expand("%{version0}"):gsub("~", "-") rpm.define("tag0 " .. "docker-v" .. version0) diff --git a/sources b/sources index 93f14b1..c49c6c8 100644 --- a/sources +++ b/sources @@ -1,4 +1,4 @@ -SHA512 (cli-29.0.0-vendor.tar.bz2) = e34100826e3a0127bc0f203c5c68218e5d10d85411053a9c3c274223247dc900ecfa8b47f03d54d6f4719d97132ede12819c87de60186c752a504a742ab84898 -SHA512 (moby-docker-v29.0.0.tar.gz) = e05c96fc30c5ffc74aa23bb1425e47c74c1ee2beda64a55115394d619cb493ffbce3222108025d007c5eea6805efe35dadcb84edfd8daa98f1a4f215a84e0f7d -SHA512 (moby-docker-v29.0.0-vendor.tar.bz2) = 62967e9ec1afc1e94ea5cc79d14755763df9566e47bd4b3ba7185748b9a6c5f14ac9e20e6ceb42f85a8d9154206c335068d94ac2ae6458f993aa8e37d56ee53f -SHA512 (cli-29.0.0.tar.gz) = 06f62a961a221c506a232f7f2b951e7259a607b23caaac1bdc7a4e2396890e8f73863a68056ff02f50ed3c68f0ad50aa0fb48f930da4e5ed0b0988a7f9e7637e +SHA512 (cli-29.0.1-vendor.tar.bz2) = e34100826e3a0127bc0f203c5c68218e5d10d85411053a9c3c274223247dc900ecfa8b47f03d54d6f4719d97132ede12819c87de60186c752a504a742ab84898 +SHA512 (cli-29.0.1.tar.gz) = b6dbb14bbc1b6961514a0ce3b910096c1a04bf8bc02bd978ad7173135e7c64a84da2962db340ddc833759c8e9e073b98fb4698a3762994a2b240d6bb24821d56 +SHA512 (moby-docker-v29.0.1.tar.gz) = b4ae0791738459ff7cbfd29e971ee2e21da100c60040793c1a5cf80228fa312831b590f929e8b808b22c729d66b389690d1e12afde2a0d90a21d432419898787 +SHA512 (moby-docker-v29.0.1-vendor.tar.bz2) = 52057d3c7f10e2c6bc4855166a8f8c1cc60c5fa6dde6f530ab39cad7831caa2c87be718acf25945b2b00d87c39d55e8a963c79cb1996143902f9b5f655ad36ee From dcebcef461326d9ea1550dfd0f2703c99279444e Mon Sep 17 00:00:00 2001 From: Bradley G Smith Date: Mon, 17 Nov 2025 10:06:56 -0800 Subject: [PATCH 158/163] Update to release v29.0.2 - Resolves: rhbz#2415494 - Upstream fix Signed-off-by: Bradley G Smith --- .gitignore | 4 ++++ moby-engine.spec | 2 +- sources | 8 ++++---- 3 files changed, 9 insertions(+), 5 deletions(-) diff --git a/.gitignore b/.gitignore index 4797b7b..f40f162 100644 --- a/.gitignore +++ b/.gitignore @@ -176,3 +176,7 @@ moby-v20.10.10.tar.gz /cli-29.0.1.tar.gz /moby-docker-v29.0.1.tar.gz /moby-docker-v29.0.1-vendor.tar.bz2 +/cli-29.0.2.tar.gz +/cli-29.0.2-vendor.tar.bz2 +/moby-docker-v29.0.2.tar.gz +/moby-docker-v29.0.2-vendor.tar.bz2 diff --git a/moby-engine.spec b/moby-engine.spec index f568cde..834fc8b 100644 --- a/moby-engine.spec +++ b/moby-engine.spec @@ -12,7 +12,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 29.0.1 +%global version0 29.0.2 %{lua: local version0 = rpm.expand("%{version0}"):gsub("~", "-") rpm.define("tag0 " .. "docker-v" .. version0) diff --git a/sources b/sources index c49c6c8..2d7f4b0 100644 --- a/sources +++ b/sources @@ -1,4 +1,4 @@ -SHA512 (cli-29.0.1-vendor.tar.bz2) = e34100826e3a0127bc0f203c5c68218e5d10d85411053a9c3c274223247dc900ecfa8b47f03d54d6f4719d97132ede12819c87de60186c752a504a742ab84898 -SHA512 (cli-29.0.1.tar.gz) = b6dbb14bbc1b6961514a0ce3b910096c1a04bf8bc02bd978ad7173135e7c64a84da2962db340ddc833759c8e9e073b98fb4698a3762994a2b240d6bb24821d56 -SHA512 (moby-docker-v29.0.1.tar.gz) = b4ae0791738459ff7cbfd29e971ee2e21da100c60040793c1a5cf80228fa312831b590f929e8b808b22c729d66b389690d1e12afde2a0d90a21d432419898787 -SHA512 (moby-docker-v29.0.1-vendor.tar.bz2) = 52057d3c7f10e2c6bc4855166a8f8c1cc60c5fa6dde6f530ab39cad7831caa2c87be718acf25945b2b00d87c39d55e8a963c79cb1996143902f9b5f655ad36ee +SHA512 (cli-29.0.2.tar.gz) = ac7fd8d922c7ef9d44b10f88334a3728c3e5fd8fbaa3b87866a395d9ca1b837e04fb7fd137df14622c6279ad6bd1a25153010d810fe08deb5eca1bb89954d40d +SHA512 (cli-29.0.2-vendor.tar.bz2) = e34100826e3a0127bc0f203c5c68218e5d10d85411053a9c3c274223247dc900ecfa8b47f03d54d6f4719d97132ede12819c87de60186c752a504a742ab84898 +SHA512 (moby-docker-v29.0.2.tar.gz) = 220220285940026f891e7aae887d53d42b0adf173231540d607684fd02c0fd82eb5bb7b27c407864cae9cac29b8999614ea22cb3a54a936b32e949e9fd43eaee +SHA512 (moby-docker-v29.0.2-vendor.tar.bz2) = 52057d3c7f10e2c6bc4855166a8f8c1cc60c5fa6dde6f530ab39cad7831caa2c87be718acf25945b2b00d87c39d55e8a963c79cb1996143902f9b5f655ad36ee From 152cc0d09e8c32642d258a872fd95bf716a6eb32 Mon Sep 17 00:00:00 2001 From: Bradley G Smith Date: Sat, 22 Nov 2025 11:17:36 -0800 Subject: [PATCH 159/163] Remove flaky tests from %check - TestSCTP6Proxy is flaky on x86_64 arch - usually working but sometimes not - TestSCTP6ProxyNoListener often fails on ppc64le (rawhide) --- moby-engine.spec | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/moby-engine.spec b/moby-engine.spec index 834fc8b..a002096 100644 --- a/moby-engine.spec +++ b/moby-engine.spec @@ -289,9 +289,13 @@ cd %{engine_dir} %dnl assertion failed -s "TestC8dSnapshotterWithUsernsRemap" -s "TestSCTP4Proxy" + %dnl flaky test will fail on x86_64 - sometimes + -s "TestSCTP6Proxy" %dnl Failed to enter netns: operation not permitted %dnl -s "TestSCTP4ProxyNoListener" %dnl -s "TestSCTP6ProxyNoListener" + %dnl possibly flaky test failing on ppc64le + %[ "%{_arch}" == "ppc64le" ? "-s TestSCTP6ProxyNoListener" : "" ] %dnl network_proxy_linux_test.go:73: protocol not supported; fails in COPR rawhide -s "TestIfaceAddrs" %dnl failed to mount resolved path: operation not permitted From ef7a7976f8fc3bbc29edc301f938da5e7ad98162 Mon Sep 17 00:00:00 2001 From: Bradley G Smith Date: Mon, 24 Nov 2025 07:19:57 -0800 Subject: [PATCH 160/163] Update to release v29.0.4 - Resolves: rhbz#2416746 - Upstream fixes Signed-off-by: Bradley G Smith --- .gitignore | 8 ++++++++ moby-engine.spec | 4 +--- sources | 8 ++++---- 3 files changed, 13 insertions(+), 7 deletions(-) diff --git a/.gitignore b/.gitignore index f40f162..4b61ee4 100644 --- a/.gitignore +++ b/.gitignore @@ -180,3 +180,11 @@ moby-v20.10.10.tar.gz /cli-29.0.2-vendor.tar.bz2 /moby-docker-v29.0.2.tar.gz /moby-docker-v29.0.2-vendor.tar.bz2 +/moby-docker-v29.0.3.tar.gz +/moby-docker-v29.0.3-vendor.tar.bz2 +/cli-29.0.3.tar.gz +/cli-29.0.3-vendor.tar.bz2 +/cli-29.0.4.tar.gz +/cli-29.0.4-vendor.tar.bz2 +/moby-docker-v29.0.4.tar.gz +/moby-docker-v29.0.4-vendor.tar.bz2 diff --git a/moby-engine.spec b/moby-engine.spec index a002096..baf9e9e 100644 --- a/moby-engine.spec +++ b/moby-engine.spec @@ -12,7 +12,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 29.0.2 +%global version0 29.0.4 %{lua: local version0 = rpm.expand("%{version0}"):gsub("~", "-") rpm.define("tag0 " .. "docker-v" .. version0) @@ -337,8 +337,6 @@ cd %{cli_dir} %endif - - %post %systemd_post docker.service docker.socket diff --git a/sources b/sources index 2d7f4b0..ed7a068 100644 --- a/sources +++ b/sources @@ -1,4 +1,4 @@ -SHA512 (cli-29.0.2.tar.gz) = ac7fd8d922c7ef9d44b10f88334a3728c3e5fd8fbaa3b87866a395d9ca1b837e04fb7fd137df14622c6279ad6bd1a25153010d810fe08deb5eca1bb89954d40d -SHA512 (cli-29.0.2-vendor.tar.bz2) = e34100826e3a0127bc0f203c5c68218e5d10d85411053a9c3c274223247dc900ecfa8b47f03d54d6f4719d97132ede12819c87de60186c752a504a742ab84898 -SHA512 (moby-docker-v29.0.2.tar.gz) = 220220285940026f891e7aae887d53d42b0adf173231540d607684fd02c0fd82eb5bb7b27c407864cae9cac29b8999614ea22cb3a54a936b32e949e9fd43eaee -SHA512 (moby-docker-v29.0.2-vendor.tar.bz2) = 52057d3c7f10e2c6bc4855166a8f8c1cc60c5fa6dde6f530ab39cad7831caa2c87be718acf25945b2b00d87c39d55e8a963c79cb1996143902f9b5f655ad36ee +SHA512 (cli-29.0.4.tar.gz) = f91423b233416d75c46580bebe64843f76d7f09a0aa388b2c1fdaa03b9b754f0d0c2225f8567e7b8f55b3f6d1cebe331f5c2c3780031f6d66b8a190c88592f24 +SHA512 (cli-29.0.4-vendor.tar.bz2) = e34100826e3a0127bc0f203c5c68218e5d10d85411053a9c3c274223247dc900ecfa8b47f03d54d6f4719d97132ede12819c87de60186c752a504a742ab84898 +SHA512 (moby-docker-v29.0.4.tar.gz) = 475770b282bdfd0f9f9343fb9818384253d3e17b9976599ad1de52f64e67a1f88a18a40d8b296f37299485fe2e6eabfee6ae6be6547c0fc936053872aa4ef1f7 +SHA512 (moby-docker-v29.0.4-vendor.tar.bz2) = 52057d3c7f10e2c6bc4855166a8f8c1cc60c5fa6dde6f530ab39cad7831caa2c87be718acf25945b2b00d87c39d55e8a963c79cb1996143902f9b5f655ad36ee From 5e570a66c5472231f149b48b7e658e5e669c4ad4 Mon Sep 17 00:00:00 2001 From: Bradley G Smith Date: Tue, 2 Dec 2025 14:59:34 -0800 Subject: [PATCH 161/163] Update to release v29.1.2 - Resolves: rhbz#2417969 - Upstream new features and fixes --- .gitignore | 4 ++++ engine_go-vendor-tools.toml | 10 ++++++---- moby-engine.spec | 2 +- sources | 8 ++++---- 4 files changed, 15 insertions(+), 9 deletions(-) diff --git a/.gitignore b/.gitignore index 4b61ee4..9b2f0e8 100644 --- a/.gitignore +++ b/.gitignore @@ -188,3 +188,7 @@ moby-v20.10.10.tar.gz /cli-29.0.4-vendor.tar.bz2 /moby-docker-v29.0.4.tar.gz /moby-docker-v29.0.4-vendor.tar.bz2 +/cli-29.1.2-vendor.tar.bz2 +/cli-29.1.2.tar.gz +/moby-docker-v29.1.2-vendor.tar.bz2 +/moby-docker-v29.1.2.tar.gz diff --git a/engine_go-vendor-tools.toml b/engine_go-vendor-tools.toml index d48854c..5f25a8b 100644 --- a/engine_go-vendor-tools.toml +++ b/engine_go-vendor-tools.toml @@ -36,10 +36,6 @@ path = "vendor/github.com/shibumi/go-pathspec/GO-LICENSE" sha256sum = "dd26a7abddd02e2d0aba97805b31f248ef7835d9e10da289b22e3b8ab78b324d" expression = "BSD-3-Clause" [[licensing.licenses]] -path = "vendor/sigs.k8s.io/yaml/goyaml.v2/LICENSE.libyaml" -sha256sum = "a94710b55e03b5285f77d048c5ba61bb9d6ee04a06c0eb90e68821e11b0c707a" -expression = "MIT" -[[licensing.licenses]] path = "vendor/cyphar.com/go-pathrs/COPYING" sha256sum = "3f3d9e0024b1921b067d6f7f88deb4a60cbe7a78e76c64e3f1d7fc3b779b9d04" expression = "MPL-2.0" @@ -51,4 +47,10 @@ expression = "BSD-3-Clause" path = "vendor/github.com/cyphar/filepath-securejoin/LICENSE.MPL-2.0" sha256sum = "3f3d9e0024b1921b067d6f7f88deb4a60cbe7a78e76c64e3f1d7fc3b779b9d04" expression = "BSD-3-Clause" +[[licensing.licenses]] +path = "vendor/go.yaml.in/yaml/v2/LICENSE.libyaml" +sha256sum = "a94710b55e03b5285f77d048c5ba61bb9d6ee04a06c0eb90e68821e11b0c707a" +expression = "MIT" [archive] +[archive.dependency_overrides] +"github.com/moby/policy-helpers" = "v0.0.0-20251120141729-4dd138b40f3e" diff --git a/moby-engine.spec b/moby-engine.spec index baf9e9e..065d29b 100644 --- a/moby-engine.spec +++ b/moby-engine.spec @@ -12,7 +12,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 29.0.4 +%global version0 29.1.2 %{lua: local version0 = rpm.expand("%{version0}"):gsub("~", "-") rpm.define("tag0 " .. "docker-v" .. version0) diff --git a/sources b/sources index ed7a068..95f38a1 100644 --- a/sources +++ b/sources @@ -1,4 +1,4 @@ -SHA512 (cli-29.0.4.tar.gz) = f91423b233416d75c46580bebe64843f76d7f09a0aa388b2c1fdaa03b9b754f0d0c2225f8567e7b8f55b3f6d1cebe331f5c2c3780031f6d66b8a190c88592f24 -SHA512 (cli-29.0.4-vendor.tar.bz2) = e34100826e3a0127bc0f203c5c68218e5d10d85411053a9c3c274223247dc900ecfa8b47f03d54d6f4719d97132ede12819c87de60186c752a504a742ab84898 -SHA512 (moby-docker-v29.0.4.tar.gz) = 475770b282bdfd0f9f9343fb9818384253d3e17b9976599ad1de52f64e67a1f88a18a40d8b296f37299485fe2e6eabfee6ae6be6547c0fc936053872aa4ef1f7 -SHA512 (moby-docker-v29.0.4-vendor.tar.bz2) = 52057d3c7f10e2c6bc4855166a8f8c1cc60c5fa6dde6f530ab39cad7831caa2c87be718acf25945b2b00d87c39d55e8a963c79cb1996143902f9b5f655ad36ee +SHA512 (cli-29.1.2-vendor.tar.bz2) = 2c13dd1eeed25f44c4a3569d0caac00d78ac2c416b6a7a8bea9718a617067990a56d5f543bd0a1ce49e64b22f368b9d90fceddc9a528464cba48eb8281d49373 +SHA512 (cli-29.1.2.tar.gz) = b400641300544de8ada47a26a81558be05ed57af05d388a2f87ef0d0f36bd008b367a64617326ddd12c8ce546c55c9d6a5b54dee28324d31c61194d73b7031ea +SHA512 (moby-docker-v29.1.2-vendor.tar.bz2) = 20c39d1bdd07b919b22fa8d737c397e9a801c4743561eb4397cdc56013e2daa2a60dd5369a2878674ee9a457b29163083e5a0ed44eaeb4de8b639f443673f046 +SHA512 (moby-docker-v29.1.2.tar.gz) = 681c24f67efa61966af78e35b981010072451eddd91e86658c1e9ffe5ec864ca1a58691a52e726b4d92802a05e23e06e1f5874b887752cec378fddb54aa14bf4 From a41d604f27416f94895704424ed7c31dc06aa168 Mon Sep 17 00:00:00 2001 From: Bradley G Smith Date: Fri, 12 Dec 2025 13:24:46 -0800 Subject: [PATCH 162/163] Update to release v29.1.3 - Resolves: rhbz#2417969 - Resolves CVE-2024-25621: rhbz#2419019, rhbz#2419046, rhbz#2419442 - Upstream new features and fixes --- .gitignore | 4 ++++ moby-engine.spec | 2 +- sources | 8 ++++---- 3 files changed, 9 insertions(+), 5 deletions(-) diff --git a/.gitignore b/.gitignore index 9b2f0e8..569e499 100644 --- a/.gitignore +++ b/.gitignore @@ -192,3 +192,7 @@ moby-v20.10.10.tar.gz /cli-29.1.2.tar.gz /moby-docker-v29.1.2-vendor.tar.bz2 /moby-docker-v29.1.2.tar.gz +/cli-29.1.3-vendor.tar.bz2 +/cli-29.1.3.tar.gz +/moby-docker-v29.1.3-vendor.tar.bz2 +/moby-docker-v29.1.3.tar.gz diff --git a/moby-engine.spec b/moby-engine.spec index 065d29b..8119ef9 100644 --- a/moby-engine.spec +++ b/moby-engine.spec @@ -12,7 +12,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 29.1.2 +%global version0 29.1.3 %{lua: local version0 = rpm.expand("%{version0}"):gsub("~", "-") rpm.define("tag0 " .. "docker-v" .. version0) diff --git a/sources b/sources index 95f38a1..fe042c8 100644 --- a/sources +++ b/sources @@ -1,4 +1,4 @@ -SHA512 (cli-29.1.2-vendor.tar.bz2) = 2c13dd1eeed25f44c4a3569d0caac00d78ac2c416b6a7a8bea9718a617067990a56d5f543bd0a1ce49e64b22f368b9d90fceddc9a528464cba48eb8281d49373 -SHA512 (cli-29.1.2.tar.gz) = b400641300544de8ada47a26a81558be05ed57af05d388a2f87ef0d0f36bd008b367a64617326ddd12c8ce546c55c9d6a5b54dee28324d31c61194d73b7031ea -SHA512 (moby-docker-v29.1.2-vendor.tar.bz2) = 20c39d1bdd07b919b22fa8d737c397e9a801c4743561eb4397cdc56013e2daa2a60dd5369a2878674ee9a457b29163083e5a0ed44eaeb4de8b639f443673f046 -SHA512 (moby-docker-v29.1.2.tar.gz) = 681c24f67efa61966af78e35b981010072451eddd91e86658c1e9ffe5ec864ca1a58691a52e726b4d92802a05e23e06e1f5874b887752cec378fddb54aa14bf4 +SHA512 (cli-29.1.3-vendor.tar.bz2) = 6147c6ad55e3c65c45afa3d9cc01cee7bc92da4d709cb4ccd91dfc97db8f6d459fb089f3cd02464b35ac5e78552f971c8c7a20870eab5ce9543d7d2e66347ac7 +SHA512 (cli-29.1.3.tar.gz) = f37a5d125eb93639db8527c826078571ef5938be6bb33d132ccf693bf0810e3b9bb354074488021e129760a44b7fc51cd8295c6c6fe79211b70736231f47320e +SHA512 (moby-docker-v29.1.3-vendor.tar.bz2) = 62843963414fd6c646d7fbd5bcc7b69019a7a9005bb52bf4d935fa337aafc2df15fb9412e31b951f1e43eb8539ae9c644bfb55de60819b6ca1ccf094c0251a20 +SHA512 (moby-docker-v29.1.3.tar.gz) = e3fa96057beb2849fea6e4fd480b08ffbe9b74b851060901e54e57aa62938888b260b7cef4cee33d4cffd965fabc0db7fc0aa5aeeae9aa6b9870c3dbcf7b6ec3 From 368edbfc953baadd10d720e78f31a44e6bfbd266 Mon Sep 17 00:00:00 2001 From: Bradley G Smith Date: Fri, 9 Jan 2026 09:17:36 -0800 Subject: [PATCH 163/163] Update to release v29.1.4 - Resolves: rhbz#2428234 - Upstream fixes --- .gitignore | 4 ++++ moby-engine.spec | 2 +- sources | 8 ++++---- 3 files changed, 9 insertions(+), 5 deletions(-) diff --git a/.gitignore b/.gitignore index 569e499..8ed6b2d 100644 --- a/.gitignore +++ b/.gitignore @@ -196,3 +196,7 @@ moby-v20.10.10.tar.gz /cli-29.1.3.tar.gz /moby-docker-v29.1.3-vendor.tar.bz2 /moby-docker-v29.1.3.tar.gz +/cli-29.1.4.tar.gz +/cli-29.1.4-vendor.tar.bz2 +/moby-docker-v29.1.4.tar.gz +/moby-docker-v29.1.4-vendor.tar.bz2 diff --git a/moby-engine.spec b/moby-engine.spec index 8119ef9..7442443 100644 --- a/moby-engine.spec +++ b/moby-engine.spec @@ -12,7 +12,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 29.1.3 +%global version0 29.1.4 %{lua: local version0 = rpm.expand("%{version0}"):gsub("~", "-") rpm.define("tag0 " .. "docker-v" .. version0) diff --git a/sources b/sources index fe042c8..f399178 100644 --- a/sources +++ b/sources @@ -1,4 +1,4 @@ -SHA512 (cli-29.1.3-vendor.tar.bz2) = 6147c6ad55e3c65c45afa3d9cc01cee7bc92da4d709cb4ccd91dfc97db8f6d459fb089f3cd02464b35ac5e78552f971c8c7a20870eab5ce9543d7d2e66347ac7 -SHA512 (cli-29.1.3.tar.gz) = f37a5d125eb93639db8527c826078571ef5938be6bb33d132ccf693bf0810e3b9bb354074488021e129760a44b7fc51cd8295c6c6fe79211b70736231f47320e -SHA512 (moby-docker-v29.1.3-vendor.tar.bz2) = 62843963414fd6c646d7fbd5bcc7b69019a7a9005bb52bf4d935fa337aafc2df15fb9412e31b951f1e43eb8539ae9c644bfb55de60819b6ca1ccf094c0251a20 -SHA512 (moby-docker-v29.1.3.tar.gz) = e3fa96057beb2849fea6e4fd480b08ffbe9b74b851060901e54e57aa62938888b260b7cef4cee33d4cffd965fabc0db7fc0aa5aeeae9aa6b9870c3dbcf7b6ec3 +SHA512 (cli-29.1.4.tar.gz) = 517b3976e740aef1e40e7cc90d3792f3ef2a13fc3d5dd3e41126451bc938a43c37c1c7ff36de8b47aa7870d0c8dd4efa124639cf505626b339a87ffdb25c8a79 +SHA512 (cli-29.1.4-vendor.tar.bz2) = 6147c6ad55e3c65c45afa3d9cc01cee7bc92da4d709cb4ccd91dfc97db8f6d459fb089f3cd02464b35ac5e78552f971c8c7a20870eab5ce9543d7d2e66347ac7 +SHA512 (moby-docker-v29.1.4.tar.gz) = 53a46ddce7363c7cf74b07a928f195af6fd646524154170a90a5303ea39ad7d79980eff94568ed84c242a381c467b0613bd1f9344f6cdce89fba6a6f4e95defd +SHA512 (moby-docker-v29.1.4-vendor.tar.bz2) = 8ca3d92590f86cd24bba61356646ac20a5cecc6aab1fe23c110f7edb1d86734f8631360580bdb4ff250c373f1ae02b5c37ccbbc90380d5e9f7e9b95be575dbb4