packaging: fix the need of multiple Dockerfiles for opensuse, clean some coderabbit concerns

Signed-off-by: Dan Illescas <[email protected]>

Author: illescad

install.sh

@@ -148,13 +148,33 @@ apt-get -y update
 $INSTALL_CMD_PREFIX apt-get -y $APT_PARAMETERS install $INSTALL_PACKAGE_NAME$APT_VERSION
 SCRIPT
     ;;
-    opensuse-leap|sles)
+    opensuse-leap)
+        # Leap has a VERSION_ID like "15.6"
         $SUDO sh <<SCRIPT
 rpm --import $RELEASE_KEY
 cat << EOF > /etc/zypp/repos.d/fluent-bit.repo
 [fluent-bit]
 name = Fluent Bit
-baseurl = $RELEASE_URL/suse/\$releasever
+baseurl = $RELEASE_URL/opensuse/leap/$VERSION_ID
+gpgcheck=1
+repo_gpgcheck=1
+gpgkey=$RELEASE_KEY
+enabled=1
+type=rpm-md
+autorefresh=1
+EOF
+cat /etc/zypp/repos.d/fluent-bit.repo
+zypper --non-interactive --gpg-auto-import-keys refresh
+$INSTALL_CMD_PREFIX zypper --non-interactive --gpg-auto-import-keys $ZYPPER_PARAMETERS install $INSTALL_PACKAGE_NAME$ZYPPER_VERSION
+SCRIPT
+    ;;
+    sles)
+        $SUDO sh <<SCRIPT
+rpm --import $RELEASE_KEY
+cat << EOF > /etc/zypp/repos.d/fluent-bit.repo
+[fluent-bit]
+name = Fluent Bit
+baseurl = $RELEASE_URL/sles/\$releasever
 gpgcheck=1
 repo_gpgcheck=1
 gpgkey=$RELEASE_KEY

packaging/distros/opensuse/15.6.arm64v8/Dockerfile

@@ -9,28 +9,47 @@ ARG BASE_BUILDER
 FROM multiarch/qemu-user-static:x86_64-aarch64 AS multiarch-aarch64
 
 # opensuse/leap base image
+# hadolint ignore=DL3006
 FROM opensuse/leap AS opensuse-leap-base
 
-# hadolint ignore=DL3033
+# hadolint ignore=DL3037,DL3033
 RUN zypper up -y && \
     zypper install -y --no-recommends \
         rpm-build \
         curl ca-certificates wget unzip flex bison \
         gcc gcc-c++ \
-        cmake3-full \
+        cmake-full \
         make \
         bash \
         systemd-devel \
         postgresql postgresql-devel postgresql-server \
         cyrus-sasl cyrus-sasl-devel \
-        libopenssl3 libopenssl-3-devel \
+        libopenssl3 libopenssl-devel \
         libyaml-devel && \
     zypper clean -a && rm -rf /var/cache/zypp/*
 
+# opensuse/leap base image
+FROM opensuse/leap:15.6 AS opensuse-15.6-base 
+
+# hadolint ignore=DL3037,DL3033
+RUN zypper up -y && \
+    zypper install -y --no-recommends \
+        rpm-build \
+        curl ca-certificates wget unzip flex bison \
+        gcc gcc-c++ \
+        cmake-full \
+        make \
+        bash \
+        systemd-devel \
+        postgresql postgresql-devel postgresql-server \
+        cyrus-sasl cyrus-sasl-devel \
+        libopenssl3 libopenssl-devel \
+        libyaml-devel && \
+    zypper clean -a && rm -rf /var/cache/zypp/*
 
 # opensuse/leap.arm64v8 base image
-# hadolint ignore=DL3029
-FROM --platform=arm64 opensuse/leap:15.6 AS opensuse-leap.arm64v8-base
+# hadolint ignore=DL3037,DL3029
+FROM --platform=arm64 opensuse/leap:15.6 AS opensuse-15.6.arm64v8-base
 
 COPY --from=multiarch-aarch64 /usr/bin/qemu-aarch64-static /usr/bin/qemu-aarch64-static
 
@@ -40,13 +59,13 @@ RUN zypper up -y && \
         rpm-build \
         curl ca-certificates wget unzip flex bison \
         gcc gcc-c++ \
-        cmake3-full \
+        cmake-full \
         make \
         bash \
         systemd-devel \
         postgresql postgresql-devel postgresql-server \
         cyrus-sasl cyrus-sasl-devel \
-        libopenssl3 libopenssl-3-devel \
+        libopenssl3 libopenssl-devel \
         libyaml-devel && \
     zypper clean -a && rm -rf /var/cache/zypp/*
 

packaging/distros/opensuse/15.6/Dockerfile

@@ -5,33 +5,34 @@ ARG BASE_BUILDER
 # Multiarch support
 FROM multiarch/qemu-user-static:x86_64-aarch64 AS multiarch-aarch64
 
-# opensuse/leap base image
+# sles base image
 FROM registry.suse.com/bci/bci-base:15.7 AS sles-15.7-base
 
-# hadolint ignore=DL3033
+# hadolint ignore=DL3037,DL3033
 RUN zypper up -y && \
     zypper install -y --no-recommends \
         rpm-build curl ca-certificates gcc gcc-c++ cmake-full make bash \
         wget unzip systemd-devel flex bison \
         postgresql-server postgresql-devel cyrus-sasl-devel \
         libopenssl-devel libyaml-devel && \
     rm -rf /var/log/{lastlog,tallylog,zypper.log,zypp/history,YaST2} && \
+    rm -rf /var/log/lastlog /var/log/tallylog /var/log/zypper.log /var/log/zypp/history /var/log/YaST2 && \
     zypper clean -a
 
-# opensuse/leap.arm64v8 base image
+# sles base image is the same name for all architectures
 # hadolint ignore=DL3029
 FROM --platform=arm64 registry.suse.com/bci/bci-base:15.7 AS sles-15.7.arm64v8-base
 
 COPY --from=multiarch-aarch64 /usr/bin/qemu-aarch64-static /usr/bin/qemu-aarch64-static
 
-# hadolint ignore=DL3033
+# hadolint ignore=DL3037,DL3033
 RUN zypper up -y && \
     zypper install -y --no-recommends \
         rpm-build curl ca-certificates gcc gcc-c++ cmake-full make bash \
         wget unzip systemd-devel flex bison \
         postgresql-server postgresql-devel cyrus-sasl-devel \
         libopenssl-devel libyaml-devel && \
-    rm -rf /var/log/{lastlog,tallylog,zypper.log,zypp/history,YaST2} && \
+    rm -rf /var/log/lastlog /var/log/tallylog /var/log/zypper.log /var/log/zypp/history /var/log/YaST2 && \
     zypper clean -a
 
 # Need larger page size

packaging/distros/opensuse/Dockerfile

@@ -43,7 +43,7 @@ RPM_REPO_PATHS=( "amazonlinux/2"
 				 "almalinux/8" 
 				 "almalinux/9" 
 				 "almalinux/10"
-				 "opensuse/15.6"
+				 "opensuse/leap/15.6"
 				 "sles/15.7"
 				)
 
@@ -58,7 +58,14 @@ for RPM_REPO in "${RPM_REPO_PATHS[@]}"; do
         aws s3 sync s3://"${AWS_S3_BUCKET_STAGING:?}/$RPM_REPO" "${BASE_PATH:?}/$RPM_REPO"
     fi
 
-    /bin/bash -eux "$SCRIPT_DIR/update-yum-repo.sh"
+    case "$RPM_REPO" in
+        "opensuse/"* | "sles/"*)
+            /bin/bash -eux "$SCRIPT_DIR/update-zypper-repo.sh"
+            ;;
+        *)
+            /bin/bash -eux "$SCRIPT_DIR/update-yum-repo.sh"
+            ;;
+    esac
 done
 
 DEB_REPO_PATHS=( "debian/bookworm"

packaging/distros/sles/Dockerfile

@@ -3,7 +3,7 @@ set -eux
 
 # Used to update a SUSE repository, e.g. during a staging build or release process
 
-# SUSE/openSUSE version and arch, e.g. "opensuse/leap/15.6" or "sles/15-sp5"
+# SUSE/openSUSE version and arch, e.g. "opensuse/leap/15.6" or "sles/15.7"
 RPM_REPO=${RPM_REPO:?}
 
 # Where the base of all the repos is
@@ -16,14 +16,21 @@ fi
 # Set true to prevent signing
 DISABLE_SIGNING=${DISABLE_SIGNING:-false}
 if [[ "$DISABLE_SIGNING" != "true" ]]; then
-    echo "INFO: RPM signing configuration"
-    rpm --showrc | grep gpg
-    rpm -q gpg-pubkey --qf '%{name}-%{version}-%{release} --> %{summary}\n'
+    if [[ -z "${GPG_KEY:-}" ]]; then
+        echo "ERROR: GPG_KEY is required when signing is enabled (set DISABLE_SIGNING=true to skip)."
+        exit 1
+    fi
+    echo "INFO: RPM signing configuration (best-effort)"
+    rpm --showrc | grep -i gpg || true
+    rpm -q gpg-pubkey --qf '%{name}-%{version}-%{release} --> %{summary}\n' || true
 fi
 
 # createrepo is available on SUSE
 CREATE_REPO_CMD="createrepo"
-CREATE_REPO_ARGS=${CREATE_REPO_ARGS:--dvp}
+# Default combined short options; allow space-separated overrides via env
+CREATE_REPO_ARGS=${CREATE_REPO_ARGS:--d -v -p}
+# shellcheck disable=SC2206 # intentional word splitting into array
+CREATE_REPO_ARGS_ARR=(${CREATE_REPO_ARGS})
 
 # Check for createrepo
 if ! command -v createrepo &> /dev/null; then
@@ -45,7 +52,7 @@ if [[ "$DISABLE_SIGNING" != "true" ]]; then
 fi
 
 # Create full metadata for all RPMs in the directory
-"$CREATE_REPO_CMD" "$CREATE_REPO_ARGS" "$REPO_DIR"
+"$CREATE_REPO_CMD" "${CREATE_REPO_ARGS_ARR[@]}" "$REPO_DIR"
 
 # Set up repo info in SUSE format
 if [[ -n "${AWS_S3_BUCKET:-}" ]]; then