From 997062e48cf4ff1993ff83de9c937abea6996c4e Mon Sep 17 00:00:00 2001 From: David Michael Date: Fri, 28 Jun 2019 16:32:44 -0400 Subject: [PATCH 1/3] Update to 18.09.7 --- .gitignore | 8 ++++---- moby-engine.spec | 26 ++++++++++++++++---------- sources | 8 ++++---- 3 files changed, 24 insertions(+), 18 deletions(-) diff --git a/.gitignore b/.gitignore index 1185114..eec94bd 100644 --- a/.gitignore +++ b/.gitignore @@ -1,5 +1,5 @@ -/2b18fe1d885ee5083ef9f0838fee39b62d653e30.tar.gz -/481bc7715621adba10752357e0d537c8dc86507d.tar.gz -/872f0a83c98add6cae255c8859e29532febc0039.tar.gz -/bb71b10fd8f58240ca47fbb579b9d1028eea7c84.tar.gz +/2d0083d657f82c47044c8d3948ba434b622fe2fd.tar.gz +/425e105d5a03fabd737a126ad93d62a9eeede87f.tar.gz +/894b81a4b802e4eb2a91d1ce216b8817763c29fb.tar.gz +/e7933d41e7b206756115aa9df5e0599fc5169742.tar.gz /fec3683b971d9c3ef73f284f176672c44b448662.tar.gz diff --git a/moby-engine.spec b/moby-engine.spec index 2cf2ac2..711aec7 100644 --- a/moby-engine.spec +++ b/moby-engine.spec @@ -15,22 +15,22 @@ # moby / docker-ce / cli %global git_moby https://github.com/%{service_name}/%{service_name}-ce -%global commit_moby 481bc7715621adba10752357e0d537c8dc86507d +%global commit_moby 2d0083d657f82c47044c8d3948ba434b622fe2fd %global shortcommit_moby %(c=%{commit_moby}; echo ${c:0:7}) -# docker-runc +# runc %global git_runc https://github.com/opencontainers/runc -%global commit_runc 2b18fe1d885ee5083ef9f0838fee39b62d653e30 +%global commit_runc 425e105d5a03fabd737a126ad93d62a9eeede87f %global shortcommit_runc %(c=%{commit_runc}; echo ${c:0:7}) -# docker-containerd +# containerd %global git_containerd https://github.com/containerd/containerd -%global commit_containerd bb71b10fd8f58240ca47fbb579b9d1028eea7c84 +%global commit_containerd 894b81a4b802e4eb2a91d1ce216b8817763c29fb %global shortcommit_containerd %(c=%{commit_containerd}; echo ${c:0:7}) # docker-proxy / libnetwork %global git_libnetwork https://github.com/%{service_name}/libnetwork -%global commit_libnetwork 872f0a83c98add6cae255c8859e29532febc0039 +%global commit_libnetwork e7933d41e7b206756115aa9df5e0599fc5169742 %global shortcommit_libnetwork %(c=%{commit_libnetwork}; echo ${c:0:7}) # tini @@ -39,7 +39,7 @@ %global shortcommit_tini %(c=%{commit_tini}; echo ${c:0:7}) Name: %{newname}-engine -Version: 18.09.6 +Version: 18.09.7 Release: 1.ce.git%{shortcommit_moby}%{?dist} Summary: The open-source application container engine License: ASL 2.0 @@ -161,7 +161,7 @@ sed -i '/env bash/d' components/cli/contrib/completion/bash/docker sed -i 's/-s -w *//' containerd-%{commit_containerd}/Makefile %build -# build docker-runc +# build runc ( cd runc-%{commit_runc} mv vendor src @@ -171,10 +171,10 @@ sed -i 's/-s -w *//' containerd-%{commit_containerd}/Makefile make BUILDTAGS="seccomp selinux" COMMIT=%{commit_runc} ) -# build docker-containerd +# build containerd ( cd containerd-%{commit_containerd} - version=$(sed -n '/^\t*Version = /s/[^0-9.]//gp' version/version.go) + version=1.2.6 #$(sed -n '/^\t*Version = /s/[^0-9.]//gp' version/version.go) mv vendor src mkdir -p src/github.com/containerd ln -fns ../../.. src/github.com/containerd/containerd @@ -351,6 +351,12 @@ getent group %{service_name} >/dev/null || groupadd -r %{service_name} || : %{_datadir}/nano/Dockerfile.nanorc %changelog +* Thu Jun 27 2019 David Michael - 18.09.7-1.ce.git2d0083d +- Update docker-ce to commit 2d0083d (version 18.09.7). +- Update runc to commit 425e105. +- Update containerd to commit 894b81a (1.2.6). +- Update docker-proxy to commit e7933d4. + * Tue May 14 2019 David Michael - 18.09.6-1.ce.git481bc77 - Update docker-ce to commit 481bc77 (version 18.09.6). - Update docker-proxy to commit 872f0a8. diff --git a/sources b/sources index 6320d2e..506d400 100644 --- a/sources +++ b/sources @@ -1,5 +1,5 @@ -SHA512 (2b18fe1d885ee5083ef9f0838fee39b62d653e30.tar.gz) = e3d61506b44f05dfbad2e07d917c8408edea54c87a472ceb109e2ba2a1685b26f1407c2fe7660d416b60fc2583414af09567bcb8b3c95bc14f725d120373337c -SHA512 (481bc7715621adba10752357e0d537c8dc86507d.tar.gz) = ea5166dab5dd803f9c83efeabaabeb29a21ed7d4b350f43d838eab6c7fa61a0c6dcc4171df35f728bc54bb671e6e5cbb1615bba47efeed7b23dfdc0e58b6c7eb -SHA512 (872f0a83c98add6cae255c8859e29532febc0039.tar.gz) = c8e8544a3d8d44dc0f309aa3520a2cf62cee374a06d40473542078de94d88cb484c0dca1cee7ad89fb312c969af1694c848f464d04d61df5a9888058e21a485e -SHA512 (bb71b10fd8f58240ca47fbb579b9d1028eea7c84.tar.gz) = a20f8e047109eef27792ffabb8c00c400fbc28c7610df480c84da26bd26cea93e4045971ec34580f4f46af403db4fbbbec404acef52162362009d219857e0e1a +SHA512 (2d0083d657f82c47044c8d3948ba434b622fe2fd.tar.gz) = 4403f06f387663603876dc5bb38d32cf5aa554e3642aa4c164c0071390d1957f843a39f87459edb1ba5ec31e664207c83b56caef9b60172fcfefbfca052f7454 +SHA512 (425e105d5a03fabd737a126ad93d62a9eeede87f.tar.gz) = f213b6a7fa96597d2ba1068f77752bccc0a1d62e0aac02ec8d2a2552dc3c1140fd4e52b2daeb0ac8fc09c48abe4521834450baae01ad4165308813eee7654a2b +SHA512 (894b81a4b802e4eb2a91d1ce216b8817763c29fb.tar.gz) = fa3a2652b71425a17a82f66e9a9941e5a44bffc0a223a2357630d7d72b08638fc20aa77c46400cdcb48d512a49861af802234f27966f673d9df94f7f82721cb0 +SHA512 (e7933d41e7b206756115aa9df5e0599fc5169742.tar.gz) = 0a833510df0029999bfc05c23445a58a8b2ff165c0fb2fd5c411498d1e89b5b1990d2778b32346dd2b6d61c166ff707c6277a5d1937db6345c77d3825eb59875 SHA512 (fec3683b971d9c3ef73f284f176672c44b448662.tar.gz) = ee46d21467f8bacb4e8be72f5dfcbb23c1964286e90b4b3d3bf67dbbf79a337968ac8a0042a8191e329a65398b20ea160aae3ae5ef20ee03ebae11c2083d7621 From 6f6727951180e930dc7ec0f967be55025d2fa14a Mon Sep 17 00:00:00 2001 From: Olivier Lemasle Date: Fri, 12 Jul 2019 18:38:44 +0200 Subject: [PATCH 2/3] Remove obsolete for docker/docker-latest for f30 --- moby-engine.spec | 18 ++++-------------- 1 file changed, 4 insertions(+), 14 deletions(-) diff --git a/moby-engine.spec b/moby-engine.spec index d79faa1..0a63457 100644 --- a/moby-engine.spec +++ b/moby-engine.spec @@ -30,7 +30,7 @@ Name: %{newname}-engine Version: 18.09.7 -Release: 2.ce.git%{shortcommit_moby}%{?dist} +Release: 3.ce.git%{shortcommit_moby}%{?dist} Summary: The open-source application container engine License: ASL 2.0 # no golang / go-md2man for ppc64 @@ -73,15 +73,8 @@ Requires: containerd # Resolves: rhbz#1165615 Requires: device-mapper-libs >= 1.02.90-1 -# Replace the old Docker packages -Obsoletes: %{origname} < %{version}-%{release} -Obsoletes: %{origname}-latest < %{version}-%{release} -Provides: %{origname} = %{version}-%{release} -Provides: %{origname}-latest = %{version}-%{release} - # conflicting packages Conflicts: %{origname} -Conflicts: %{origname}-latest Conflicts: %{origname}-common Conflicts: %{origname}-io Conflicts: %{origname}-engine-cs @@ -104,8 +97,6 @@ Summary: Fish completion files for %{name} Requires: %{name} = %{version}-%{release} Requires: fish Conflicts: %{service_name}-fish-completion -Obsoletes: %{service_name}-fish-completion < %{version}-%{release} -Provides: %{service_name}-fish-completion = %{version}-%{release} %description fish-completion This package installs %{summary}. @@ -115,8 +106,6 @@ Summary: Vim syntax highlighting files for %{name} Requires: %{name} = %{version}-%{release} Requires: vim Conflicts: %{service_name}-vim -Obsoletes: %{service_name}-vim < %{version}-%{release} -Provides: %{service_name}-vim = %{version}-%{release} %description vim This package installs %{summary}. @@ -126,8 +115,6 @@ Summary: Zsh completion files for %{name} Requires: %{name} = %{version}-%{release} Requires: zsh Conflicts: %{service_name}-zsh-completion -Obsoletes: %{service_name}-zsh-completion < %{version}-%{release} -Provides: %{service_name}-zsh-completion = %{version}-%{release} %description zsh-completion This package installs %{summary}. @@ -300,6 +287,9 @@ getent group %{service_name} >/dev/null || groupadd -r %{service_name} || : %{_datadir}/nano/Dockerfile.nanorc %changelog +* Fri Jul 12 2019 Olivier Lemasle - 18.09.7-3.ce.git2d0083d +- Remove obsolete for docker/docker-latest for f30 + * Fri Jul 12 2019 Olivier Lemasle - 18.09.7-2.ce.git2d0083d - Depend on packaged versions "runc" and "containerd" instead of building them. - Obsolete and provide the docker and docker-latest packages. (#1700006) From 8e70c95a5082c80e10779747cbb021ab3442d9f2 Mon Sep 17 00:00:00 2001 From: Olivier Lemasle Date: Mon, 9 Mar 2020 20:49:52 +0100 Subject: [PATCH 3/3] Add Conflicts: docker-ce-cli --- moby-engine.spec | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/moby-engine.spec b/moby-engine.spec index 77a26b6..dc674d2 100644 --- a/moby-engine.spec +++ b/moby-engine.spec @@ -30,7 +30,7 @@ Name: %{newname}-engine Version: 18.09.7 -Release: 4.ce.git%{shortcommit_moby}%{?dist} +Release: 5.ce.git%{shortcommit_moby}%{?dist} Summary: The open-source application container engine License: ASL 2.0 # no golang / go-md2man for ppc64 @@ -79,6 +79,7 @@ Conflicts: %{origname}-common Conflicts: %{origname}-io Conflicts: %{origname}-engine-cs Conflicts: %{origname}-ce +Conflicts: %{origname}-ce-cli Conflicts: %{origname}-ee %description @@ -287,6 +288,9 @@ getent group %{service_name} >/dev/null || groupadd -r %{service_name} || : %{_datadir}/nano/Dockerfile.nanorc %changelog +* Mon Mar 09 2020 Olivier Lemasle - 18.09.7-5.ce.git2d0083d +- Add Conflicts: docker-ce-cli + * Sat Jul 13 2019 Olivier Lemasle - 18.09.7-4.ce.git2d0083d - Add nofile ulimit to default docker daemon options (#1715254, #1708115)