Backport RHEL 8 and 9 RPM builds to 0.4 release stream

packaging/deb/Makefile

@@ -37,8 +37,8 @@ SOURCE_FILES=app.tgz cri-docker.service cri-docker.socket
 SOURCES=$(addprefix sources/, $(SOURCE_FILES))
 
 DEBIAN_VERSIONS := debian-bullseye debian-bookworm
-#UBUNTU_VERSIONS := ubuntu-xenial ubuntu-bionic ubuntu-cosmic ubuntu-disco ubuntu-eoan
-UBUNTU_VERSIONS := ubuntu-bionic ubuntu-focal ubuntu-jammy
+#UBUNTU_VERSIONS := ubuntu-xenial ubuntu-bionic
+UBUNTU_VERSIONS := ubuntu-focal ubuntu-jammy ubuntu-noble
 RASPBIAN_VERSIONS := raspbian-bullseye
 DISTROS := $(DEBIAN_VERSIONS) $(UBUNTU_VERSIONS) $(RASPBIAN_VERSIONS)
 

packaging/deb/ubuntu-eoan/Dockerfile → packaging/deb/ubuntu-noble/Dockerfile

@@ -1,18 +1,13 @@
 ARG GO_IMAGE
 ARG DISTRO=ubuntu
-ARG SUITE=eoan
+ARG SUITE=noble
 ARG BUILD_IMAGE=${DISTRO}:${SUITE}
 
 FROM ${GO_IMAGE} AS golang
 
 FROM ${BUILD_IMAGE}
 
-# Remove diverted man binary to prevent man-pages being replaced with "minimized" message. See docker/for-linux#639
-RUN if  [ "$(dpkg-divert --truename /usr/bin/man)" = "/usr/bin/man.REAL" ]; then \
-        rm -f /usr/bin/man; \
-        dpkg-divert --quiet --remove --rename /usr/bin/man; \
-    fi
-
+ARG DEBIAN_FRONTEND=noninteractive
 RUN apt-get update && apt-get install -y curl devscripts equivs git
 
 ENV GOPROXY=direct

packaging/rpm/Makefile

@@ -42,8 +42,9 @@ RUN?=$(RPMBUILD) rpmbuild-$@/$(ARCH) $(RPMBUILD_FLAGS)
 SOURCE_FILES=app.tgz cri-docker.service cri-docker.socket LICENSE
 SOURCES=$(addprefix rpmbuild/SOURCES/, $(SOURCE_FILES))
 
-FEDORA_RELEASES := fedora-36 fedora-35
+FEDORA_RELEASES := fedora-40 fedora-41
 CENTOS_RELEASES :=
+ALMALINUX_RELEASES := almalinux-8 almalinux-9
 
 .PHONY: help
 help: ## show make targets
@@ -55,16 +56,19 @@ clean: ## remove build artifacts
 	$(RM) -r rpmbuild/
 
 .PHONY: rpm
-rpm: fedora centos ## build all rpm packages
+rpm: fedora centos almalinux ## build all rpm packages
 
 .PHONY: fedora
 fedora: $(FEDORA_RELEASES) ## build all fedora rpm packages
 
 .PHONY: centos
-centos: $(CENTOS_RELEASES) ## build all centos rpm packages
+centos: $(CENTOS_RELEASES) ## build all centos stream rpm packages
 
-.PHONY: $(FEDORA_RELEASES) $(CENTOS_RELEASES)
-$(FEDORA_RELEASES) $(CENTOS_RELEASES): $(SOURCES)
+.PHONY: almalinux
+almalinux: $(ALMALINUX_RELEASES) ## build all almalinux rpm packages
+
+.PHONY: $(FEDORA_RELEASES) $(CENTOS_RELEASES) $(ALMALINUX_RELEASES)
+$(FEDORA_RELEASES) $(CENTOS_RELEASES) $(ALMALINUX_RELEASES): $(SOURCES)
 	@echo "${APP_DIR}"
 	@echo "${VERSION}"
 	@echo "$(shell ./gen-rpm-ver $(APP_DIR) $(VERSION))"

packaging/rpm/README.md

@@ -18,4 +18,4 @@ make fedora
 ## Specifying a specific distro version
 ```shell
 make fedora-25
-```
+```

packaging/rpm/SPECS/cri-dockerd.spec

@@ -25,8 +25,11 @@ Requires: (iptables or nftables)
 Requires: iptables
 %endif
 %if %{undefined suse_version}
+%if %{undefined rhel} || 0%{?rhel} < 9
+# Libcgroup is no longer available in RHEL/CentOS >= 9 distros.
 Requires: libcgroup
 %endif
+%endif
 Requires: containerd.io >= 1.2.2-3
 Requires: tar
 Requires: xz
@@ -60,11 +63,11 @@ cri-dockerd is a lightweight implementation of the CRI specification which talks
 %setup -q -c -n src -a 0
 
 %build
-cp %{_topdir}/SOURCES/LICENSE /root/rpmbuild/BUILD/src/LICENSE
+cp %{_topdir}/SOURCES/LICENSE ./LICENSE
 export CRI_DOCKER_GITCOMMIT=%{_gitcommit}
 mkdir -p /go/src/github.com/Mirantis
-ln -s /root/rpmbuild/BUILD/src/app /go/src/github.com/Mirantis/cri-dockerd
-cd /root/rpmbuild/BUILD/src/app
+ln -s $(pwd)/app /go/src/github.com/Mirantis/cri-dockerd
+cd app
 GOPROXY="https://proxy.golang.org" GO111MODULE=on go build -ldflags "%{_buildldflags}"
 
 %check

packaging/rpm/centos-8/Dockerfile → packaging/rpm/almalinux-8/Dockerfile

@@ -1,26 +1,26 @@
 ARG GO_IMAGE
-ARG DISTRO=centos
+ARG DISTRO=almalinux
 ARG SUITE=8
 ARG BUILD_IMAGE=${DISTRO}:${SUITE}
 
 FROM ${GO_IMAGE} AS golang
 
 FROM ${BUILD_IMAGE}
+ARG DISTRO
+ARG SUITE
+ENV DISTRO ${DISTRO}
+ENV SUITE ${SUITE}
 ENV GOPROXY=direct
 ENV GOPATH=/go
 ENV PATH $PATH:/usr/local/go/bin:$GOPATH/bin
 ENV AUTO_GOPATH 1
 ENV DOCKER_BUILDTAGS seccomp selinux
 ENV RUNC_BUILDTAGS seccomp selinux
-ARG DISTRO
-ARG SUITE
-ENV DISTRO=${DISTRO}
-ENV SUITE=${SUITE}
 RUN yum install -y rpm-build rpmlint yum-utils
+# Enable PowerTools repository to get device-mapper-devel and glibc-static.
 RUN dnf config-manager --set-enabled powertools
 COPY SPECS /root/rpmbuild/SPECS
-# Overwrite repo that was failing on aarch64
 RUN yum-builddep -y /root/rpmbuild/SPECS/*.spec
-COPY --from=golang /usr/local/go /usr/local/go
+COPY --from=golang /usr/local/go /usr/local/go/
 WORKDIR /root/rpmbuild
 ENTRYPOINT ["/bin/rpmbuild"]

packaging/rpm/centos-stream/Dockerfile → packaging/rpm/almalinux-9/Dockerfile

@@ -1,26 +1,26 @@
 ARG GO_IMAGE
-ARG DISTRO=aepifanov/centos7.vault
-ARG SUITE=latest
+ARG DISTRO=almalinux
+ARG SUITE=9
 ARG BUILD_IMAGE=${DISTRO}:${SUITE}
 
 FROM ${GO_IMAGE} AS golang
 
 FROM ${BUILD_IMAGE}
+ARG DISTRO
+ARG SUITE
+ENV DISTRO=${DISTRO}
+ENV SUITE=${SUITE}
 ENV GOPROXY=direct
 ENV GOPATH=/go
 ENV PATH $PATH:/usr/local/go/bin:$GOPATH/bin
 ENV AUTO_GOPATH 1
 ENV DOCKER_BUILDTAGS seccomp selinux
 ENV RUNC_BUILDTAGS seccomp selinux
-ARG DISTRO
-ARG SUITE
-ENV DISTRO=${DISTRO}
-ENV SUITE=${SUITE}
 RUN yum install -y rpm-build rpmlint yum-utils
-RUN dnf config-manager --set-enabled powertools
+# Enable CodeReady Builder repository to get device-mapper-devel and glibc-static.
+RUN dnf config-manager --set-enabled crb
 COPY SPECS /root/rpmbuild/SPECS
-# Overwrite repo that was failing on aarch64
 RUN yum-builddep -y /root/rpmbuild/SPECS/*.spec
-COPY --from=golang /usr/local/go /usr/local/go
+COPY --from=golang /usr/local/go /usr/local/go/
 WORKDIR /root/rpmbuild
 ENTRYPOINT ["/bin/rpmbuild"]

packaging/rpm/fedora-36/Dockerfile → packaging/rpm/fedora-40/Dockerfile

@@ -1,6 +1,6 @@
 ARG GO_IMAGE
 ARG DISTRO=fedora
-ARG SUITE=36
+ARG SUITE=40
 ARG BUILD_IMAGE=${DISTRO}:${SUITE}
 
 FROM ${GO_IMAGE} AS golang

packaging/rpm/fedora-34/Dockerfile → packaging/rpm/fedora-41/Dockerfile

@@ -1,6 +1,6 @@
 ARG GO_IMAGE
 ARG DISTRO=fedora
-ARG SUITE=34
+ARG SUITE=41
 ARG BUILD_IMAGE=${DISTRO}:${SUITE}
 
 FROM ${GO_IMAGE} AS golang