Skip to content

Commit df80ffc

Browse files
committed
rpm: Add CentOS 10
Align with CE packaging: - https://github.com/docker/docker-ce-packaging/blob/73be86c91f03f0f7e892bc9d0064a45c21c869c1/distros.json#L11-L19 Signed-off-by: Paweł Gronowski <pawel.gronowski@docker.com>
1 parent 0c35fee commit df80ffc

File tree

4 files changed

+19
-2
lines changed

4 files changed

+19
-2
lines changed

docker-bake.hcl

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -28,6 +28,7 @@ variable "DISTROS" {
2828
"almalinux8",
2929
"almalinux9",
3030
"centos9",
31+
"centos10",
3132
"fedora41",
3233
"fedora42",
3334
"oraclelinux8",
@@ -285,6 +286,17 @@ target "_distro-centos9" {
285286
}
286287
}
287288

289+
target "_distro-centos10" {
290+
args = {
291+
DISTRO_NAME = "centos10"
292+
DISTRO_TYPE = "rpm"
293+
DISTRO_RELEASE = "centos"
294+
DISTRO_ID = "10"
295+
DISTRO_SUITE = "10"
296+
DISTRO_IMAGE = DISTRO_IMAGE != null && DISTRO_IMAGE != "" ? DISTRO_IMAGE : "quay.io/centos/centos:stream10"
297+
}
298+
}
299+
288300
target "_distro-fedora41" {
289301
args = {
290302
DISTRO_NAME = "fedora41"
@@ -396,6 +408,7 @@ function "distroPlatforms" {
396408
almalinux8 = ["linux/amd64", "linux/arm64", "linux/ppc64le", "linux/s390x"]
397409
almalinux9 = ["linux/amd64", "linux/arm64", "linux/ppc64le", "linux/s390x"]
398410
centos9 = ["linux/amd64", "linux/arm64", "linux/ppc64le"]
411+
centos10 = ["linux/amd64", "linux/arm64", "linux/ppc64le"]
399412
fedora41 = ["linux/amd64", "linux/arm64", "linux/ppc64le", "linux/s390x"]
400413
fedora42 = ["linux/amd64", "linux/arm64", "linux/ppc64le", "linux/s390x"]
401414
oraclelinux8 = ["linux/amd64", "linux/arm64"]

hack/scripts/rpm-init.sh

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -40,6 +40,10 @@ case "$pkgrelease" in
4040
dnf install -y git rpm-build rpmlint dnf-plugins-core epel-release epel-next-release
4141
dnf config-manager --set-enabled crb
4242
;;
43+
centos10)
44+
dnf install -y git rpm-build dnf-plugins-core
45+
dnf config-manager --set-enabled crb
46+
;;
4347
oraclelinux8)
4448
dnf install -y git rpm-build rpmlint dnf-plugins-core oraclelinux-release-el8 oracle-epel-release-el8
4549
dnf config-manager --enable ol8_addons ol8_codeready_builder

pkg/credential-helpers/verify.Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -99,7 +99,7 @@ RUN --mount=from=bin,target=/build <<EOT
9999
docker-credential-secretservice version
100100
case "$DISTRO_NAME" in
101101
# FIXME: skip pass credential helper smoke test for some distros
102-
centos9|oraclelinux9|rhel*) ;;
102+
centos9|centos10|oraclelinux9|rhel*) ;;
103103
*) docker-credential-pass version ;;
104104
esac
105105
EOT

pkg/docker-engine/scripts/pkg-rpm-build.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -71,7 +71,7 @@ if [ -n "$(xx-info variant)" ]; then
7171
fi
7272

7373
case "$DISTRO_NAME" in
74-
centos9|oraclelinux*)
74+
centos9|centos10|oraclelinux*)
7575
export DOCKER_BUILDTAGS="exclude_graphdriver_btrfs $DOCKER_BUILDTAGS"
7676
;;
7777
esac

0 commit comments

Comments
 (0)