updated rpm build spec files

Author: sergey-safarov

rpm/Dockerfile

@@ -1,79 +1,11 @@
-ARG base_image="centos"
-ARG image_tag="8"
+ARG base_image="quay.io/centos/centos:stream10"
 
-FROM ${base_image}:${image_tag}
+FROM ${base_image}
 ARG base_image
-ARG image_tag
-ARG rhel_username
-ARG rhel_password
-
-# SPEC deps install command I take from https://www.terriblecode.com/blog/extracing-rpm-build-dependencies-from-rpm-spec-files/
 
 COPY rpm_extra_specs /rpm_extra_specs/
+COPY get_build_env.sh /get_build_env.sh
 
-RUN set -e; \
-    set -x; \
-    echo "Preparing kamailio builder using '${base_image}:${image_tag}' image"; \
-    pkg_manager="yum -y"; \
-    if zypper --version &>/dev/null; then \
-        pkg_manager="zypper -n"; \
-    elif dnf --version &>/dev/null; then \
-        pkg_manager="dnf -y"; \
-    fi; \
-    if [ "${base_image}" == "centos" ]; then \
-        extra_packages="epel-release"; \
-    fi; \
-    if [ "${base_image}" == "registry.redhat.io/ubi7" -o "${base_image}" == "registry.redhat.io/ubi8" ]; then \
-        subscription-manager register --username="${rhel_username}" --password="${rhel_password}"; \
-        subscription-manager attach; \
-    fi; \
-    if [ "${base_image}" == "registry.redhat.io/ubi8" ]; then \
-        dnf config-manager --set-enabled codeready-builder-for-rhel-8-x86_64-rpms; \
-        dnf install -y https://dl.fedoraproject.org/pub/epel/epel-release-latest-8.noarch.rpm; \
-        rpm_extra_builds="libphonenumber"; \
-    fi; \
-    if [ "${base_image}" == "registry.redhat.io/ubi7" ]; then \
-        yum-config-manager --enable rhel-7-server-optional-rpms; \
-        yum install -y https://dl.fedoraproject.org/pub/epel/epel-release-latest-7.noarch.rpm; \
-        rpm_extra_builds="libphonenumber"; \
-    fi; \
-    if [ "${base_image}" == "centos" -a "${image_tag}" == "8" ]; then \
-        # Need enable additional repos \
-        sed -i -e 's/enabled=0/enabled=1/' /etc/yum.repos.d/CentOS-PowerTools.repo; \
-        rpm_extra_builds="libphonenumber"; \
-    fi; \
-    if [ "${base_image}" == "centos" -a "${image_tag}" == "7" ]; then \
-        rpm_extra_builds="libphonenumber"; \
-    fi; \
-    if [ "${base_image}" == "fedora" ]; then \
-        rpm_extra_builds="libphonenumber"; \
-    fi; \
-    ${pkg_manager} update; \
-    ${pkg_manager} install rpm-build gcc make wget bison flex which git ${extra_packages}; \
-    wget https://raw.githubusercontent.com/kamailio/kamailio/master/pkg/kamailio/obs/kamailio.spec; \
-    for i in ${rpm_extra_builds}; do ${pkg_manager} install $(rpmspec -P rpm_extra_specs/${i}.spec | grep BuildRequires | sed -r -e 's/BuildRequires:\s+//' -e 's/,//g' | xargs); done; \
-    if [ "${base_image}" == "centos" -a "${image_tag}" == "6" ]; then \
-        sed -i -e '/libphonenumber-devel/d' -e 's/systemd-mini/systemd/' kamailio.spec; \
-        yum -y install yum-utils; \
-        yum-builddep -y kamailio.spec; \
-    else \
-        ${pkg_manager} install $(rpmspec -P kamailio.spec | grep BuildRequires | sed -r -e 's/BuildRequires:\s+//' -e 's/,//g' -e '/libphonenumber-devel/d' -e 's/systemd-mini/systemd/' | xargs); \
-    fi; \
-    if [ "${base_image}" == "registry.redhat.io/ubi7" -o "${base_image}" == "registry.redhat.io/ubi8" ]; then \
-        subscription-manager remove --all; \
-        subscription-manager unregister; \
-    fi; \
-    rm -Rf /var/cache/dnf/* /var/cache/yum/* /var/cache/zypp/*; \
-    rm -f kamailio.spec; \
-    if [ ! -z "${rpm_extra_builds}" ]; then \
-        echo "Building extra deps RPM packages"; \
-        for i in ${rpm_extra_builds}; do rpmbuild --undefine _disable_source_fetch --nocheck -ba rpm_extra_specs/${i}.spec; done \
-    fi; \
-    if [ ! -z "${rpm_extra_builds}" ]; then \
-        echo "Installing extra RPM deps"; \
-        rpm -i $(find ~/rpmbuild/RPMS -type f \( -name "*.rpm" -not -name "*.src.rpm" \) | xargs); \
-        mkdir /deps; \
-        mv ~/rpmbuild/RPMS /deps; \
-        mv ~/rpmbuild/SRPMS /deps; \
-        rm -Rf ~/rpmbuild; \
-    fi
+RUN --mount=type=secret,id=RHEL_USERNAME,env=RHEL_USERNAME \
+    --mount=type=secret,id=RHEL_PASSWORD,env=RHEL_PASSWORD \
+    /get_build_env.sh

rpm/README.md

@@ -1,28 +1,53 @@
-To build image for RHEL-7, RHEL-8 need define variables `repo_owner`, `base_image`, `image_tag`, `rhel_username`, `rhel_password` and
+To build image for RHEL-7, RHEL-8 need define variables `repo_owner`, `base_image`, `image_tag`, `RHEL_USERNAME`, `RHEL_PASSWORD` and
 then start build image like
 
 ```sh
-export repo_owner=safarov
-export base_image=rhel
-export image_tag=8
-export rhel_username=${your_username}
-export rhel_password=${your_password}
-docker build \
-    --build-arg base_image=registry.redhat.io/ubi${image_tag} \
-    --build-arg image_tag=latest \
-    --build-arg rhel_username=${rhel_username} \
-    --build-arg rhel_password=${rhel_password} \
-    -t ${repo_owner}/pkg-kamailio-docker:${base_image}-${image_tag} .
+export repo_owner=example
+export base_image=rhel-9
+export RHEL_USERNAME=${your_username}
+export RHEL_PASSWORD=${your_password}
+export platform=x86_64
+docker buildx build \
+    --platform linux/${platform} \
+    --secret id=RHEL_USERNAME,env=RHEL_USERNAME \
+    --secret id=RHEL_PASSWORD,env=RHEL_PASSWORD \
+    --build-arg base_image="registry.redhat.io/ubi9/ubi:latest" \
+    -t ${repo_owner}/kamailio-builder:${base_image} .
 ```
 
-To build image for other rpm dists need to define environement variables `repo_owner`, `base_image`, `image_tag` and then start build image like
+To build image for other dist need to define environment variables `repo_owner`, `base_image`, `image_tag` and then start build image like
 
 ```sh
-export repo_owner=safarov
-export base_image=fedora
-export image_tag=31
-docker build \
+export repo_owner=example
+export base_image=fedora-42
+export platform=x86_64
+docker buildx build \
+    --platform linux/${platform} \
     --build-arg base_image=${base_image} \
-    --build-arg image_tag=${image_tag} \
-    -t ${repo_owner}/pkg-kamailio-docker:${base_image}-${image_tag} .
+    -t ${repo_owner}/kamailio-builder:${base_image} .
 ```
+
+To build for CentOS Stream
+```sh
+export repo_owner=example
+export base_image=centos-10
+export platform=x86_64
+docker buildx build \
+    --platform linux/${platform} \
+    --build-arg base_image="quay.io/centos/centos:stream10" \
+    -t ${repo_owner}/kamailio-builder:${base_image} .
+```
+
+Suported dist
+
+| dist                | version | arch                          |
+|---------------------|---------|--------------------------------
+| rhel                | 10      |x86_64, aarch64, s390x         |
+| rhel                | 9       |x86_64, aarch64                |
+| rhel                | 8       |x86_64, aarch64                |
+| centos              | 10      |x86_64, aarch64, s390x, ppc64le|
+| centos              | 9       |x86_64, aarch64, s390x, ppc64le|
+| centos              | 8       |x86_64, aarch64, s390x         |
+| rocky               | 9       |x86_64, aarch64, s390x, ppc64le|
+| fedora              | 42      |x86_64, aarch64, s390x, ppc64le|
+| fedora              | 41      |x86_64, aarch64, s390x, ppc64le|