From 202bc73584e991c804ffab61a2b99cbf59194896 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sun, 21 Jan 2024 08:25:11 +0000 Subject: [PATCH 01/70] 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 02/70] 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 03/70] 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 04/70] 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 05/70] 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 06/70] 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 07/70] 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 08/70] 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 09/70] 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 10/70] 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 11/70] 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 12/70] 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 13/70] 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 14/70] 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 15/70] 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 16/70] 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 17/70] 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 18/70] 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 19/70] 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 20/70] 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 21/70] 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 22/70] 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 23/70] 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 24/70] 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 25/70] 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 26/70] 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 27/70] 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 28/70] 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 29/70] 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 30/70] 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 31/70] 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 32/70] 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 33/70] 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 34/70] 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 35/70] 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 36/70] 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 37/70] 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 38/70] 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 39/70] 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 40/70] 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 41/70] 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 42/70] 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 43/70] 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 44/70] 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 45/70] 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 46/70] 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 47/70] 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 48/70] 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 49/70] 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 50/70] 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 51/70] 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 52/70] 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 53/70] 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 54/70] 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 55/70] 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 56/70] 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 57/70] 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 58/70] 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 59/70] 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 60/70] 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 61/70] 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 62/70] 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 63/70] 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 64/70] 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 65/70] 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 66/70] 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 67/70] 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 68/70] 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 69/70] 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 70/70] 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