Compare commits

..

No commits in common. "rawhide" and "f38" have entirely different histories.

16 changed files with 701 additions and 948 deletions

143
.gitignore vendored
View file

@ -1,10 +1,3 @@
# Ignore unpacked source directories
/moby-*/
/cli-*/
# Ignore fedpkg mockbuild artifacts
/results_*
/2d0083d657f82c47044c8d3948ba434b622fe2fd.tar.gz
/425e105d5a03fabd737a126ad93d62a9eeede87f.tar.gz
/894b81a4b802e4eb2a91d1ce216b8817763c29fb.tar.gz
@ -64,139 +57,3 @@ 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
/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
/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
/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
/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
/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
/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
/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
/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
/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
/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
/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
/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
/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
/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
/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
/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
/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
/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
/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
/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
/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
/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
/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
/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
/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
/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
/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
/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
/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
/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
/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
/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

View file

@ -1,34 +0,0 @@
From 5b6aae1885d02aa0a1ab0846834b86d87c989b79 Mon Sep 17 00:00:00 2001
From: Maxwell G <maxwell@gtmx.me>
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

View file

@ -1,33 +1,3 @@
# moby-engine
The moby-engine package
## Maintainer notes
Follow these steps to build this package.
1. Use your favorite git client to check out the repository if not already present.
```
fedpkg clone moby-engine
```
1. Update the `%version0` macro in `moby-engine.spec` to the target version
using your preferred text editor.
```
vim moby-engine.spec
```
1. Run `./mkvendor.sh` to download upstream source files and generate vendor archives.
```
./mkvendor.sh
```
1. Build and test the package locally.
```
# fedpkg mockbuild example
fedpkg --release rawhide mockbuild
```
The moby-engine package

277
changelog
View file

@ -1,277 +0,0 @@
* Thu Jul 18 2024 Fedora Release Engineering <releng@fedoraproject.org>
- Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild
* Sun Feb 11 2024 Maxwell G <maxwell@gtmx.me> - 24.0.5-4
- Rebuild for golang 1.22.0
* Thu Jan 25 2024 Fedora Release Engineering <releng@fedoraproject.org>
- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild
* Sun Jan 21 2024 Fedora Release Engineering <releng@fedoraproject.org>
- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild
* Wed Aug 23 2023 LuK1337 <priv.luk@gmail.com> - 24.0.5-1
- Update moby-engine to 24.0.5
* Thu Jul 20 2023 Fedora Release Engineering <releng@fedoraproject.org>
- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild
* Sun Jan 29 2023 John Ghatas <john@johnghatas.com>
- Update moby-engine to 23.0.4
* Sun Jan 29 2023 Sérgio Basto <sergio@serjux.com>
- Update moby-engine to 20.10.23
* Thu Jan 19 2023 Fedora Release Engineering <releng@fedoraproject.org>
- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild
* Sun Jan 01 2023 Sérgio Basto <sergio@serjux.com>
- Update moby-engine to 20.10.22
* Wed Dec 14 2022 Dan Čermák <dan.cermak@cgc-instruments.com> - 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 <copperi@fedoraproject.org> - 20.10.20-1
- Update to 20.10.20.
- Mitigates CVE-2022-39253
* Tue Oct 18 2022 Jan Kuparinen <copperi@fedoraproject.org> - 20.10.19-1
- Update to 20.10.19.
* Sat Sep 10 2022 Maxwell G <gotmax@e.email> - 20.10.18-1
- Update to 20.10.18.
- Mitigates CVE-2022-36109 / GHSA-rc4r-wh2q-q6c4
* Tue Aug 30 2022 Luca BRUNO <lucab@lucabruno.net> - 20.10.17-8
- Move 'docker' group creation logic to a sysusers.d fragment
Resolves: rhbz#1745936
* Fri Aug 05 2022 Maxwell G <gotmax@e.email> - 20.10.17-7
- Migrate to SPDX license identifiers
- Generate debuginfo
- Specfile improvements
* Thu Jul 21 2022 Fedora Release Engineering <releng@fedoraproject.org>
- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild
* Tue Jul 19 2022 Maxwell G <gotmax@e.email> - 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 <gotmax@e.email> - 20.10.17-4
- Only build on %%golang_arches (i.e. where golang is available).
* Sun Jun 19 2022 Maxwell G <gotmax@e.email> - 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 <gotmax@e.email> - 20.10.17-2
- Rebuild for new golang-github-docker-libnetwork
* Fri Jun 10 2022 Maxwell G <gotmax@e.email> - 20.10.17-1
- Update to 20.10.17. Fixes rhbz#2095714.
* Fri May 13 2022 Maxwell G <gotmax@e.email> - 20.10.16-1
- Update to 20.10.16.
* Sat May 07 2022 Maxwell G <gotmax@e.email> - 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 <gotmax@e.email> - 20.10.14-1
- Update to 20.10.14. Fixes rhbz#2063052.
- Mitigate CVE-2022-24769.
* Mon Jan 31 2022 Maxwell G <gotmax@e.email> - 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 <releng@fedoraproject.org> - 20.10.12-2
- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild
* Tue Jan 11 2022 Maxwell G <gotmax@e.email> - 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 <o.lemasle@gmail.com> - 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 <gotmax@e.email> - 20.10.10-1
- Update to 20.10.10 (fixes rhbz#2015385)
- Update virtual provides
* Fri Oct 08 2021 Maxwell G <gotmax@e.email> - 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 <o.lemasle@gmail.com> - 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 <dusty@dustymabe.com> - 20.10.7-3
- Remove `Requires(post)` on firewalld-filesystem.
* Thu Jul 22 2021 Fedora Release Engineering <releng@fedoraproject.org> - 20.10.7-2
- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild
* Fri Jul 16 2021 Olivier Lemasle <o.lemasle@gmail.com> - 20.10.7-1
- Update to upstream 20.10.7 (fixes rhbz#1967390)
* Tue May 04 2021 Olivier Lemasle <o.lemasle@gmail.com> - 20.10.6-2
- Add conflict with podman-docker
* Tue Apr 20 2021 Olivier Lemasle <o.lemasle@gmail.com> - 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 <o.lemasle@gmail.com> - 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 <zbyszek@in.waw.pl> - 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 <releng@fedoraproject.org> - 19.03.13-2.ce.git4484c46
- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild
* Fri Oct 02 2020 Olivier Lemasle <o.lemasle@gmail.com> - 19.03.13-1.ce.git4484c46
- Update to upstream 19.03.13 (#1837641)
* Fri Oct 02 2020 Olivier Lemasle <o.lemasle@gmail.com> - 19.03.11-4.ce.git42e35e6
- Fix FTBFS: adapt to change to CMake builds (#1864160)
* Sat Aug 01 2020 Fedora Release Engineering <releng@fedoraproject.org> - 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 <releng@fedoraproject.org> - 19.03.11-2.ce.git42e35e6
- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild
* Sun Jun 07 2020 Olivier Lemasle <o.lemasle@gmail.com> - 19.03.11-1.ce.git42e35e6
- Update to upstream 19.03.11 to prevent CVE-2020-13401
* Thu May 07 2020 Olivier Lemasle <o.lemasle@gmail.com> - 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 <o.lemasle@gmail.com> - 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 <o.lemasle@gmail.com> - 19.03.7-2.ce.git7141c19
- Add Conflicts with docker-ce-cli and Obsoletes docker-common
* Sat Mar 7 2020 Olivier Lemasle <o.lemasle@gmail.com> - 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 <releng@fedoraproject.org> - 18.09.8-3.ce.git0dd43dd
- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild
* Thu Jul 25 2019 Fedora Release Engineering <releng@fedoraproject.org> - 18.09.8-2.ce.git0dd43dd
- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild
* Thu Jul 18 2019 Olivier Lemasle <o.lemasle@gmail.com> - 18.09.8-1.ce.git0dd43dd
- Update to latest upstream release - Docker CE 18.09.8
* Sat Jul 13 2019 Olivier Lemasle <o.lemasle@gmail.com> - 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 <o.lemasle@gmail.com> - 18.09.7-4.ce.git2d0083d
- Add nofile ulimit to default docker daemon options (#1715254, #1708115)
* Fri Jul 12 2019 Olivier Lemasle <o.lemasle@gmail.com> - 18.09.7-3.ce.git2d0083d
- rebuilt
* Fri Jul 12 2019 Olivier Lemasle <o.lemasle@gmail.com> - 18.09.7-2.ce.git2d0083d
- Depend on packaged versions "runc" and "containerd" instead of building them.
* Thu Jun 27 2019 David Michael <dm0@redhat.com> - 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 <dm0@redhat.com> - 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 <dm0@redhat.com> - 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 <dm0@redhat.com> - 18.06.3-2.ce.gitd7080c1
- Conflict with docker-common. (#1693397)
* Thu Feb 21 2019 David Michael <dm0@redhat.com> - 18.06.3-1.ce.gitd7080c1
- Update docker-ce to commit d7080c1 (version 18.06.3).
* Tue Feb 12 2019 David Michael <dm0@redhat.com> - 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 <dm0@redhat.com> - 18.06.1-3.ce.gite68fc7a
- Apply a runc patch for CVE-2019-5736.
* Fri Feb 01 2019 Fedora Release Engineering <releng@fedoraproject.org> - 18.06.1-2.ce.gite68fc7a
- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild
* Thu Nov 29 2018 David Michael <dm0@redhat.com> - 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 <rpm@skarbek.name> - 18.06.0-2.ce.git0ffa825
- add configuration file
- update service file
* Sat Aug 18 2018 Lokesh Mandvekar <lsm5@fedoraproject.org> - 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 <lsm5@fedoraproject.org> - 17.03.2-4.ce.gitf5ec1e2
- correct some rpmlint errors
* Wed Feb 21 2018 Lokesh Mandvekar <lsm5@fedoraproject.org> - 17.03.2-3.ce
- docker-* symlinks to moby-* (RE: gh PR 34226)
* Wed Feb 21 2018 Lokesh Mandvekar <lsm5@fedoraproject.org> - 17.03.2-2.ce
- rename binaries as per upstream gh PR 34226
* Fri Jan 26 2018 Lokesh Mandvekar <lsm5@fedoraproject.org> - 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

View file

@ -1,28 +0,0 @@
[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"
[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"],
]

38
docker.service Normal file
View file

@ -0,0 +1,38 @@
[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

10
docker.sysconfig Normal file
View file

@ -0,0 +1,10 @@
# /etc/sysconfig/docker
# Modify these options if you want to change the way the docker daemon runs
OPTIONS="--selinux-enabled \
--log-driver=journald \
--live-restore \
--default-ulimit nofile=1024:1024 \
--init-path /usr/libexec/docker/docker-init \
--userland-proxy-path /usr/libexec/docker/docker-proxy \
"

View file

@ -1,56 +0,0 @@
[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",
"LICENSE.macros",
]
[[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"
[[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/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"
[[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"

12
generate-docs.sh Normal file
View file

@ -0,0 +1,12 @@
cd man
for FILE in *.md; do
base="$(basename "$FILE")"
name="${base%.md}"
num="${name##*.}"
if [ -z "$num" ] || [ "$name" = "$num" ]; then
# skip files that aren't of the format xxxx.N.md (like README.md)
continue
fi
mkdir -p "./man${num}"
(set -x ;go-md2man -in "$FILE" -out "./man${num}/${name}")
done

View file

@ -1,5 +0,0 @@
# Copyright (C) 2024 Maxwell G <maxwell@gtmx.me>
# Copyright (C) Fedora Project Authors
# SPDX-License-Identifier: MIT
%moby_cli_plugins_dir %{_libexecdir}/docker/cli-plugins

View file

@ -1,41 +0,0 @@
#!/bin/bash
# Copyright (C) 2024 Maxwell G <maxwell@gtmx.me>
# SPDX-License-Identifier: MIT
set -euo pipefail
# Source0: %{gosource0}
# Source1: %{archivename0}-vendor.tar.bz2
# Source2: %{gosource2}
# Source3: %{archivename2}-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
temp="$(mktemp -d)"
trap 'rm -rf $temp' EXIT
here="$(pwd)"
# Retrieve remote sources
spectool -g moby-engine.spec
# (re)create vendor archives
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
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"

View file

@ -1,391 +1,548 @@
# This specfile is licensed under:
# SPDX-FileCopyrightText: Fedora Project Authors
# SPDX-FileCopyrightText: 2024 Maxwell G <maxwell@gtmx.me>
# SPDX-License-Identifier: MIT
# License Text: https://spdx.org/licenses/MIT.html
# SPDX-FileCopyrightText: Fedora Project Authors
# SPDX-FileCopyrightText: 2022 Maxwell G <gotmax@e.email>
# See %%{name}.spec.license for the full license text.
# Generated by go2rpm 1.11.0
%bcond_without check
# 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})
# 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 29.1.4
%{lua:
local version0 = rpm.expand("%{version0}"):gsub("~", "-")
rpm.define("tag0 " .. "docker-v" .. version0)
rpm.define("distprefix0 %{nil}")
rpm.define("tag2 " .. "v" .. version0)
}
# 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/docker/cli
%global goipath2 github.com/docker/cli
%global version2 %{version0}
# 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 -a -f
%global engine_dir ../%{topdir0}
%global cli_dir ../%{topdir2}
Name: moby-engine
Version: 24.0.5
Release: 1%{?dist}
Summary: The open-source application container engine
License: Apache-2.0
Source0: %{git_moby}/archive/v%{version}/moby-%{version}.tar.gz
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
%global common_description %{expand:
# 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
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
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 do not require you to use a particular
everything in between - and they don't 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.
}
Name: moby-engine
Version: %{version0}
Release: %autorelease
Summary: The open-source application container engine
%package fish-completion
Summary: Fish completion files for %{name}
BuildArch: noarch
Requires: %{name} = %{version}-%{release}
Requires: fish
Provides: docker-fish-completion = %{version}-%{release}
# 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}
# 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.
Source0: %{gosource0}
Source1: %{archivename0}-vendor.tar.bz2
Source2: %{gosource2}
Source3: %{archivename2}-vendor.tar.bz2
%description fish-completion
This package installs %{summary}.
Source100: moby-engine-systemd-sysusers.conf
Source101: macros.moby
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
# Patches 1000+ are for docker/cli
# Patch1000:
BuildRequires: git-core
BuildRequires: go-vendor-tools
BuildRequires: make
BuildRequires: pkg-config
BuildRequires: systemd-devel
BuildRequires: /usr/bin/go-md2man
BuildRequires: nftables-devel
# docker.service depends on containerd
Requires: containerd
# 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
# Other runtime packages (sorted)
Requires: container-selinux
Requires: iptables
Requires: libseccomp
Requires: nftables
Requires: pigz
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}
%package zsh-completion
Summary: Zsh completion files for %{name}
BuildArch: noarch
Requires: %{name} = %{version}-%{release}
Requires: zsh
Provides: docker-zsh-completion = %{version}-%{release}
%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 %{common_description}
%description nano
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
BuildArch: noarch
%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
BuildArch: noarch
%description -n moby-rpm-macros %{common_description}
This package provides RPM macros for the Moby/Docker stack.
%prep
%goprep -a -A
# moby-engine
cd %{_builddir}/%{extractdir0}
# Unpack vendor archive
tar -xf %{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} .
# docker-cli
cd %{cli_dir}
# Unpack vendor archive
tar -xf %{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
rm -f man/go.mod
%generate_buildrequires
# moby-engine
%go_vendor_license_buildrequires -c %{S:200}
# docker-cli
%go_vendor_license_buildrequires -c %{S:201}
%setup -q -a 1 -a 2 -n moby-%{version}
# 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
export GO_LDFLAGS="" GO_BUILDTAGS="" CGO_ENABLED=1
%global gomodulesmode GO111MODULE=on
mkdir -p _build/bin
# moby-engine
cd %{engine_dir}
# DOCKER_DEBUG: Ensure that all debuginfo is preserved
BUILDFLAGS="%{gocompilerflags} -a -v" \
CGO_CFLAGS="%{build_cflags}" \
CGO_LDFLAGS="%{build_ldflags}" \
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
# build docker-proxy / libnetwork
(
# build man pages using Makefile in man subdirectory
pushd man
GO_MD2MAN=go-md2man %make_build all
popd
# 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
)
# 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
# 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
)
%install
# moby-engine
cd %{engine_dir}
# Install licenses
%go_vendor_license_install -c %{S:200}
# 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 -Dpm 644 man/man8/*.8 -t %{buildroot}%{_mandir}/man8/
# install binary
install -Dpm 755 _build/bin/docker _build/bin/dockerd -t %{buildroot}%{_bindir}/
# 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/
cd -
# install proxy
install -Dpm 755 _build/bin/docker-proxy -t %{buildroot}%{_libexecdir}/docker/
# moby-filesystem
mkdir -p %{buildroot}%{_libexecdir}/docker
mkdir %{buildroot}%{_libexecdir}/docker/cli-plugins
# install tini
install -Dpm 755 tini-%{commit_tini}/%{__cmake_builddir}/tini-static %{buildroot}%{_libexecdir}/docker/docker-init
# moby-rpm-macros
install -Dpm 0644 macros.moby -t %{buildroot}%{_rpmmacrodir}
# install udev rules
install -Dpm 644 contrib/udev/80-docker.rules -t %{buildroot}%{_usr}/lib/udev/rules.d/
%check
export PATH="%{buildroot}%{_bindir}:${PATH}" TZ=utc
# add init scripts
install -Dpm 644 %{SOURCE3} contrib/init/systemd/docker.socket -t %{buildroot}%{_unitdir}/
# moby-engine
cd %{engine_dir}
%go_vendor_license_check -c %{S:200}
# for additional args
install -Dpm 644 %{SOURCE4} %{buildroot}%{_sysconfdir}/sysconfig/docker
# docker-cli
cd %{cli_dir}
%go_vendor_license_check -c %{S:201} %{cli_license}
# Install sysusers configuration
install -Dpm 0644 %{SOURCE5} %{buildroot}%{_sysusersdir}/moby-engine.conf
%if %{with check}
# moby-engine
cd %{engine_dir}
# Manually skip specific tests
%global engine_ignores %{shrink:
%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
-s "TestJoinGoodSymlink"
-s "TestJoinWithSymlinkReplace"
-s "TestJoinCloseInvalidates"
%dnl Test timeout
-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
}
%gocheck2 -F %{engine_ignores}
# 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/
# docker-cli
cd %{cli_dir}
%global cli_ignores %{shrink:
-s "TestInitializeFromClientHangs"
%dnl Needs network
-s "TestRunBuildFromGitHubSpecialCase"
%dnl Test is flaky
-s "TestConnectAndWait"
%dnl Test panics
-s "TestRunAttachTermination"
-s "TestRunPullTermination"
-s "TestUpgradePromptTermination"
}
%gocheck2 -F -t e2e %{cli_ignores}
%endif
# 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 -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"
done
%pre
%sysusers_create_compat %{SOURCE5}
%post
%systemd_post docker.service docker.socket
%firewalld_reload
%preun
%systemd_preun docker.service docker.socket
%postun
%systemd_postun_with_restart docker.service
%files -f %{engine_dir}/%{go_vendor_license_filelist}
%license %{engine_dir}/vendor/modules.txt
%doc %{engine_dir}/README.md
%{_bindir}/docker-proxy
%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
%{_bindir}/dockerd
%{_sysusersdir}/moby-engine.conf
%dir %{_libexecdir}/docker/
%{_libexecdir}/docker/docker-proxy
%{_libexecdir}/docker/docker-init
%{_usr}/lib/udev/rules.d/80-docker.rules
%{_unitdir}/docker.service
%{_unitdir}/docker.socket
%{_mandir}/man8/dockerd.8*
%files nano
%license %{engine_dir}/AUTHORS
%license %{engine_dir}/LICENSE
%license %{engine_dir}/NOTICE
%files -n docker-cli -f %{cli_dir}/%{go_vendor_license_filelist}
%license %{cli_dir}/vendor/modules.txt
%doc %{cli_dir}/README.md
%{_bindir}/docker
%{_sysusersdir}/moby-engine.conf
%{_datadir}/bash-completion/completions/docker
%{_mandir}/man1/docker*.1*
%{_mandir}/man5/{Dockerfile,docker-config-json}.5*
%{bash_completions_dir}/docker
%{fish_completions_dir}/docker.fish
%{zsh_completions_dir}/_docker
%{_mandir}/man8/dockerd.8*
%files zsh-completion
%{_datadir}/zsh/site-functions/_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
%files fish-completion
%{_datadir}/fish/vendor_completions.d/docker.fish
%files nano
%dir %{_datadir}/nano
%{_datadir}/nano/Dockerfile.nanorc
%changelog
%autochangelog
* Wed Aug 23 2023 LuK1337 <priv.luk@gmail.com> - 24.0.5-1
- Update moby-engine to 24.0.5
* Thu Jul 20 2023 Fedora Release Engineering <releng@fedoraproject.org>
- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild
* Sun Jan 29 2023 John Ghatas <john@johnghatas.com>
- Update moby-engine to 23.0.4
* Sun Jan 29 2023 Sérgio Basto <sergio@serjux.com>
- Update moby-engine to 20.10.23
* Thu Jan 19 2023 Fedora Release Engineering <releng@fedoraproject.org>
- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild
* Sun Jan 01 2023 Sérgio Basto <sergio@serjux.com>
- Update moby-engine to 20.10.22
* Wed Dec 14 2022 Dan Čermák <dan.cermak@cgc-instruments.com> - 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 <copperi@fedoraproject.org> - 20.10.20-1
- Update to 20.10.20.
- Mitigates CVE-2022-39253
* Tue Oct 18 2022 Jan Kuparinen <copperi@fedoraproject.org> - 20.10.19-1
- Update to 20.10.19.
* Sat Sep 10 2022 Maxwell G <gotmax@e.email> - 20.10.18-1
- Update to 20.10.18.
- Mitigates CVE-2022-36109 / GHSA-rc4r-wh2q-q6c4
* Tue Aug 30 2022 Luca BRUNO <lucab@lucabruno.net> - 20.10.17-8
- Move 'docker' group creation logic to a sysusers.d fragment
Resolves: rhbz#1745936
* Fri Aug 05 2022 Maxwell G <gotmax@e.email> - 20.10.17-7
- Migrate to SPDX license identifiers
- Generate debuginfo
- Specfile improvements
* Thu Jul 21 2022 Fedora Release Engineering <releng@fedoraproject.org>
- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild
* Tue Jul 19 2022 Maxwell G <gotmax@e.email> - 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 <gotmax@e.email> - 20.10.17-4
- Only build on %%golang_arches (i.e. where golang is available).
* Sun Jun 19 2022 Maxwell G <gotmax@e.email> - 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 <gotmax@e.email> - 20.10.17-2
- Rebuild for new golang-github-docker-libnetwork
* Fri Jun 10 2022 Maxwell G <gotmax@e.email> - 20.10.17-1
- Update to 20.10.17. Fixes rhbz#2095714.
* Fri May 13 2022 Maxwell G <gotmax@e.email> - 20.10.16-1
- Update to 20.10.16.
* Sat May 07 2022 Maxwell G <gotmax@e.email> - 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 <gotmax@e.email> - 20.10.14-1
- Update to 20.10.14. Fixes rhbz#2063052.
- Mitigate CVE-2022-24769.
* Mon Jan 31 2022 Maxwell G <gotmax@e.email> - 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 <releng@fedoraproject.org> - 20.10.12-2
- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild
* Tue Jan 11 2022 Maxwell G <gotmax@e.email> - 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 <o.lemasle@gmail.com> - 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 <gotmax@e.email> - 20.10.10-1
- Update to 20.10.10 (fixes rhbz#2015385)
- Update virtual provides
* Fri Oct 08 2021 Maxwell G <gotmax@e.email> - 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 <o.lemasle@gmail.com> - 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 <dusty@dustymabe.com> - 20.10.7-3
- Remove `Requires(post)` on firewalld-filesystem.
* Thu Jul 22 2021 Fedora Release Engineering <releng@fedoraproject.org> - 20.10.7-2
- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild
* Fri Jul 16 2021 Olivier Lemasle <o.lemasle@gmail.com> - 20.10.7-1
- Update to upstream 20.10.7 (fixes rhbz#1967390)
* Tue May 04 2021 Olivier Lemasle <o.lemasle@gmail.com> - 20.10.6-2
- Add conflict with podman-docker
* Tue Apr 20 2021 Olivier Lemasle <o.lemasle@gmail.com> - 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 <o.lemasle@gmail.com> - 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 <zbyszek@in.waw.pl> - 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 <releng@fedoraproject.org> - 19.03.13-2.ce.git4484c46
- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild
* Fri Oct 02 2020 Olivier Lemasle <o.lemasle@gmail.com> - 19.03.13-1.ce.git4484c46
- Update to upstream 19.03.13 (#1837641)
* Fri Oct 02 2020 Olivier Lemasle <o.lemasle@gmail.com> - 19.03.11-4.ce.git42e35e6
- Fix FTBFS: adapt to change to CMake builds (#1864160)
* Sat Aug 01 2020 Fedora Release Engineering <releng@fedoraproject.org> - 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 <releng@fedoraproject.org> - 19.03.11-2.ce.git42e35e6
- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild
* Sun Jun 07 2020 Olivier Lemasle <o.lemasle@gmail.com> - 19.03.11-1.ce.git42e35e6
- Update to upstream 19.03.11 to prevent CVE-2020-13401
* Thu May 07 2020 Olivier Lemasle <o.lemasle@gmail.com> - 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 <o.lemasle@gmail.com> - 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 <o.lemasle@gmail.com> - 19.03.7-2.ce.git7141c19
- Add Conflicts with docker-ce-cli and Obsoletes docker-common
* Sat Mar 7 2020 Olivier Lemasle <o.lemasle@gmail.com> - 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 <releng@fedoraproject.org> - 18.09.8-3.ce.git0dd43dd
- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild
* Thu Jul 25 2019 Fedora Release Engineering <releng@fedoraproject.org> - 18.09.8-2.ce.git0dd43dd
- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild
* Thu Jul 18 2019 Olivier Lemasle <o.lemasle@gmail.com> - 18.09.8-1.ce.git0dd43dd
- Update to latest upstream release - Docker CE 18.09.8
* Sat Jul 13 2019 Olivier Lemasle <o.lemasle@gmail.com> - 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 <o.lemasle@gmail.com> - 18.09.7-4.ce.git2d0083d
- Add nofile ulimit to default docker daemon options (#1715254, #1708115)
* Fri Jul 12 2019 Olivier Lemasle <o.lemasle@gmail.com> - 18.09.7-3.ce.git2d0083d
- rebuilt
* Fri Jul 12 2019 Olivier Lemasle <o.lemasle@gmail.com> - 18.09.7-2.ce.git2d0083d
- Depend on packaged versions "runc" and "containerd" instead of building them.
* Thu Jun 27 2019 David Michael <dm0@redhat.com> - 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 <dm0@redhat.com> - 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 <dm0@redhat.com> - 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 <dm0@redhat.com> - 18.06.3-2.ce.gitd7080c1
- Conflict with docker-common. (#1693397)
* Thu Feb 21 2019 David Michael <dm0@redhat.com> - 18.06.3-1.ce.gitd7080c1
- Update docker-ce to commit d7080c1 (version 18.06.3).
* Tue Feb 12 2019 David Michael <dm0@redhat.com> - 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 <dm0@redhat.com> - 18.06.1-3.ce.gite68fc7a
- Apply a runc patch for CVE-2019-5736.
* Fri Feb 01 2019 Fedora Release Engineering <releng@fedoraproject.org> - 18.06.1-2.ce.gite68fc7a
- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild
* Thu Nov 29 2018 David Michael <dm0@redhat.com> - 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 <rpm@skarbek.name> - 18.06.0-2.ce.git0ffa825
- add configuration file
- update service file
* Sat Aug 18 2018 Lokesh Mandvekar <lsm5@fedoraproject.org> - 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 <lsm5@fedoraproject.org> - 17.03.2-4.ce.gitf5ec1e2
- correct some rpmlint errors
* Wed Feb 21 2018 Lokesh Mandvekar <lsm5@fedoraproject.org> - 17.03.2-3.ce
- docker-* symlinks to moby-* (RE: gh PR 34226)
* Wed Feb 21 2018 Lokesh Mandvekar <lsm5@fedoraproject.org> - 17.03.2-2.ce
- rename binaries as per upstream gh PR 34226
* Fri Jan 26 2018 Lokesh Mandvekar <lsm5@fedoraproject.org> - 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

View file

@ -1,7 +1,6 @@
MIT License
Copyright (C) 2024 Maxwell G <maxwell@gtmx.me>
Copyright (C) Fedora Project Authors
Copyright (c) <year> <copyright holders>
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:

108
provides.spec.inc Normal file
View file

@ -0,0 +1,108 @@
# 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

View file

@ -1,4 +1,3 @@
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
SHA512 (cli-24.0.5.tar.gz) = 765c67634d91d248b156d3e407398b98b7a0a89507bbac0310d4a68b95aa1a05e3af43c8b90bc10166748749d8cc36670619fc9efca110beefbdcd4385dc96be
SHA512 (moby-24.0.5.tar.gz) = cde2e47e7658b153399ee29154ec21eebf54b292185e07d43b968895dcfdfead95e4507fefb713859a4540f21d8007116d3ebeaa1fb7ba305fb2a0449ba1bee6
SHA512 (tini-0b44d36.tar.gz) = 5294e877c369177b09c2a34f759e911f612f6977e960a63d46b6e5ebea790455dad972e91ca10c478693da637a5479d4e0b904efcfb5ae291e87e7e66674c752

44
update.sh Executable file
View file

@ -0,0 +1,44 @@
#!/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