Skip to content

Commit 21ee9d3

Browse files
Build for CentOS 9.
Signed-off-by: Romain Geissler <romain.geissler@amadeus.com>
1 parent 015bb44 commit 21ee9d3

3 files changed

Lines changed: 7 additions & 3 deletions

File tree

Jenkinsfile

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@ def branch = env.CHANGE_TARGET ?: env.BRANCH_NAME
55
def pkgs = [
66
[target: "centos-7", image: "centos:7", arches: ["amd64", "aarch64"]], // (EOL: June 30, 2024)
77
[target: "centos-8", image: "quay.io/centos/centos:stream8", arches: ["amd64", "aarch64"]],
8+
[target: "centos-9", image: "quay.io/centos/centos:stream9", arches: ["amd64", "aarch64"]],
89
[target: "debian-buster", image: "debian:buster", arches: ["amd64", "aarch64", "armhf"]], // Debian 10 (EOL: 2024)
910
[target: "debian-bullseye", image: "debian:bullseye", arches: ["amd64", "aarch64", "armhf"]], // Debian 11 (Next stable)
1011
[target: "fedora-34", image: "fedora:34", arches: ["amd64", "aarch64"]], // EOL: May 17, 2022

rpm/Makefile

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -57,7 +57,7 @@ RUN?=docker run --rm \
5757
rpmbuild-$@/$(ARCH) $(RPMBUILD_FLAGS)
5858

5959
FEDORA_RELEASES ?= fedora-36 fedora-35 fedora-34
60-
CENTOS_RELEASES ?= centos-7 centos-8
60+
CENTOS_RELEASES ?= centos-7 centos-8 centos-9
6161
ifeq ($(ARCH),s390x)
6262
RHEL_RELEASES ?= rhel-7
6363
else
@@ -83,8 +83,8 @@ rpm: fedora centos ## build all rpm packages
8383
.PHONY: fedora
8484
fedora: $(FEDORA_RELEASES) ## build all fedora rpm packages
8585

86-
.PHONY: centos-8
87-
centos-8: RPMBUILD_EXTRA_FLAGS=--define '_without_btrfs 1'
86+
.PHONY: centos-8 centos-9
87+
centos-8 centos-9: RPMBUILD_EXTRA_FLAGS=--define '_without_btrfs 1'
8888

8989
.PHONY: centos
9090
centos: $(CENTOS_RELEASES) ## build all centos rpm packages

rpm/SPECS/docker-ce.spec

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,10 @@ Requires: container-selinux >= 2:2.74
2222
Requires: libseccomp >= 2.3
2323
Requires: systemd
2424
Requires: iptables
25+
%if %{undefined rhel} || 0%{?rhel} < 9
26+
# Libcgroup is no longer available in RHEL/CentOS >= 9 distros.
2527
Requires: libcgroup
28+
%endif
2629
Requires: containerd.io >= 1.4.1
2730
Requires: tar
2831
Requires: xz

0 commit comments

Comments
 (0)