From 58a8e927577bc5d1a834bbd96101ebe42f932bb6 Mon Sep 17 00:00:00 2001 From: Alexander Stefanov Date: Mon, 30 Aug 2021 17:26:46 +0000 Subject: [PATCH 1/8] add missed files --- docker.sysusers | 1 + nftables-docker.nft | 60 +++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 61 insertions(+) create mode 100644 docker.sysusers create mode 100644 nftables-docker.nft diff --git a/docker.sysusers b/docker.sysusers new file mode 100644 index 0000000..0f62654 --- /dev/null +++ b/docker.sysusers @@ -0,0 +1 @@ +g docker - - diff --git a/nftables-docker.nft b/nftables-docker.nft new file mode 100644 index 0000000..a485300 --- /dev/null +++ b/nftables-docker.nft @@ -0,0 +1,60 @@ +table ip filter { + chain INPUT { + type filter hook input priority 0; policy accept; + } + + chain FORWARD { + type filter hook forward priority 0; policy accept; + counter jump DOCKER-USER + counter jump DOCKER-ISOLATION-STAGE-1 + oifname "docker0" ct state established,related counter accept + oifname "docker0" counter jump DOCKER + iifname "docker0" oifname != "docker0" counter accept + iifname "docker0" oifname "docker0" counter accept + } + + chain OUTPUT { + type filter hook output priority 0; policy accept; + } + + chain DOCKER { + } + + chain DOCKER-ISOLATION-STAGE-1 { + iifname "docker0" oifname != "docker0" counter jump DOCKER-ISOLATION-STAGE-2 + counter return + } + + chain DOCKER-ISOLATION-STAGE-2 { + oifname "docker0" counter drop + counter return + } + + chain DOCKER-USER { + counter return + } +} +table ip nat { + chain PREROUTING { + type nat hook prerouting priority -100; policy accept; + fib daddr type local counter jump DOCKER + } + + chain INPUT { + type nat hook input priority 100; policy accept; + } + + chain POSTROUTING { + type nat hook postrouting priority 100; policy accept; + oifname != "docker0" ip saddr 172.17.0.0/16 counter masquerade + } + + chain OUTPUT { + type nat hook output priority -100; policy accept; + ip daddr != 127.0.0.0/8 fib daddr type local counter jump DOCKER + } + + chain DOCKER { + iifname "docker0" counter return + } +} From 5eaf67785942b829a781e4e03a94d7dbd03a0d35 Mon Sep 17 00:00:00 2001 From: Alexander Stefanov Date: Mon, 30 Aug 2021 19:42:21 +0000 Subject: [PATCH 2/8] adjust req --- docker.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docker.spec b/docker.spec index ad267a9..644bc5b 100644 --- a/docker.spec +++ b/docker.spec @@ -60,7 +60,7 @@ BuildRequires: cmake Requires(pre): systemd %systemd_requires # With docker >= 1.11 you now need containerd (and runC or crun as a dep) -Requires: containerd >= 0.2.3 +Requires: containerd Requires: crun # need xz to work with ubuntu images # https://bugzilla.redhat.com/show_bug.cgi?id=1045220 From 96501a4be6da39fce1175fd4bb2f5dd4f2c296a7 Mon Sep 17 00:00:00 2001 From: Alexander Stefanov Date: Fri, 22 Jul 2022 12:46:27 +0000 Subject: [PATCH 3/8] update 20.10.17 --- .abf.yml | 8 ++++---- docker.spec | 4 ++-- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/.abf.yml b/.abf.yml index e88a466..4ef9597 100644 --- a/.abf.yml +++ b/.abf.yml @@ -1,6 +1,6 @@ sources: - buildx-0.5.1.tar.gz: 5803fd02093f886beaca35553986216e02bbecec - cli-20.10.8.tar.gz: c4cb4c5c215fade682052584179c6de3f0cf0d47 - libnetwork-master.tar.gz: c1f5f8cc9cb16cf7bda8faf43436cd2f99253262 - moby-20.10.8.tar.gz: a5bf98362185b34b2cd0e41af30106bebfcd8531 + buildx-0.5.1.tar.gz: 53c6ec0249c85679d917b093b1e152cb71851384 + cli-20.10.17.tar.gz: f74f3fd4643c094399c7e006e06c72dd9c0f45a5 + libnetwork-master.tar.gz: f40314554cc577831c5909fe8ebdb53ed81dd362 + moby-20.10.17.tar.gz: 0c1993af5488223895f7989ba88edbe3baf894db tini-0.19.0.tar.gz: 2245210bdd29faea02e566a192df4c7df702b264 diff --git a/docker.spec b/docker.spec index 644bc5b..df0be42 100644 --- a/docker.spec +++ b/docker.spec @@ -16,9 +16,9 @@ Summary: Automates deployment of containerized applications Name: docker -Version: 20.10.8 +Version: 20.10.17 %global moby_version %{version} -Release: 2 +Release: 1 License: ASL 2.0 Epoch: 1 Group: System/Configuration/Other From bfee5e7fc38476060bf922e5d076ec3295295d7f Mon Sep 17 00:00:00 2001 From: Mikhail Novosyolov Date: Sun, 6 Nov 2022 23:09:41 +0300 Subject: [PATCH 4/8] P docker-ce https://www.opennet.ru/openforum/vsluhforumID3/128847.html#180 --- docker.spec | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/docker.spec b/docker.spec index df0be42..f9a5209 100644 --- a/docker.spec +++ b/docker.spec @@ -18,7 +18,7 @@ Summary: Automates deployment of containerized applications Name: docker Version: 20.10.17 %global moby_version %{version} -Release: 1 +Release: 2 License: ASL 2.0 Epoch: 1 Group: System/Configuration/Other @@ -71,7 +71,9 @@ Requires(postun): sed # https://bugzilla.redhat.com/show_bug.cgi?id=1034919 # No longer needed in Fedora because of libcontainer Provides: lxc-docker = %{version} -Provides: docker-swarm = %{version}-%{release} +Provides: docker-swarm = %{EVRD} +# compat with Docker repos for RH +Provides: docker-ce = %{EVRD} %description Docker is an open-source engine that automates the deployment of any From 506da726a59915065de15cd2072a1f1cdcec1733 Mon Sep 17 00:00:00 2001 From: Mikhail Novosyolov Date: Sun, 6 Nov 2022 23:14:00 +0300 Subject: [PATCH 5/8] pull addons automatically --- docker.spec | 3 +++ 1 file changed, 3 insertions(+) diff --git a/docker.spec b/docker.spec index f9a5209..1a572b3 100644 --- a/docker.spec +++ b/docker.spec @@ -74,6 +74,9 @@ Provides: lxc-docker = %{version} Provides: docker-swarm = %{EVRD} # compat with Docker repos for RH Provides: docker-ce = %{EVRD} +Recommends: (%{name}-fish-completion if fish) +Recommends: (%{name}-zsh-completion if zsh) +Recommends: (%{name}-vim if vim) %description Docker is an open-source engine that automates the deployment of any From 98786d57c8a45bb532e52d99985e5903e35aeb0b Mon Sep 17 00:00:00 2001 From: Alexander Stefanov Date: Thu, 9 Mar 2023 17:44:05 +0000 Subject: [PATCH 6/8] 23.0.1 --- .abf.yml | 8 ++++---- docker.spec | 16 ++++++++++------ 2 files changed, 14 insertions(+), 10 deletions(-) diff --git a/.abf.yml b/.abf.yml index 4ef9597..2c625a0 100644 --- a/.abf.yml +++ b/.abf.yml @@ -1,6 +1,6 @@ sources: - buildx-0.5.1.tar.gz: 53c6ec0249c85679d917b093b1e152cb71851384 - cli-20.10.17.tar.gz: f74f3fd4643c094399c7e006e06c72dd9c0f45a5 - libnetwork-master.tar.gz: f40314554cc577831c5909fe8ebdb53ed81dd362 - moby-20.10.17.tar.gz: 0c1993af5488223895f7989ba88edbe3baf894db + buildx-0.5.1.tar.gz: 49fe7d03236dcbbfc38fd2086f3f050f1bd79831 + cli-23.0.1.tar.gz: c025238c5b5e6a75f12618c457375fdbb453771e + libnetwork-master.tar.gz: e632513e53df6e92eea278d6177dec30e2604ba4 + moby-23.0.1.tar.gz: b465f8a60dd3668f1463f7923c0b94b9522d9aed tini-0.19.0.tar.gz: 2245210bdd29faea02e566a192df4c7df702b264 diff --git a/docker.spec b/docker.spec index 1a572b3..df6200c 100644 --- a/docker.spec +++ b/docker.spec @@ -16,9 +16,9 @@ Summary: Automates deployment of containerized applications Name: docker -Version: 20.10.17 +Version: 23.0.1 %global moby_version %{version} -Release: 2 +Release: 1 License: ASL 2.0 Epoch: 1 Group: System/Configuration/Other @@ -123,23 +123,27 @@ This package installs %{summary}. %prep %autosetup -p1 -n moby-%{version} tar xf %{SOURCE10} -mv libnetwork-master libnetwork tar xf %{SOURCE11} mv tini-%{tini_version} tini tar xf %{SOURCE12} tar xf %{SOURCE13} mv buildx-%{buildx_version} buildx +find . -name "*~" |xargs rm || : +# Needs to be done after unpacking extra bits, given we may want +# to patch tini -- so no %%autosetup +%autopatch -p1 %build mkdir -p GO/src/github.com/{docker,krallin} ln -s $(pwd)/cli-%{version} GO/src/github.com/docker/cli -ln -s $(pwd)/libnetwork GO/src/github.com/docker/libnetwork +ln -s $(pwd)/libnetwork-master GO/src/github.com/docker/libnetwork ln -s $(pwd)/tini GO/src/github.com/krallin/tini ln -s $(pwd) GO/src/github.com/docker/docker export DOCKER_GITCOMMIT="%{shortcommit}" export DOCKER_CLI_EXPERIMENTAL=enabled export TMP_GOPATH="$(pwd)/GO" export GOPATH=%{gopath}:"$(pwd)/GO" +export GO111MODULE=off # docker-init cd tini @@ -148,7 +152,6 @@ cd tini cd ../.. # dockerd -export GO111MODULE=off DOCKER_BUILDTAGS='selinux seccomp journald' VERSION=%{moby_version} hack/make.sh dynbinary # docker-proxy @@ -161,12 +164,13 @@ cd cli-%{version} DISABLE_WARN_OUTSIDE_CONTAINER=1 make VERSION=%{moby_version} LDFLAGS="-linkmode=external" dynbinary cd .. + %install # install binaries install -d %{buildroot}%{_bindir} install -p -m 755 cli-%{version}/build/docker-linux-* %{buildroot}%{_bindir}/docker install -d %{buildroot}%{_sbindir} -install -p -m 755 bundles/dynbinary-daemon/dockerd-%{moby_version} %{buildroot}%{_sbindir}/dockerd +install -p -m 755 bundles/dynbinary-daemon/dockerd %{buildroot}%{_sbindir}/dockerd install -p -m 755 libnetwork/proxy %{buildroot}%{_bindir}/docker-proxy install -p -m 755 tini/build/tini-static %{buildroot}%{_bindir}/docker-init From 8d3199dcbed1f7edf8ab8eb05e09f0bc09144922 Mon Sep 17 00:00:00 2001 From: Aleksandr Proklov Date: Fri, 26 May 2023 16:05:30 +0300 Subject: [PATCH 7/8] Update version to 24.0.2 --- .abf.yml | 8 ++++---- docker.spec | 6 +++--- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/.abf.yml b/.abf.yml index 2c625a0..4095b07 100644 --- a/.abf.yml +++ b/.abf.yml @@ -1,6 +1,6 @@ sources: - buildx-0.5.1.tar.gz: 49fe7d03236dcbbfc38fd2086f3f050f1bd79831 - cli-23.0.1.tar.gz: c025238c5b5e6a75f12618c457375fdbb453771e - libnetwork-master.tar.gz: e632513e53df6e92eea278d6177dec30e2604ba4 - moby-23.0.1.tar.gz: b465f8a60dd3668f1463f7923c0b94b9522d9aed + buildx-0.10.5.tar.gz: ebfb3eb86e2e7776d90930fa2eef0b22193cddf3 + cli-24.0.2.tar.gz: a935389283acba305d94897dc64a55d1889f294d + libnetwork-master.tar.gz: 8d80f7317377a2b5059d4a5907cc3d0885797a33 + moby-24.0.2.tar.gz: af6b3c2af980f1643f48de8442560d444799df16 tini-0.19.0.tar.gz: 2245210bdd29faea02e566a192df4c7df702b264 diff --git a/docker.spec b/docker.spec index df6200c..7c4e80a 100644 --- a/docker.spec +++ b/docker.spec @@ -1,7 +1,7 @@ # modifying the dockerinit binary breaks the SHA1 sum check by docker %global tini_version 0.19.0 -%global buildx_version 0.5.1 +%global buildx_version 0.10.5 %global project docker %global repo %{project} @@ -11,12 +11,12 @@ %global gopath %{_libdir}/golang %define gosrc %{gopath}/src/pkg/%{import_path} -%global commit b0f5bc36fea9dfb9672e1e9b1278ebab797b9ee0 +%global commit 659604f9ee60f147020bdd444b26e4b5c636dc28 %global shortcommit %(c=%{commit}; echo ${c:0:7}) Summary: Automates deployment of containerized applications Name: docker -Version: 23.0.1 +Version: 24.0.2 %global moby_version %{version} Release: 1 License: ASL 2.0 From 50886280a42cfe1ebbedba28a109533f8a32e0b3 Mon Sep 17 00:00:00 2001 From: Andrey Grigorev Date: Wed, 7 Jun 2023 14:54:02 +0000 Subject: [PATCH 8/8] Bump release --- docker.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docker.spec b/docker.spec index 7c4e80a..4a326e1 100644 --- a/docker.spec +++ b/docker.spec @@ -18,7 +18,7 @@ Summary: Automates deployment of containerized applications Name: docker Version: 24.0.2 %global moby_version %{version} -Release: 1 +Release: 2 License: ASL 2.0 Epoch: 1 Group: System/Configuration/Other