SPECS: Add Docker runtime and module dependencies by cl2t · Pull Request #792 · openRuyi-Project/openRuyi

cl2t · 2026-06-24T06:27:06Z

Summary

Add Docker 28.5.2 as the main package from the Moby source tree, together with containerd 1.7.28 and the Go dependency closure needed for a non-vendored containerd build.

The Docker package installs dockerd, docker-proxy, systemd units, a real sysusers configuration, and the tini integration.
The Docker source package also builds the independently tagged Moby API v1.54.2 and client v0.4.1 modules as the noarch go-github-moby-moby-api and go-github-moby-moby-client subpackages. Their virtual Provides match the modules pinned by Prometheus v3.12.0.
The Moby API and client source subpackages are trimmed to their importable Go module contents and declare their reusable Go dependency closure explicitly.
Containerd is built against distribution Go modules and delivers the daemon and runc shims required by Docker; CRI, tracing, NRI, optional graphdrivers, ctr, and related unused dependencies are excluded.
Add github.com/containerd/errdefs/pkg v0.3.0 and update github.com/containerd/typeurl/v2 to v2.2.0 for the Moby client dependency closure.
Fix the go-systemd/v22 build by declaring the libsystemd development/runtime dependency and disabling incompatible vet checks without hiding compilation errors.

Related Issue

N/A

Validation

pre-commit passes for all 29 changed files, and non-patch diff checks are clean.
Pure-main OBS project home:cl_2:pr792-fix-puremain succeeds for all 26 source packages on both x86_64 and riscv64.
dockerd --version and docker-proxy --version report 28.5.2 on both architectures.
The produced RPMs provide go(github.com/moby/moby/api) = 1.54.2 and go(github.com/moby/moby/client) = 0.4.1; their declared dependencies resolve in the pure-main project.
Docker runs the targeted dockerd and docker-proxy command-package tests, then compiles every packaged Moby API/client library package against distribution dependencies.
The exact Moby API/client tags and containerd/errdefs/pkg pass their upstream Go tests locally; Prometheus' discovery/moby tests pass with the pinned modules.
The go-systemd/v22 package compiles successfully on both architectures; only tests requiring a running systemd/D-Bus environment remain tolerated.

Checklist

I have read the openRuyi Code of Conduct and agree to abide by it.
I have read the AI-Assisted Contribution Policy, and this Pull Request includes non-trivial AI-assisted content.

Assisted-by: Codex:GPT-5

misaka00251 · 2026-07-01T03:25:40Z

Why not package the Moby (Docker) program as the main package, then you can package the modules as sub-packages?

misaka00251 · 2026-07-13T11:49:17Z

+BuildSystem:    golangmodules
+BuildOption(check):  -vet=off


Suggested change

BuildSystem: golangmodules

BuildOption(check): -vet=off

BuildSystem: golangmodules

BuildOption(check): -vet=off

misaka00251 · 2026-07-13T11:51:38Z

+BuildSystem:    golangmodules
+BuildOption(check):  -vet=off


Suggested change

BuildSystem: golangmodules

BuildOption(check): -vet=off

BuildSystem: golangmodules

BuildOption(check): -vet=off

misaka00251 · 2026-07-13T11:52:42Z

+BuildSystem:    golangmodules
+BuildOption(check):  -vet=off


Suggested change

BuildSystem: golangmodules

BuildOption(check): -vet=off

BuildSystem: golangmodules

BuildOption(check): -vet=off

misaka00251 · 2026-07-13T11:53:53Z

+# SPDX-License-Identifier: MulanPSL-2.0
+
+%define _name           errdefs
+%define go_import_path  github.com/containerd/errdefs/pkg


Why noe package github.com/containerd/errdefs?

misaka00251 · 2026-07-13T11:54:37Z

+%define _name           containerd-api
+%define go_import_path  github.com/containerd/containerd/api
+
+Name:           go-github-containerd-containerd-api


Why split this package?

misaka00251 · 2026-07-13T11:56:52Z

+# require extra host storage stacks. This follows upstream's packager guidance.
+%define docker_buildtags exclude_graphdriver_btrfs exclude_graphdriver_zfs
+
+Name:           docker


Use the name moby, and Provides: docker = %{version}-%{release}.

misaka00251 · 2026-07-13T12:03:37Z

+# BuildSystem: golang has already populated GOPATH before this custom section.
+# Drop upstream's vendored copies there so the build uses distribution modules.


This sentence is so ChatGPT. Rewrite in plain English instead.

misaka00251 · 2026-07-13T12:08:38Z

+%{__make} -j1 VERSION=v%{version} REVISION=%{commit_id} \
+    BUILDTAGS="%{containerd_buildtags}" \
+    bin/containerd bin/containerd-shim \
+    bin/containerd-shim-runc-v1 bin/containerd-shim-runc-v2


Why don't we just make binaries? Also, why -j1?

misaka00251 · 2026-07-13T12:11:15Z

+%go_common
+cd %{_builddir}/go/src/%{go_import_path}
+export CGO_ENABLED=1
+export GOTOOLCHAIN=local
+# Test the internal dependency closure of the binaries shipped by this build.
+# Disable vet only: Go 1.26 rejects two legacy printf formats before tests run.
+packages=$(go list -tags "%{containerd_buildtags}" -deps \
+    ./cmd/containerd ./cmd/containerd-shim \
+    ./cmd/containerd-shim-runc-v1 ./cmd/containerd-shim-runc-v2 | \
+    grep '^github.com/containerd/containerd\(/\|$\)')
+go test -vet=off -tags "%{containerd_buildtags}" $packages


I don't think it's necessary to do these kinds of tests...

misaka00251 · 2026-07-13T12:15:56Z

+%define api_version     1.54.2
+%define api_dir         moby-api-v%{api_version}
+%define client_import_path github.com/moby/moby/client
+%define client_version  0.4.1


Where to check these versions? Please add necessary comments.

misaka00251 · 2026-07-13T12:22:42Z

+export CGO_ENABLED=1
+export GOTOOLCHAIN=local
+export VERSION=%{docker_version}
+export DOCKER_GITCOMMIT=3ef3c07c883be49a2e8097bcf6d2952fce1d70eb


Where to get this data? Maybe try to macro this w/ comments.

Signed-off-by: cl2t <yihong.or@isrc.iscas.ac.cn>

openruyi-bot Bot added Workflow: In Review Issues that are undergoing code review and/or undergoing design review. and removed Workflow: Ready For Review Ready for review by anyone with domain expertise. labels Jul 1, 2026

cl2t force-pushed the docker-docker-deps branch from 3bee79f to 6cf7e19 Compare July 9, 2026 16:06

openruyi-bot Bot added the BuildSystem: golang Issue/PR related to golang BuildSystem. label Jul 9, 2026

cl2t changed the title ~~SPECS: Add go-github-docker-docker (Docker API client for Prometheus moby SD)~~ SPECS: Add docker (Moby engine and Go source) Jul 9, 2026

cl2t force-pushed the docker-docker-deps branch from 6cf7e19 to f5b50b2 Compare July 9, 2026 20:03

cl2t changed the title ~~SPECS: Add docker (Moby engine and Go source)~~ SPECS: Add Docker runtime and module dependencies Jul 10, 2026

cl2t force-pushed the docker-docker-deps branch 7 times, most recently from 94d8977 to f7db452 Compare July 13, 2026 10:59

misaka00251 requested changes Jul 13, 2026

View reviewed changes

cl2t force-pushed the docker-docker-deps branch 3 times, most recently from 3986588 to 1f7217f Compare July 17, 2026 15:44

cl2t added 4 commits July 18, 2026 12:00

SPECS: Add go-github-cilium-ebpf

8e04143

Signed-off-by: cl2t <yihong.or@isrc.iscas.ac.cn>

SPECS: go-github-containerd-typeurl: Fix v2 provider

8da0a37

Signed-off-by: cl2t <yihong.or@isrc.iscas.ac.cn>

SPECS: go-github-containerd-errdefs: Provide errdefs/pkg module

dd40681

Signed-off-by: cl2t <yihong.or@isrc.iscas.ac.cn>

SPECS: Add go-github-coreos-go-systemd-v22

d430ba8

Signed-off-by: cl2t <yihong.or@isrc.iscas.ac.cn>

cl2t added 22 commits July 18, 2026 12:00

SPECS: Add go-github-docker-go-events

cd2b3e1

Signed-off-by: cl2t <yihong.or@isrc.iscas.ac.cn>

SPECS: Add go-github-godbus-dbus-v5

735f0e6

Signed-off-by: cl2t <yihong.or@isrc.iscas.ac.cn>

SPECS: Add go-github-grpc-ecosystem-go-grpc-middleware

ecbe524

Signed-off-by: cl2t <yihong.or@isrc.iscas.ac.cn>

SPECS: Add go-github-grpc-ecosystem-go-grpc-prometheus

6042bb5

Signed-off-by: cl2t <yihong.or@isrc.iscas.ac.cn>

SPECS: Add go-github-minio-sha256-simd

5fcc5ed

Signed-off-by: cl2t <yihong.or@isrc.iscas.ac.cn>

SPECS: Add go-github-opencontainers-selinux

b3b70f7

Signed-off-by: cl2t <yihong.or@isrc.iscas.ac.cn>

SPECS: Add go-github-urfave-cli

9e7f064

Signed-off-by: cl2t <yihong.or@isrc.iscas.ac.cn>

SPECS: Add go-github-containernetworking-cni

208cb01

Signed-off-by: cl2t <yihong.or@isrc.iscas.ac.cn>

SPECS: Add go-github-microsoft-hcsshim

2e53bb5

Signed-off-by: cl2t <yihong.or@isrc.iscas.ac.cn>

SPECS: Add go-github-moby-sys

a0745e9

Signed-off-by: cl2t <yihong.or@isrc.iscas.ac.cn>

SPECS: Add go-toml

eaa466a

Signed-off-by: cl2t <yihong.or@isrc.iscas.ac.cn>

SPECS: Add sst-ctl

657ed29

Signed-off-by: cl2t <yihong.or@isrc.iscas.ac.cn>

SPECS: Add fuse-abort

1d40c5c

Signed-off-by: cl2t <yihong.or@isrc.iscas.ac.cn>

SPECS: Add cgctl

214c18e

Signed-off-by: cl2t <yihong.or@isrc.iscas.ac.cn>

SPECS: Add continuity

121d742

Signed-off-by: cl2t <yihong.or@isrc.iscas.ac.cn>

SPECS: Add go-github-containerd-go-cni

aa60ae9

Signed-off-by: cl2t <yihong.or@isrc.iscas.ac.cn>

SPECS: Add go-github-containerd-fifo

977adb3

Signed-off-by: cl2t <yihong.or@isrc.iscas.ac.cn>

SPECS: Add go-github-containerd-go-runc

85381c8

Signed-off-by: cl2t <yihong.or@isrc.iscas.ac.cn>

SPECS: Add go-github-containerd-platforms

037e14c

Signed-off-by: cl2t <yihong.or@isrc.iscas.ac.cn>

SPECS: Add go-github-containerd-ttrpc

fb0d069

Signed-off-by: cl2t <yihong.or@isrc.iscas.ac.cn>

SPECS: Add containerd

7e71697

Signed-off-by: cl2t <yihong.or@isrc.iscas.ac.cn>

SPECS: Add moby

a9fb32f

Signed-off-by: cl2t <yihong.or@isrc.iscas.ac.cn>

cl2t force-pushed the docker-docker-deps branch from 1f7217f to a9fb32f Compare July 18, 2026 04:16

		# BuildSystem: golang has already populated GOPATH before this custom section.
		# Drop upstream's vendored copies there so the build uses distribution modules.

Uh oh!

Conversation

cl2t commented Jun 24, 2026 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Summary

Related Issue

Validation

Checklist

Uh oh!

misaka00251 commented Jul 1, 2026

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

2 participants

cl2t commented Jun 24, 2026 •

edited

Loading