From da4bd35f521d7cb8380327ba67de6ea5043ca7a8 Mon Sep 17 00:00:00 2001
From: Dan Illescas <daniel.illescas@hpe.com>
Date: Tue, 30 Sep 2025 11:50:43 -0500
Subject: [PATCH 1/9] packaging: attempt for Opensuse v15.6 and SLES v15.7.
 opensuse build is not working. Currently testing ./build.sh -d
 opensuse/leap:15.6

Signed-off-by: Dan Illescas <daniel.illescas@hpe.com>
---
 packaging/build-config.json           |   8 ++
 packaging/distros/opensuse/Dockerfile | 105 ++++++++++++++++++++++++++
 packaging/distros/sles/Dockerfile     |  89 ++++++++++++++++++++++
 packaging/test-release-packages.sh    |   2 +
 packaging/update-repos.sh             |   2 +
 5 files changed, 206 insertions(+)
 create mode 100644 packaging/distros/opensuse/Dockerfile
 create mode 100644 packaging/distros/sles/Dockerfile

diff --git a/packaging/build-config.json b/packaging/build-config.json
index 4ca4f44df99..337a1061b19 100644
--- a/packaging/build-config.json
+++ b/packaging/build-config.json
@@ -96,6 +96,14 @@
           "target": "almalinux/10.arm64v8",
           "type": "rpm"
         },
+        {
+          "target": "opensuse/leap",
+          "type": "rpm"
+        },
+        {
+          "target": "sles/15.7",
+          "type": "rpm"
+        },
         {
           "target": "debian/bookworm",
           "type": "deb"
diff --git a/packaging/distros/opensuse/Dockerfile b/packaging/distros/opensuse/Dockerfile
new file mode 100644
index 00000000000..c2a95db0642
--- /dev/null
+++ b/packaging/distros/opensuse/Dockerfile
@@ -0,0 +1,105 @@
+# Special Dockerfile to build all targets, the only difference is
+# the packages in the base image.
+# Set this to the base image to use in each case, so if we want to build for opensuse/leap
+# we would set BASE_BUILDER=opensuse-leap-base.
+ARG BASE_BUILDER
+# Lookup the name to use below but should follow the '<distro>-base' convention with slashes replaced.
+# Use buildkit to skip unused base images: DOCKER_BUILDKIT=1
+
+# Multiarch support
+FROM multiarch/qemu-user-static:x86_64-aarch64 as multiarch-aarch64
+
+# opensuse/leap base image
+FROM opensuse/leap:15.6 as opensuse_leap
+
+# hadolint ignore=DL3033
+RUN zypper up -y && \
+    zypper install -y --no-recommends \
+        rpm-build \
+        curl ca-certificates wget unzip flex bison \
+        gcc gcc-c++ \
+        cmake3-full \
+        make \
+        bash \
+        systemd-devel \
+        postgresql postgresql-devel postgresql-server \
+        cyrus-sasl cyrus-sasl-devel \
+        libopenssl3 libopenssl-3-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
+
+COPY --from=multiarch-aarch64 /usr/bin/qemu-aarch64-static /usr/bin/qemu-aarch64-static
+
+# hadolint ignore=DL3033
+RUN zypper up -y && \
+    zypper install -y --no-recommends \
+        rpm-build \
+        curl ca-certificates wget unzip flex bison \
+        gcc gcc-c++ \
+        cmake3-full \
+        make \
+        bash \
+        systemd-devel \
+        postgresql postgresql-devel postgresql-server \
+        cyrus-sasl cyrus-sasl-devel \
+        libopenssl3 libopenssl-3-devel \
+        libyaml-devel && \
+    zypper clean -a && rm -rf /var/cache/zypp/*
+
+# Need larger page size
+ARG FLB_JEMALLOC_OPTIONS="--with-lg-page=16 --with-lg-quantum=3"
+ENV FLB_JEMALLOC_OPTIONS=$FLB_JEMALLOC_OPTIONS
+
+# Common build for all distributions now
+# hadolint ignore=DL3006
+FROM $BASE_BUILDER as builder
+
+ARG FLB_NIGHTLY_BUILD
+ENV FLB_NIGHTLY_BUILD=$FLB_NIGHTLY_BUILD
+
+# Docker context must be the base of the repo
+WORKDIR /source/fluent-bit/
+COPY . ./
+
+WORKDIR /source/fluent-bit/build/
+# CMake configuration variables
+# Unused
+ARG CFLAGS
+ARG CMAKE_INSTALL_PREFIX=/opt/fluent-bit/
+ARG CMAKE_INSTALL_SYSCONFDIR=/etc/
+ARG FLB_SIMD=On
+ARG FLB_RELEASE=On
+ARG FLB_TRACE=On
+ARG FLB_SQLDB=On
+ARG FLB_HTTP_SERVER=On
+ARG FLB_OUT_KAFKA=On
+ARG FLB_JEMALLOC=On
+ARG FLB_CHUNK_TRACE=On
+ARG FLB_UNICODE_ENCODER=On
+ARG FLB_KAFKA=On
+ARG FLB_OUT_PGSQL=On
+ARG SYSTEMD_UNITDIR=/usr/lib/systemd/system
+
+RUN cmake -DCMAKE_INSTALL_PREFIX="$CMAKE_INSTALL_PREFIX" \
+    -DCMAKE_INSTALL_SYSCONFDIR="$CMAKE_INSTALL_SYSCONFDIR" \
+    -DFLB_SIMD="$FLB_SIMD" \
+    -DFLB_RELEASE="$FLB_RELEASE" \
+    -DFLB_TRACE="$FLB_TRACE" \
+    -DFLB_SQLDB="$FLB_SQLDB" \
+    -DFLB_HTTP_SERVER="$FLB_HTTP_SERVER" \
+    -DFLB_KAFKA="$FLB_KAFKA" \
+    -DFLB_OUT_PGSQL="$FLB_OUT_PGSQL" \
+    -DFLB_NIGHTLY_BUILD="$FLB_NIGHTLY_BUILD" \
+    -DFLB_JEMALLOC_OPTIONS="$FLB_JEMALLOC_OPTIONS" \
+    -DFLB_JEMALLOC="${FLB_JEMALLOC}" \
+    -DFLB_CHUNK_TRACE="${FLB_CHUNK_TRACE}" \
+    -DFLB_UNICODE_ENCODER="${FLB_UNICODE_ENCODER}" \
+    -DSYSTEMD_UNITDIR="$SYSTEMD_UNITDIR" \
+    ../
+
+VOLUME [ "/output" ]
+CMD [ "/bin/bash", "-c", "make --no-print-directory -j 4 && cpack -G RPM && cp *.rpm /output/" ]
diff --git a/packaging/distros/sles/Dockerfile b/packaging/distros/sles/Dockerfile
new file mode 100644
index 00000000000..c71c1b7e6fa
--- /dev/null
+++ b/packaging/distros/sles/Dockerfile
@@ -0,0 +1,89 @@
+ARG BASE_BUILDER
+# Lookup the name to use below but should follow the '<distro>-base' convention with slashes replaced.
+# Use buildkit to skip unused base images: DOCKER_BUILDKIT=1
+
+# Multiarch support
+FROM multiarch/qemu-user-static:x86_64-aarch64 as multiarch-aarch64
+
+# opensuse/leap base image
+FROM registry.suse.com/bci/bci-base:15.7 as sles-15.7-base
+
+# hadolint ignore=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} && \
+    zypper clean -a
+
+# opensuse/leap.arm64v8 base image
+# 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
+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} && \
+    zypper clean -a
+
+# Need larger page size
+ARG FLB_JEMALLOC_OPTIONS="--with-lg-page=16 --with-lg-quantum=3"
+ENV FLB_JEMALLOC_OPTIONS=$FLB_JEMALLOC_OPTIONS
+
+# Common build for all distributions now
+# hadolint ignore=DL3006
+FROM $BASE_BUILDER as builder
+
+ARG FLB_NIGHTLY_BUILD
+ENV FLB_NIGHTLY_BUILD=$FLB_NIGHTLY_BUILD
+
+# Docker context must be the base of the repo
+WORKDIR /source/fluent-bit/
+COPY . ./
+
+WORKDIR /source/fluent-bit/build/
+# CMake configuration variables
+# Unused
+ARG CFLAGS
+ARG CMAKE_INSTALL_PREFIX=/opt/fluent-bit/
+ARG CMAKE_INSTALL_SYSCONFDIR=/etc/
+ARG FLB_SIMD=On
+ARG FLB_RELEASE=On
+ARG FLB_TRACE=On
+ARG FLB_SQLDB=On
+ARG FLB_HTTP_SERVER=On
+ARG FLB_OUT_KAFKA=On
+ARG FLB_JEMALLOC=On
+ARG FLB_CHUNK_TRACE=On
+ARG FLB_UNICODE_ENCODER=On
+ARG FLB_KAFKA=On
+ARG FLB_OUT_PGSQL=On
+ARG SYSTEMD_UNITDIR=/usr/lib/systemd/system
+
+RUN cmake -DCMAKE_INSTALL_PREFIX="$CMAKE_INSTALL_PREFIX" \
+    -DCMAKE_INSTALL_SYSCONFDIR="$CMAKE_INSTALL_SYSCONFDIR" \
+    -DFLB_SIMD="$FLB_SIMD" \
+    -DFLB_RELEASE="$FLB_RELEASE" \
+    -DFLB_TRACE="$FLB_TRACE" \
+    -DFLB_SQLDB="$FLB_SQLDB" \
+    -DFLB_HTTP_SERVER="$FLB_HTTP_SERVER" \
+    -DFLB_KAFKA="$FLB_KAFKA" \
+    -DFLB_OUT_PGSQL="$FLB_OUT_PGSQL" \
+    -DFLB_NIGHTLY_BUILD="$FLB_NIGHTLY_BUILD" \
+    -DFLB_JEMALLOC_OPTIONS="$FLB_JEMALLOC_OPTIONS" \
+    -DFLB_JEMALLOC="${FLB_JEMALLOC}" \
+    -DFLB_CHUNK_TRACE="${FLB_CHUNK_TRACE}" \
+    -DFLB_UNICODE_ENCODER="${FLB_UNICODE_ENCODER}" \
+    -DSYSTEMD_UNITDIR="$SYSTEMD_UNITDIR" \
+    ../
+
+VOLUME [ "/output" ]
+CMD [ "/bin/bash", "-c", "make --no-print-directory -j 4 && cpack -G RPM && cp *.rpm /output/" ]
diff --git a/packaging/test-release-packages.sh b/packaging/test-release-packages.sh
index 37719d7a2c6..1234ee6ac94 100755
--- a/packaging/test-release-packages.sh
+++ b/packaging/test-release-packages.sh
@@ -58,6 +58,8 @@ YUM_TARGETS=(
     "quay.io/centos/centos:stream10"
     "amazonlinux:2"
     "amazonlinux:2023"
+    "opensuse/leap"
+    "sles/15.7"
 )
 
 for IMAGE in "${YUM_TARGETS[@]}"
diff --git a/packaging/update-repos.sh b/packaging/update-repos.sh
index aff62af7d64..4dd2e9d3226 100755
--- a/packaging/update-repos.sh
+++ b/packaging/update-repos.sh
@@ -43,6 +43,8 @@ RPM_REPO_PATHS=( "amazonlinux/2"
 				 "almalinux/8" 
 				 "almalinux/9" 
 				 "almalinux/10"
+				 "opensuse/leap"
+				 "sles/15.7"
 				)
 
 if [[ "${AWS_SYNC:-false}" != "false" ]]; then

From 1116ddf13b80dcd4d9acc5880718915f002b449e Mon Sep 17 00:00:00 2001
From: Dan Illescas <daniel.illescas@hpe.com>
Date: Sun, 5 Oct 2025 11:00:37 -0500
Subject: [PATCH 2/9] packaging: add SLES and Opensuse Support

Signed-off-by: Dan Illescas <daniel.illescas@hpe.com>
---
 packaging/README.md                           |  4 +
 packaging/build-config.json                   | 10 ++-
 .../distros/opensuse/15.6.arm64v8/Dockerfile  | 74 +++++++++++++++++++
 packaging/distros/opensuse/15.6/Dockerfile    | 69 +++++++++++++++++
 packaging/distros/opensuse/Dockerfile         | 13 ++--
 packaging/distros/sles/Dockerfile             |  8 +-
 packaging/test-release-packages.sh            |  2 +-
 packaging/update-repos.sh                     |  2 +-
 8 files changed, 169 insertions(+), 13 deletions(-)
 create mode 100644 packaging/distros/opensuse/15.6.arm64v8/Dockerfile
 create mode 100644 packaging/distros/opensuse/15.6/Dockerfile

diff --git a/packaging/README.md b/packaging/README.md
index 4066f30b15f..254e8270cc7 100644
--- a/packaging/README.md
+++ b/packaging/README.md
@@ -37,6 +37,10 @@ The [`distros`](./distros/) directory contains OCI container definitions used to
 | Debian        |   11                      | arm64v8 | debian/bullseye.arm64v8  |
 | Debian        |   10                      | x86_64  | debian/buster            |
 | Debian        |   10                      | arm64v8 | debian/buster.arm64v8    |
+| Opensuse      |   15.6                    | x86_64  | opensuse/15.6            |
+| Opensuse      |   15.6                    | arm64v8 | opensuse/15.6.arm64v8    |
+| **SLES**      |   15.7                    | x86_64  | sles/15.7                |
+| **SLES**      |   15.7                    | arm64v8 | sles/15.7.arm64v8        |
 | Ubuntu        |   24.04 / Noble Numbat    | x86_64  | ubuntu/24.04             |
 | Ubuntu        |   24.04 / Noble Numbat    | arm64v8 | ubuntu/24.04.arm64v8     |
 | Ubuntu        |   22.04 / Jammy Jellyfish | x86_64  | ubuntu/22.04             |
diff --git a/packaging/build-config.json b/packaging/build-config.json
index 337a1061b19..32b7a9d5610 100644
--- a/packaging/build-config.json
+++ b/packaging/build-config.json
@@ -97,13 +97,21 @@
           "type": "rpm"
         },
         {
-          "target": "opensuse/leap",
+          "target": "opensuse/15.6",
+          "type": "rpm"
+        },
+        {
+          "target": "opensuse/15.6.arm64v8",
           "type": "rpm"
         },
         {
           "target": "sles/15.7",
           "type": "rpm"
         },
+        {
+          "target": "sles/15.7.arm64v8",
+          "type": "rpm"
+        },
         {
           "target": "debian/bookworm",
           "type": "deb"
diff --git a/packaging/distros/opensuse/15.6.arm64v8/Dockerfile b/packaging/distros/opensuse/15.6.arm64v8/Dockerfile
new file mode 100644
index 00000000000..74a2ee2af4c
--- /dev/null
+++ b/packaging/distros/opensuse/15.6.arm64v8/Dockerfile
@@ -0,0 +1,74 @@
+# Multiarch support
+FROM multiarch/qemu-user-static:x86_64-aarch64 as multiarch-aarch64
+
+# opensuse/leap.arm64v8 base image
+# hadolint ignore=DL3029
+FROM --platform=arm64 opensuse/leap:15.6 AS opensuse-leap.arm64v8-base
+
+COPY --from=multiarch-aarch64 /usr/bin/qemu-aarch64-static /usr/bin/qemu-aarch64-static
+
+# hadolint ignore=DL3033
+RUN zypper up -y && \
+    zypper install -y --no-recommends \
+        rpm-build \
+        curl ca-certificates wget unzip flex bison \
+        gcc gcc-c++ \
+        cmake3-full \
+        make \
+        bash \
+        systemd-devel \
+        postgresql postgresql-devel postgresql-server \
+        cyrus-sasl cyrus-sasl-devel \
+        libopenssl3 libopenssl-3-devel \
+        libyaml-devel && \
+    zypper clean -a && rm -rf /var/cache/zypp/*
+
+# Need larger page size
+ARG FLB_JEMALLOC_OPTIONS="--with-lg-page=16 --with-lg-quantum=3"
+ENV FLB_JEMALLOC_OPTIONS=$FLB_JEMALLOC_OPTIONS
+
+ARG FLB_NIGHTLY_BUILD
+ENV FLB_NIGHTLY_BUILD=$FLB_NIGHTLY_BUILD
+
+# Docker context must be the base of the repo
+WORKDIR /source/fluent-bit/
+COPY . ./
+
+WORKDIR /source/fluent-bit/build/
+# CMake configuration variables
+# Unused
+ARG CFLAGS
+ARG CMAKE_INSTALL_PREFIX=/opt/fluent-bit/
+ARG CMAKE_INSTALL_SYSCONFDIR=/etc/
+ARG FLB_SIMD=On
+ARG FLB_RELEASE=On
+ARG FLB_TRACE=On
+ARG FLB_SQLDB=On
+ARG FLB_HTTP_SERVER=On
+ARG FLB_OUT_KAFKA=On
+ARG FLB_JEMALLOC=On
+ARG FLB_CHUNK_TRACE=On
+ARG FLB_UNICODE_ENCODER=On
+ARG FLB_KAFKA=On
+ARG FLB_OUT_PGSQL=On
+ARG SYSTEMD_UNITDIR=/usr/lib/systemd/system
+
+RUN cmake -DCMAKE_INSTALL_PREFIX="$CMAKE_INSTALL_PREFIX" \
+    -DCMAKE_INSTALL_SYSCONFDIR="$CMAKE_INSTALL_SYSCONFDIR" \
+    -DFLB_SIMD="$FLB_SIMD" \
+    -DFLB_RELEASE="$FLB_RELEASE" \
+    -DFLB_TRACE="$FLB_TRACE" \
+    -DFLB_SQLDB="$FLB_SQLDB" \
+    -DFLB_HTTP_SERVER="$FLB_HTTP_SERVER" \
+    -DFLB_KAFKA="$FLB_KAFKA" \
+    -DFLB_OUT_PGSQL="$FLB_OUT_PGSQL" \
+    -DFLB_NIGHTLY_BUILD="$FLB_NIGHTLY_BUILD" \
+    -DFLB_JEMALLOC_OPTIONS="$FLB_JEMALLOC_OPTIONS" \
+    -DFLB_JEMALLOC="${FLB_JEMALLOC}" \
+    -DFLB_CHUNK_TRACE="${FLB_CHUNK_TRACE}" \
+    -DFLB_UNICODE_ENCODER="${FLB_UNICODE_ENCODER}" \
+    -DSYSTEMD_UNITDIR="$SYSTEMD_UNITDIR" \
+    ../
+
+VOLUME [ "/output" ]
+CMD [ "/bin/bash", "-c", "make --no-print-directory -j 4 && cpack -G RPM && cp *.rpm /output/" ]
diff --git a/packaging/distros/opensuse/15.6/Dockerfile b/packaging/distros/opensuse/15.6/Dockerfile
new file mode 100644
index 00000000000..1eba8bcd970
--- /dev/null
+++ b/packaging/distros/opensuse/15.6/Dockerfile
@@ -0,0 +1,69 @@
+# Multiarch support
+# Builder/Final (per-arch) stages
+FROM opensuse/leap:15.6 AS opensuse-leap-base
+
+# hadolint ignore=DL3033
+RUN zypper up -y && \
+    zypper install -y --no-recommends \
+        rpm-build \
+        curl ca-certificates wget unzip flex bison \
+        gcc gcc-c++ \
+        cmake3-full \
+        make \
+        bash \
+        systemd-devel \
+        postgresql postgresql-devel postgresql-server \
+        cyrus-sasl cyrus-sasl-devel \
+        libopenssl3 libopenssl-3-devel \
+        libyaml-devel && \
+    zypper clean -a && rm -rf /var/cache/zypp/*
+
+# Need larger page size
+ARG FLB_JEMALLOC_OPTIONS="--with-lg-page=16 --with-lg-quantum=3"
+ENV FLB_JEMALLOC_OPTIONS=$FLB_JEMALLOC_OPTIONS
+
+ARG FLB_NIGHTLY_BUILD
+ENV FLB_NIGHTLY_BUILD=$FLB_NIGHTLY_BUILD
+
+# Docker context must be the base of the repo
+WORKDIR /source/fluent-bit/
+COPY . ./
+
+WORKDIR /source/fluent-bit/build/
+# CMake configuration variables
+# Unused
+ARG CFLAGS
+ARG CMAKE_INSTALL_PREFIX=/opt/fluent-bit/
+ARG CMAKE_INSTALL_SYSCONFDIR=/etc/
+ARG FLB_SIMD=On
+ARG FLB_RELEASE=On
+ARG FLB_TRACE=On
+ARG FLB_SQLDB=On
+ARG FLB_HTTP_SERVER=On
+ARG FLB_OUT_KAFKA=On
+ARG FLB_JEMALLOC=On
+ARG FLB_CHUNK_TRACE=On
+ARG FLB_UNICODE_ENCODER=On
+ARG FLB_KAFKA=On
+ARG FLB_OUT_PGSQL=On
+ARG SYSTEMD_UNITDIR=/usr/lib/systemd/system
+
+RUN cmake -DCMAKE_INSTALL_PREFIX="$CMAKE_INSTALL_PREFIX" \
+    -DCMAKE_INSTALL_SYSCONFDIR="$CMAKE_INSTALL_SYSCONFDIR" \
+    -DFLB_SIMD="$FLB_SIMD" \
+    -DFLB_RELEASE="$FLB_RELEASE" \
+    -DFLB_TRACE="$FLB_TRACE" \
+    -DFLB_SQLDB="$FLB_SQLDB" \
+    -DFLB_HTTP_SERVER="$FLB_HTTP_SERVER" \
+    -DFLB_KAFKA="$FLB_KAFKA" \
+    -DFLB_OUT_PGSQL="$FLB_OUT_PGSQL" \
+    -DFLB_NIGHTLY_BUILD="$FLB_NIGHTLY_BUILD" \
+    -DFLB_JEMALLOC_OPTIONS="$FLB_JEMALLOC_OPTIONS" \
+    -DFLB_JEMALLOC="${FLB_JEMALLOC}" \
+    -DFLB_CHUNK_TRACE="${FLB_CHUNK_TRACE}" \
+    -DFLB_UNICODE_ENCODER="${FLB_UNICODE_ENCODER}" \
+    -DSYSTEMD_UNITDIR="$SYSTEMD_UNITDIR" \
+    ../
+
+VOLUME [ "/output" ]
+CMD [ "/bin/bash", "-c", "make --no-print-directory -j 4 && cpack -G RPM && cp *.rpm /output/" ]
diff --git a/packaging/distros/opensuse/Dockerfile b/packaging/distros/opensuse/Dockerfile
index c2a95db0642..20192c92f36 100644
--- a/packaging/distros/opensuse/Dockerfile
+++ b/packaging/distros/opensuse/Dockerfile
@@ -1,5 +1,4 @@
-# Special Dockerfile to build all targets, the only difference is
-# the packages in the base image.
+# Dockerfile to build latest opensuse leap
 # Set this to the base image to use in each case, so if we want to build for opensuse/leap
 # we would set BASE_BUILDER=opensuse-leap-base.
 ARG BASE_BUILDER
@@ -7,10 +6,10 @@ ARG BASE_BUILDER
 # Use buildkit to skip unused base images: DOCKER_BUILDKIT=1
 
 # Multiarch support
-FROM multiarch/qemu-user-static:x86_64-aarch64 as multiarch-aarch64
+FROM multiarch/qemu-user-static:x86_64-aarch64 AS multiarch-aarch64
 
 # opensuse/leap base image
-FROM opensuse/leap:15.6 as opensuse_leap
+FROM opensuse/leap AS opensuse-leap-base
 
 # hadolint ignore=DL3033
 RUN zypper up -y && \
@@ -28,9 +27,10 @@ RUN zypper up -y && \
         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
+FROM --platform=arm64 opensuse/leap:15.6 AS opensuse-leap.arm64v8-base
 
 COPY --from=multiarch-aarch64 /usr/bin/qemu-aarch64-static /usr/bin/qemu-aarch64-static
 
@@ -56,7 +56,8 @@ ENV FLB_JEMALLOC_OPTIONS=$FLB_JEMALLOC_OPTIONS
 
 # Common build for all distributions now
 # hadolint ignore=DL3006
-FROM $BASE_BUILDER as builder
+FROM $BASE_BUILDER AS builder
+#
 
 ARG FLB_NIGHTLY_BUILD
 ENV FLB_NIGHTLY_BUILD=$FLB_NIGHTLY_BUILD
diff --git a/packaging/distros/sles/Dockerfile b/packaging/distros/sles/Dockerfile
index c71c1b7e6fa..2057fb288bc 100644
--- a/packaging/distros/sles/Dockerfile
+++ b/packaging/distros/sles/Dockerfile
@@ -3,10 +3,10 @@ ARG BASE_BUILDER
 # Use buildkit to skip unused base images: DOCKER_BUILDKIT=1
 
 # Multiarch support
-FROM multiarch/qemu-user-static:x86_64-aarch64 as multiarch-aarch64
+FROM multiarch/qemu-user-static:x86_64-aarch64 AS multiarch-aarch64
 
 # opensuse/leap base image
-FROM registry.suse.com/bci/bci-base:15.7 as sles-15.7-base
+FROM registry.suse.com/bci/bci-base:15.7 AS sles-15.7-base
 
 # hadolint ignore=DL3033
 RUN zypper up -y && \
@@ -20,7 +20,7 @@ RUN zypper up -y && \
 
 # opensuse/leap.arm64v8 base image
 # hadolint ignore=DL3029
-FROM --platform=arm64 registry.suse.com/bci/bci-base:15.7 as sles-15.7.arm64v8-base
+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
 
@@ -40,7 +40,7 @@ ENV FLB_JEMALLOC_OPTIONS=$FLB_JEMALLOC_OPTIONS
 
 # Common build for all distributions now
 # hadolint ignore=DL3006
-FROM $BASE_BUILDER as builder
+FROM $BASE_BUILDER AS builder
 
 ARG FLB_NIGHTLY_BUILD
 ENV FLB_NIGHTLY_BUILD=$FLB_NIGHTLY_BUILD
diff --git a/packaging/test-release-packages.sh b/packaging/test-release-packages.sh
index 1234ee6ac94..e47e295c831 100755
--- a/packaging/test-release-packages.sh
+++ b/packaging/test-release-packages.sh
@@ -58,7 +58,7 @@ YUM_TARGETS=(
     "quay.io/centos/centos:stream10"
     "amazonlinux:2"
     "amazonlinux:2023"
-    "opensuse/leap"
+    "opensuse/15.6"
     "sles/15.7"
 )
 
diff --git a/packaging/update-repos.sh b/packaging/update-repos.sh
index 4dd2e9d3226..1423b7b49ab 100755
--- a/packaging/update-repos.sh
+++ b/packaging/update-repos.sh
@@ -43,7 +43,7 @@ RPM_REPO_PATHS=( "amazonlinux/2"
 				 "almalinux/8" 
 				 "almalinux/9" 
 				 "almalinux/10"
-				 "opensuse/leap"
+				 "opensuse/15.6"
 				 "sles/15.7"
 				)
 

From d5ac93413fa87ea848fd4575b25d909099a4c395 Mon Sep 17 00:00:00 2001
From: Dan Illescas <daniel.illescas@hpe.com>
Date: Mon, 6 Oct 2025 10:47:50 -0500
Subject: [PATCH 3/9] packaging: Adding test-packages to support zypper and
 install.sh to support suse

Signed-off-by: Dan Illescas <daniel.illescas@hpe.com>
---
 install.sh                         | 26 ++++++++++++++++++++++++++
 packaging/README.md                |  4 ++--
 packaging/test-release-packages.sh | 29 +++++++++++++++++++++++++++--
 3 files changed, 55 insertions(+), 4 deletions(-)

diff --git a/install.sh b/install.sh
index 139c0dda27a..92a996c5dc2 100755
--- a/install.sh
+++ b/install.sh
@@ -14,6 +14,7 @@ INSTALL_PACKAGE_NAME=${FLUENT_BIT_INSTALL_PACKAGE_NAME:-fluent-bit}
 # Optional Apt/Yum additional parameters (e.g. releasever for AL2022/AL2023)
 APT_PARAMETERS=${FLUENT_BIT_INSTALL_APT_PARAMETERS:-}
 YUM_PARAMETERS=${FLUENT_BIT_INSTALL_YUM_PARAMETERS:-}
+ZYPPER_PARAMETERS=${FLUENT_BIT_INSTALL_ZYPPER_PARAMETERS:-}
 
 echo "================================"
 echo " Fluent Bit Installation Script "
@@ -48,9 +49,11 @@ fi
 # Set up version pinning
 APT_VERSION=''
 YUM_VERSION=''
+ZYPPER_VERSION=''
 if [ -n "${RELEASE_VERSION}" ]; then
     APT_VERSION="=$RELEASE_VERSION"
     YUM_VERSION="-$RELEASE_VERSION"
+    ZYPPER_VERSION="-$RELEASE_VERSION"
 fi
 
 # Now set up repos and install dependent on OS, version, etc.
@@ -143,6 +146,29 @@ EOF
 cat /etc/apt/sources.list.d/fluent-bit.list
 apt-get -y update
 $INSTALL_CMD_PREFIX apt-get -y $APT_PARAMETERS install $INSTALL_PACKAGE_NAME$APT_VERSION
+SCRIPT
+    ;;
+    opensuse*|sles)
+        SUSE_OS="opensuse"
+        case "${OS}" in
+          sles|suse) SUSE_OS="sles" ;;
+        esac
+        SUSE_VER="${VERSION_ID:-}"
+
+        $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_OS/$SUSE_VER
+gpgcheck=1
+repo_gpgcheck=1
+gpgkey=$RELEASE_KEY
+enabled=1
+EOF
+cat /etc/zypp/repos.d/fluent-bit.repo
+zypper --non-interactive refresh
+$INSTALL_CMD_PREFIX zypper --non-interactive $ZYPPER_PARAMETERS install $INSTALL_PACKAGE_NAME$ZYPPER_VERSION
 SCRIPT
     ;;
     *)
diff --git a/packaging/README.md b/packaging/README.md
index 254e8270cc7..b8995e386b6 100644
--- a/packaging/README.md
+++ b/packaging/README.md
@@ -37,8 +37,8 @@ The [`distros`](./distros/) directory contains OCI container definitions used to
 | Debian        |   11                      | arm64v8 | debian/bullseye.arm64v8  |
 | Debian        |   10                      | x86_64  | debian/buster            |
 | Debian        |   10                      | arm64v8 | debian/buster.arm64v8    |
-| Opensuse      |   15.6                    | x86_64  | opensuse/15.6            |
-| Opensuse      |   15.6                    | arm64v8 | opensuse/15.6.arm64v8    |
+| openSUSE      |   15.6                    | x86_64  | opensuse/15.6            |
+| openSUSE      |   15.6                    | arm64v8 | opensuse/15.6.arm64v8    |
 | **SLES**      |   15.7                    | x86_64  | sles/15.7                |
 | **SLES**      |   15.7                    | arm64v8 | sles/15.7.arm64v8        |
 | Ubuntu        |   24.04 / Noble Numbat    | x86_64  | ubuntu/24.04             |
diff --git a/packaging/test-release-packages.sh b/packaging/test-release-packages.sh
index e47e295c831..bb78ef98ef1 100755
--- a/packaging/test-release-packages.sh
+++ b/packaging/test-release-packages.sh
@@ -58,10 +58,14 @@ YUM_TARGETS=(
     "quay.io/centos/centos:stream10"
     "amazonlinux:2"
     "amazonlinux:2023"
-    "opensuse/15.6"
-    "sles/15.7"
 )
 
+ZYPPER_TARGETS=(
+    "opensuse/leap:15.6"
+    "registry.suse.com/bci/bci-base:15.7"
+)
+   
+
 for IMAGE in "${YUM_TARGETS[@]}"
 do
     echo "Testing $IMAGE"
@@ -115,3 +119,24 @@ do
     check_version "$LOG_FILE"
     rm -f "$LOG_FILE"
 done
+
+# New loop for ZYPPER_TARGETS
+for IMAGE in "${ZYPPER_TARGETS[@]}"
+do
+    echo "Testing $IMAGE"
+    LOG_FILE=$(mktemp)
+    # We do want word splitting for EXTRA_MOUNTS
+    # shellcheck disable=SC2086
+    $CONTAINER_RUNTIME run --rm -t \
+        -e FLUENT_BIT_PACKAGES_URL="${FLUENT_BIT_PACKAGES_URL:-https://packages.fluentbit.io}" \
+        -e FLUENT_BIT_PACKAGES_KEY="${FLUENT_BIT_PACKAGES_KEY:-https://packages.fluentbit.io/fluentbit.key}" \
+        -e FLUENT_BIT_RELEASE_VERSION="${FLUENT_BIT_RELEASE_VERSION:-}" \
+        -e FLUENT_BIT_INSTALL_COMMAND_PREFIX="${FLUENT_BIT_INSTALL_COMMAND_PREFIX:-}" \
+        -e FLUENT_BIT_INSTALL_PACKAGE_NAME="${FLUENT_BIT_INSTALL_PACKAGE_NAME:-fluent-bit}" \
+        -e FLUENT_BIT_INSTALL_ZYPPER_PARAMETERS="${FLUENT_BIT_INSTALL_ZYPPER_PARAMETERS:-}" \
+        $EXTRA_MOUNTS \
+        "$IMAGE" \
+        sh -c "zypper --non-interactive refresh && zypper --non-interactive install gpg curl; $INSTALL_CMD && /opt/fluent-bit/bin/fluent-bit --version" | tee "$LOG_FILE"
+    check_version "$LOG_FILE"
+    rm -f "$LOG_FILE"
+done

From 1504726f5a40638e4de25217e2aa339d43a5e6db Mon Sep 17 00:00:00 2001
From: Dan Illescas <daniel.illescas@hpe.com>
Date: Mon, 6 Oct 2025 11:29:25 -0500
Subject: [PATCH 4/9] packaging: fix base_url for suse repository

Signed-off-by: Dan Illescas <daniel.illescas@hpe.com>
---
 install.sh                         | 16 ++++++----------
 packaging/README.md                |  4 ++--
 packaging/test-release-packages.sh |  4 +++-
 3 files changed, 11 insertions(+), 13 deletions(-)

diff --git a/install.sh b/install.sh
index 92a996c5dc2..27de0c8eed1 100755
--- a/install.sh
+++ b/install.sh
@@ -148,27 +148,23 @@ apt-get -y update
 $INSTALL_CMD_PREFIX apt-get -y $APT_PARAMETERS install $INSTALL_PACKAGE_NAME$APT_VERSION
 SCRIPT
     ;;
-    opensuse*|sles)
-        SUSE_OS="opensuse"
-        case "${OS}" in
-          sles|suse) SUSE_OS="sles" ;;
-        esac
-        SUSE_VER="${VERSION_ID:-}"
-
+    opensuse-leap|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/$SUSE_OS/$SUSE_VER
+baseurl = $RELEASE_URL/suse/\$releasever
 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 refresh
-$INSTALL_CMD_PREFIX zypper --non-interactive $ZYPPER_PARAMETERS install $INSTALL_PACKAGE_NAME$ZYPPER_VERSION
+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
     ;;
     *)
diff --git a/packaging/README.md b/packaging/README.md
index b8995e386b6..82990d9447c 100644
--- a/packaging/README.md
+++ b/packaging/README.md
@@ -39,8 +39,8 @@ The [`distros`](./distros/) directory contains OCI container definitions used to
 | Debian        |   10                      | arm64v8 | debian/buster.arm64v8    |
 | openSUSE      |   15.6                    | x86_64  | opensuse/15.6            |
 | openSUSE      |   15.6                    | arm64v8 | opensuse/15.6.arm64v8    |
-| **SLES**      |   15.7                    | x86_64  | sles/15.7                |
-| **SLES**      |   15.7                    | arm64v8 | sles/15.7.arm64v8        |
+| SLES          |   15.7                    | x86_64  | sles/15.7                |
+| SLES          |   15.7                    | arm64v8 | sles/15.7.arm64v8        |
 | Ubuntu        |   24.04 / Noble Numbat    | x86_64  | ubuntu/24.04             |
 | Ubuntu        |   24.04 / Noble Numbat    | arm64v8 | ubuntu/24.04.arm64v8     |
 | Ubuntu        |   22.04 / Jammy Jellyfish | x86_64  | ubuntu/22.04             |
diff --git a/packaging/test-release-packages.sh b/packaging/test-release-packages.sh
index bb78ef98ef1..d9b40b3f72f 100755
--- a/packaging/test-release-packages.sh
+++ b/packaging/test-release-packages.sh
@@ -136,7 +136,9 @@ do
         -e FLUENT_BIT_INSTALL_ZYPPER_PARAMETERS="${FLUENT_BIT_INSTALL_ZYPPER_PARAMETERS:-}" \
         $EXTRA_MOUNTS \
         "$IMAGE" \
-        sh -c "zypper --non-interactive refresh && zypper --non-interactive install gpg curl; $INSTALL_CMD && /opt/fluent-bit/bin/fluent-bit --version" | tee "$LOG_FILE"
+        sh -c "zypper --non-interactive --gpg-auto-import-keys refresh \
+               zypper --non-interactive --gpg-auto-import-keys install gpg curl; \
+               $INSTALL_CMD /opt/fluent-bit/bin/fluent-bit --version" | tee "$LOG_FILE"
     check_version "$LOG_FILE"
     rm -f "$LOG_FILE"
 done

From 33892842bc0437166131b345f26530a818b321a3 Mon Sep 17 00:00:00 2001
From: Dan Illescas <daniel.illescas@hpe.com>
Date: Tue, 7 Oct 2025 09:26:53 -0500
Subject: [PATCH 5/9] packaging: fix coderabbit suggestions for  zypper
 multiline commands in test-release-packages.sh

Signed-off-by: Dan Illescas <daniel.illescas@hpe.com>
---
 packaging/test-release-packages.sh | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/packaging/test-release-packages.sh b/packaging/test-release-packages.sh
index d9b40b3f72f..4a0317cf0ab 100755
--- a/packaging/test-release-packages.sh
+++ b/packaging/test-release-packages.sh
@@ -136,8 +136,8 @@ do
         -e FLUENT_BIT_INSTALL_ZYPPER_PARAMETERS="${FLUENT_BIT_INSTALL_ZYPPER_PARAMETERS:-}" \
         $EXTRA_MOUNTS \
         "$IMAGE" \
-        sh -c "zypper --non-interactive --gpg-auto-import-keys refresh \
-               zypper --non-interactive --gpg-auto-import-keys install gpg curl; \
+        sh -c "zypper --non-interactive --gpg-auto-import-keys refresh && \
+               zypper --non-interactive --gpg-auto-import-keys install gpg curl; && \
                $INSTALL_CMD /opt/fluent-bit/bin/fluent-bit --version" | tee "$LOG_FILE"
     check_version "$LOG_FILE"
     rm -f "$LOG_FILE"

From b8d8fb5df7ec0863460edba34ef2f7f74d0bc91e Mon Sep 17 00:00:00 2001
From: Dan Illescas <daniel.illescas@hpe.com>
Date: Wed, 8 Oct 2025 14:58:13 -0500
Subject: [PATCH 6/9] packaging: include update-zypper-repo.sh

Signed-off-by: Dan Illescas <daniel.illescas@hpe.com>
---
 packaging/update-zypper-repo.sh | 78 +++++++++++++++++++++++++++++++++
 1 file changed, 78 insertions(+)
 create mode 100644 packaging/update-zypper-repo.sh

diff --git a/packaging/update-zypper-repo.sh b/packaging/update-zypper-repo.sh
new file mode 100644
index 00000000000..d0b36b51c0d
--- /dev/null
+++ b/packaging/update-zypper-repo.sh
@@ -0,0 +1,78 @@
+#!/bin/bash
+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"
+RPM_REPO=${RPM_REPO:?}
+
+# Where the base of all the repos is
+BASE_PATH=${BASE_PATH:-$1}
+if [[ ! -d "$BASE_PATH" ]]; then
+    echo "ERROR: invalid base path: $BASE_PATH"
+    exit 1
+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'
+fi
+
+# createrepo is available on SUSE
+CREATE_REPO_CMD="createrepo"
+CREATE_REPO_ARGS=${CREATE_REPO_ARGS:--dvp}
+
+# Check for createrepo
+if ! command -v createrepo &> /dev/null; then
+    echo "ERROR: 'createrepo' command not found. Please install it, e.g., 'zypper install createrepo'."
+    exit 1
+fi
+
+echo "INFO: updating $RPM_REPO"
+
+REPO_DIR=$(realpath -sm "$BASE_PATH/$RPM_REPO")
+if [[ ! -d "$REPO_DIR" ]]; then
+    echo "ERROR: missing $REPO_DIR"
+    exit 1
+fi
+
+if [[ "$DISABLE_SIGNING" != "true" ]]; then
+    # Sign all RPMs created for this target, cover both fluent-bit and legacy packages
+    find "$REPO_DIR" -name "*-bit-*.rpm" -exec rpm --define "_gpg_name $GPG_KEY" --addsign {} \;
+fi
+
+# Create full metadata for all RPMs in the directory
+"$CREATE_REPO_CMD" "$CREATE_REPO_ARGS" "$REPO_DIR"
+
+# Set up repo info in SUSE format
+if [[ -n "${AWS_S3_BUCKET:-}" ]]; then
+    # Create top-level file and replace path separator with dash
+    # opensuse/leap/15.6 --> opensuse-leap-15.6.repo
+    REPO_TYPE=${RPM_REPO//\//-}
+    echo "INFO: setting up $BASE_PATH/$REPO_TYPE.repo"
+    cat << EOF > "$BASE_PATH/$REPO_TYPE.repo"
+[Fluent-Bit]
+name=Fluent Bit Packages - $REPO_TYPE
+type=rpm-md
+baseurl=https://$AWS_S3_BUCKET.s3.amazonaws.com/$RPM_REPO/
+enabled=1
+gpgkey=https://$AWS_S3_BUCKET.s3.amazonaws.com/fluentbit.key
+gpgcheck=1
+autorefresh=1
+EOF
+fi
+
+# Ensure we sign the repository metadata
+if [[ "$DISABLE_SIGNING" != "true" ]]; then
+    while IFS= read -r -d '' REPO_METADATA_FILE; do
+        echo "INFO: signing $REPO_METADATA_FILE"
+        gpg --detach-sign --batch --armor --yes -u "$GPG_KEY" "$REPO_METADATA_FILE"
+    done < <(find "$REPO_DIR" -name repomd.xml -print0)
+    # Debug output for checking
+    find "$REPO_DIR" -name "repomd.xml*" -exec ls -l {} \;
+fi
+
+echo "INFO: Completed $RPM_REPO"

From 04fd8bc310537a1a3ea0b4e73786908aeb123ee2 Mon Sep 17 00:00:00 2001
From: Dan Illescas <daniel.illescas@hpe.com>
Date: Fri, 10 Oct 2025 17:05:06 -0500
Subject: [PATCH 7/9] packaging: fix the need of multiple Dockerfiles for
 opensuse, clean some coderabbit concerns

Signed-off-by: Dan Illescas <daniel.illescas@hpe.com>
---
 install.sh                                    | 24 +++++-
 .../distros/opensuse/15.6.arm64v8/Dockerfile  | 74 -------------------
 packaging/distros/opensuse/15.6/Dockerfile    | 69 -----------------
 packaging/distros/opensuse/Dockerfile         | 33 +++++++--
 packaging/distros/sles/Dockerfile             | 11 +--
 packaging/update-repos.sh                     | 11 ++-
 packaging/update-zypper-repo.sh               | 19 +++--
 7 files changed, 76 insertions(+), 165 deletions(-)
 delete mode 100644 packaging/distros/opensuse/15.6.arm64v8/Dockerfile
 delete mode 100644 packaging/distros/opensuse/15.6/Dockerfile

diff --git a/install.sh b/install.sh
index 27de0c8eed1..9c82ce5f059 100755
--- a/install.sh
+++ b/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
diff --git a/packaging/distros/opensuse/15.6.arm64v8/Dockerfile b/packaging/distros/opensuse/15.6.arm64v8/Dockerfile
deleted file mode 100644
index 74a2ee2af4c..00000000000
--- a/packaging/distros/opensuse/15.6.arm64v8/Dockerfile
+++ /dev/null
@@ -1,74 +0,0 @@
-# Multiarch support
-FROM multiarch/qemu-user-static:x86_64-aarch64 as multiarch-aarch64
-
-# opensuse/leap.arm64v8 base image
-# hadolint ignore=DL3029
-FROM --platform=arm64 opensuse/leap:15.6 AS opensuse-leap.arm64v8-base
-
-COPY --from=multiarch-aarch64 /usr/bin/qemu-aarch64-static /usr/bin/qemu-aarch64-static
-
-# hadolint ignore=DL3033
-RUN zypper up -y && \
-    zypper install -y --no-recommends \
-        rpm-build \
-        curl ca-certificates wget unzip flex bison \
-        gcc gcc-c++ \
-        cmake3-full \
-        make \
-        bash \
-        systemd-devel \
-        postgresql postgresql-devel postgresql-server \
-        cyrus-sasl cyrus-sasl-devel \
-        libopenssl3 libopenssl-3-devel \
-        libyaml-devel && \
-    zypper clean -a && rm -rf /var/cache/zypp/*
-
-# Need larger page size
-ARG FLB_JEMALLOC_OPTIONS="--with-lg-page=16 --with-lg-quantum=3"
-ENV FLB_JEMALLOC_OPTIONS=$FLB_JEMALLOC_OPTIONS
-
-ARG FLB_NIGHTLY_BUILD
-ENV FLB_NIGHTLY_BUILD=$FLB_NIGHTLY_BUILD
-
-# Docker context must be the base of the repo
-WORKDIR /source/fluent-bit/
-COPY . ./
-
-WORKDIR /source/fluent-bit/build/
-# CMake configuration variables
-# Unused
-ARG CFLAGS
-ARG CMAKE_INSTALL_PREFIX=/opt/fluent-bit/
-ARG CMAKE_INSTALL_SYSCONFDIR=/etc/
-ARG FLB_SIMD=On
-ARG FLB_RELEASE=On
-ARG FLB_TRACE=On
-ARG FLB_SQLDB=On
-ARG FLB_HTTP_SERVER=On
-ARG FLB_OUT_KAFKA=On
-ARG FLB_JEMALLOC=On
-ARG FLB_CHUNK_TRACE=On
-ARG FLB_UNICODE_ENCODER=On
-ARG FLB_KAFKA=On
-ARG FLB_OUT_PGSQL=On
-ARG SYSTEMD_UNITDIR=/usr/lib/systemd/system
-
-RUN cmake -DCMAKE_INSTALL_PREFIX="$CMAKE_INSTALL_PREFIX" \
-    -DCMAKE_INSTALL_SYSCONFDIR="$CMAKE_INSTALL_SYSCONFDIR" \
-    -DFLB_SIMD="$FLB_SIMD" \
-    -DFLB_RELEASE="$FLB_RELEASE" \
-    -DFLB_TRACE="$FLB_TRACE" \
-    -DFLB_SQLDB="$FLB_SQLDB" \
-    -DFLB_HTTP_SERVER="$FLB_HTTP_SERVER" \
-    -DFLB_KAFKA="$FLB_KAFKA" \
-    -DFLB_OUT_PGSQL="$FLB_OUT_PGSQL" \
-    -DFLB_NIGHTLY_BUILD="$FLB_NIGHTLY_BUILD" \
-    -DFLB_JEMALLOC_OPTIONS="$FLB_JEMALLOC_OPTIONS" \
-    -DFLB_JEMALLOC="${FLB_JEMALLOC}" \
-    -DFLB_CHUNK_TRACE="${FLB_CHUNK_TRACE}" \
-    -DFLB_UNICODE_ENCODER="${FLB_UNICODE_ENCODER}" \
-    -DSYSTEMD_UNITDIR="$SYSTEMD_UNITDIR" \
-    ../
-
-VOLUME [ "/output" ]
-CMD [ "/bin/bash", "-c", "make --no-print-directory -j 4 && cpack -G RPM && cp *.rpm /output/" ]
diff --git a/packaging/distros/opensuse/15.6/Dockerfile b/packaging/distros/opensuse/15.6/Dockerfile
deleted file mode 100644
index 1eba8bcd970..00000000000
--- a/packaging/distros/opensuse/15.6/Dockerfile
+++ /dev/null
@@ -1,69 +0,0 @@
-# Multiarch support
-# Builder/Final (per-arch) stages
-FROM opensuse/leap:15.6 AS opensuse-leap-base
-
-# hadolint ignore=DL3033
-RUN zypper up -y && \
-    zypper install -y --no-recommends \
-        rpm-build \
-        curl ca-certificates wget unzip flex bison \
-        gcc gcc-c++ \
-        cmake3-full \
-        make \
-        bash \
-        systemd-devel \
-        postgresql postgresql-devel postgresql-server \
-        cyrus-sasl cyrus-sasl-devel \
-        libopenssl3 libopenssl-3-devel \
-        libyaml-devel && \
-    zypper clean -a && rm -rf /var/cache/zypp/*
-
-# Need larger page size
-ARG FLB_JEMALLOC_OPTIONS="--with-lg-page=16 --with-lg-quantum=3"
-ENV FLB_JEMALLOC_OPTIONS=$FLB_JEMALLOC_OPTIONS
-
-ARG FLB_NIGHTLY_BUILD
-ENV FLB_NIGHTLY_BUILD=$FLB_NIGHTLY_BUILD
-
-# Docker context must be the base of the repo
-WORKDIR /source/fluent-bit/
-COPY . ./
-
-WORKDIR /source/fluent-bit/build/
-# CMake configuration variables
-# Unused
-ARG CFLAGS
-ARG CMAKE_INSTALL_PREFIX=/opt/fluent-bit/
-ARG CMAKE_INSTALL_SYSCONFDIR=/etc/
-ARG FLB_SIMD=On
-ARG FLB_RELEASE=On
-ARG FLB_TRACE=On
-ARG FLB_SQLDB=On
-ARG FLB_HTTP_SERVER=On
-ARG FLB_OUT_KAFKA=On
-ARG FLB_JEMALLOC=On
-ARG FLB_CHUNK_TRACE=On
-ARG FLB_UNICODE_ENCODER=On
-ARG FLB_KAFKA=On
-ARG FLB_OUT_PGSQL=On
-ARG SYSTEMD_UNITDIR=/usr/lib/systemd/system
-
-RUN cmake -DCMAKE_INSTALL_PREFIX="$CMAKE_INSTALL_PREFIX" \
-    -DCMAKE_INSTALL_SYSCONFDIR="$CMAKE_INSTALL_SYSCONFDIR" \
-    -DFLB_SIMD="$FLB_SIMD" \
-    -DFLB_RELEASE="$FLB_RELEASE" \
-    -DFLB_TRACE="$FLB_TRACE" \
-    -DFLB_SQLDB="$FLB_SQLDB" \
-    -DFLB_HTTP_SERVER="$FLB_HTTP_SERVER" \
-    -DFLB_KAFKA="$FLB_KAFKA" \
-    -DFLB_OUT_PGSQL="$FLB_OUT_PGSQL" \
-    -DFLB_NIGHTLY_BUILD="$FLB_NIGHTLY_BUILD" \
-    -DFLB_JEMALLOC_OPTIONS="$FLB_JEMALLOC_OPTIONS" \
-    -DFLB_JEMALLOC="${FLB_JEMALLOC}" \
-    -DFLB_CHUNK_TRACE="${FLB_CHUNK_TRACE}" \
-    -DFLB_UNICODE_ENCODER="${FLB_UNICODE_ENCODER}" \
-    -DSYSTEMD_UNITDIR="$SYSTEMD_UNITDIR" \
-    ../
-
-VOLUME [ "/output" ]
-CMD [ "/bin/bash", "-c", "make --no-print-directory -j 4 && cpack -G RPM && cp *.rpm /output/" ]
diff --git a/packaging/distros/opensuse/Dockerfile b/packaging/distros/opensuse/Dockerfile
index 20192c92f36..05847f3b268 100644
--- a/packaging/distros/opensuse/Dockerfile
+++ b/packaging/distros/opensuse/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/*
 
diff --git a/packaging/distros/sles/Dockerfile b/packaging/distros/sles/Dockerfile
index 2057fb288bc..758437c04f4 100644
--- a/packaging/distros/sles/Dockerfile
+++ b/packaging/distros/sles/Dockerfile
@@ -5,10 +5,10 @@ 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 \
@@ -16,22 +16,23 @@ RUN zypper up -y && \
         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
diff --git a/packaging/update-repos.sh b/packaging/update-repos.sh
index 1423b7b49ab..f204a585166 100755
--- a/packaging/update-repos.sh
+++ b/packaging/update-repos.sh
@@ -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"
diff --git a/packaging/update-zypper-repo.sh b/packaging/update-zypper-repo.sh
index d0b36b51c0d..ea6024cdb2c 100644
--- a/packaging/update-zypper-repo.sh
+++ b/packaging/update-zypper-repo.sh
@@ -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

From dad5968dc62dd926428e00173facd713b4a708a6 Mon Sep 17 00:00:00 2001
From: Dan Illescas <daniel.illescas@hpe.com>
Date: Tue, 14 Oct 2025 17:10:09 -0500
Subject: [PATCH 8/9] packaging: coderabbit fixes

Signed-off-by: Dan Illescas <daniel.illescas@hpe.com>
---
 install.sh | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/install.sh b/install.sh
index 9c82ce5f059..1611900f074 100755
--- a/install.sh
+++ b/install.sh
@@ -53,7 +53,7 @@ ZYPPER_VERSION=''
 if [ -n "${RELEASE_VERSION}" ]; then
     APT_VERSION="=$RELEASE_VERSION"
     YUM_VERSION="-$RELEASE_VERSION"
-    ZYPPER_VERSION="-$RELEASE_VERSION"
+    ZYPPER_VERSION="=$RELEASE_VERSION"
 fi
 
 # Now set up repos and install dependent on OS, version, etc.
@@ -149,7 +149,7 @@ $INSTALL_CMD_PREFIX apt-get -y $APT_PARAMETERS install $INSTALL_PACKAGE_NAME$APT
 SCRIPT
     ;;
     opensuse-leap)
-        # Leap has a VERSION_ID like "15.6"
+        # Leap requires VERSION_ID whereas SLES uses $releasever
         $SUDO sh <<SCRIPT
 rpm --import $RELEASE_KEY
 cat << EOF > /etc/zypp/repos.d/fluent-bit.repo

From 9fc3e1118d945dd764471325cdfea56e8efdd463 Mon Sep 17 00:00:00 2001
From: Dan Illescas <daniel.illescas@hpe.com>
Date: Wed, 15 Oct 2025 16:52:35 -0500
Subject: [PATCH 9/9] packaging: The  variable is a built-in feature of libzypp
 when

Signed-off-by: Dan Illescas <daniel.illescas@hpe.com>
---
 install.sh | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/install.sh b/install.sh
index 1611900f074..2339a56214f 100755
--- a/install.sh
+++ b/install.sh
@@ -149,13 +149,12 @@ $INSTALL_CMD_PREFIX apt-get -y $APT_PARAMETERS install $INSTALL_PACKAGE_NAME$APT
 SCRIPT
     ;;
     opensuse-leap)
-        # Leap requires VERSION_ID whereas SLES uses $releasever
         $SUDO sh <<SCRIPT
 rpm --import $RELEASE_KEY
 cat << EOF > /etc/zypp/repos.d/fluent-bit.repo
 [fluent-bit]
 name = Fluent Bit
-baseurl = $RELEASE_URL/opensuse/leap/$VERSION_ID
+baseurl = $RELEASE_URL/opensuse/leap/\$releaserver
 gpgcheck=1
 repo_gpgcheck=1
 gpgkey=$RELEASE_KEY