From 6a629c5cc2eed73fdf1703c5ca010d4260e2acab Mon Sep 17 00:00:00 2001 From: lvxiangcong Date: Fri, 12 Jul 2024 16:56:06 +0800 Subject: [PATCH] fix-docker-swarm-run-failed-for-loongarch64 --- ...ker-swarm-run-failed-for-loongarch64.patch | 30 +++++++++++++++++++ moby.spec | 10 ++++++- 2 files changed, 39 insertions(+), 1 deletion(-) create mode 100644 0004-fix-docker-swarm-run-failed-for-loongarch64.patch diff --git a/0004-fix-docker-swarm-run-failed-for-loongarch64.patch b/0004-fix-docker-swarm-run-failed-for-loongarch64.patch new file mode 100644 index 0000000..97f621c --- /dev/null +++ b/0004-fix-docker-swarm-run-failed-for-loongarch64.patch @@ -0,0 +1,30 @@ +From d982ada96908ceef19f30d88ffda5e7956c2809e Mon Sep 17 00:00:00 2001 +From: Super User +Date: Wed, 10 Jul 2024 17:27:20 +0800 +Subject: [PATCH] fix docker swarm run failed for loongarch64 + +--- + .../moby/swarmkit/v2/manager/scheduler/filter.go | 8 ++++++++ + 1 file changed, 8 insertions(+) + +diff --git a/vendor/github.com/moby/swarmkit/v2/manager/scheduler/filter.go b/vendor/github.com/moby/swarmkit/v2/manager/scheduler/filter.go +index 4e0bb9f..97847e1 100644 +--- a/vendor/github.com/moby/swarmkit/v2/manager/scheduler/filter.go ++++ b/vendor/github.com/moby/swarmkit/v2/manager/scheduler/filter.go +@@ -305,6 +305,14 @@ func (f *PlatformFilter) platformEqual(imgPlatform, nodePlatform api.Platform) b + nodePlatform.Architecture = "arm64" + } + ++ // normalize "loongarch64" architectures to "loong64" ++ if imgPlatform.Architecture == "loongarch64" { ++ imgPlatform.Architecture = "loong64" ++ } ++ if nodePlatform.Architecture == "loongarch64" { ++ nodePlatform.Architecture = "loong64" ++ } ++ + if (imgPlatform.Architecture == "" || imgPlatform.Architecture == nodePlatform.Architecture) && (imgPlatform.OS == "" || imgPlatform.OS == nodePlatform.OS) { + return true + } +-- +2.43.0 diff --git a/moby.spec b/moby.spec index ea4931a..b2dc9b5 100644 --- a/moby.spec +++ b/moby.spec @@ -7,7 +7,7 @@ Name: docker Version: 25.0.3 -Release: 8 +Release: 9 Summary: The open-source application container engine License: ASL 2.0 URL: https://www.docker.com @@ -23,6 +23,7 @@ Source5: docker.sysconfig Patch0000: 0001-fix-cve-2024-29018.patch Patch0001: 0002-fix-cve-2024-32473.patch Patch0002: 0003-add-loongarch64-seccomp-support.patch +Patch0003: 0004-fix-docker-swarm-run-failed-for-loongarch64.patch Requires: %{name}-engine = %{version}-%{release} @@ -91,6 +92,7 @@ Docker client binary and related utilities %patch0000 -p1 %patch0001 -p1 %patch0002 -p1 +%patch0003 -p1 %setup -q -T -n %{_source_docker_init} -b 2 %build @@ -192,6 +194,12 @@ fi %systemd_postun_with_restart docker.service %changelog +* Fri Jul 12 2024 lvxiangcong - 25.0.3-9 +- Type:bugfix +- ID:NA +- SUG:NA +- DESC:fix docker swarm run failed for loongarch64 + * Tue Jul 02 2024 zhangbowei - 25.0.3-8 - Type:bugfix - ID:NA -- Gitee