Skip to content

packaging: add support for Opensuse Leap 15.6 and SLES 15.7 #10978

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 11 commits into
base: master
Choose a base branch
from
Open

packaging: add support for Opensuse Leap 15.6 and SLES 15.7 #10978

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
11 commits
Select commit Hold shift + click to select a range
da4bd35
packaging: attempt for Opensuse v15.6 and SLES v15.7. opensuse build …
illescad Sep 30, 2025
1116ddf
packaging: add SLES and Opensuse Support
illescad Oct 5, 2025
d5ac934
packaging: Adding test-packages to support zypper and install.sh to s…
illescad Oct 6, 2025
1504726
packaging: fix base_url for suse repository
illescad Oct 6, 2025
3389284
packaging: fix coderabbit suggestions for zypper multiline commands …
illescad Oct 7, 2025
b8d8fb5
packaging: include update-zypper-repo.sh
illescad Oct 8, 2025
04fd8bc
packaging: fix the need of multiple Dockerfiles for opensuse, clean s…
illescad Oct 10, 2025
dad5968
packaging: coderabbit fixes
illescad Oct 14, 2025
9fc3e11
packaging: The variable is a built-in feature of libzypp when
illescad Oct 15, 2025
4c8f2ab
packaging: ignoring lint warnings and removing redundant zypper logs …
illescad Nov 14, 2025
d650dbd
packaging: coderabbit fixes
illescad Nov 14, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
41 changes: 41 additions & 0 deletions install.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 "
Expand Down Expand Up @@ -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.
Expand Down Expand Up @@ -143,6 +146,44 @@ 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-leap)
$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/\$releaserver
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
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
;;
*)
Expand Down
4 changes: 4 additions & 0 deletions packaging/README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 |
Expand Down
16 changes: 16 additions & 0 deletions packaging/build-config.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -96,6 +96,22 @@
"target": "almalinux/10.arm64v8",
"type": "rpm"
},
{
"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"
Expand Down
124 changes: 124 additions & 0 deletions packaging/distros/opensuse/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,124 @@
# 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
# 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
# hadolint ignore=DL3006
FROM opensuse/leap AS opensuse-leap-base
Comment on lines +11 to +13
Copy link

@coderabbitai coderabbitai bot Nov 14, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

⚠️ Potential issue | 🟡 Minor

🧩 Analysis chain

Verify: generic opensuse/leap tag vs versioned opensuse/leap:15.6.

Line 13 uses the unversioned opensuse/leap tag for the generic base stage, while lines 32 and 52 use the pinned opensuse/leap:15.6 tag. The generic tag could drift to newer Leap versions in the future, potentially causing unexpected version mismatches or build failures. Consider pinning this to :15.6 (or the intended minimum version) for consistency and reproducibility, or document that this base stage is intended to track the latest Leap release.

🌐 Web query:

What versions does the opensuse/leap Docker image tag currently resolve to and is it recommended to use pinned version tags?

💡 Result:

Short answer — opensuse/leap image tags are multi‑tagged per Leap release (e.g. leap:15.6, leap:15.5, …) and the “floating” tags (leap:15 and leap:latest) are moved to point at the current Leap release(s). It’s therefore recommended to pin to a specific release tag (e.g. opensuse/leap:15.6) or — for immutability — to a digest (sha256) when reproducibility is required. (en.opensuse.org)

Citations:

Pin generic base stage to specific Leap version for reproducibility.

Line 13 uses the unversioned opensuse/leap tag, which is a floating tag that moves to point at the current Leap release(s). This conflicts with the pinned opensuse/leap:15.6 tags on lines 32 and 52, and could cause unexpected version drift or build inconsistencies. It's recommended to pin to a specific release tag (e.g., opensuse/leap:15.6) for reproducibility. Change line 13 to FROM opensuse/leap:15.6 AS opensuse-leap-base.

🤖 Prompt for AI Agents 
In packaging/distros/opensuse/Dockerfile around lines 11 to 13, the base stage
uses the floating tag "opensuse/leap", causing potential version drift versus
the pinned "opensuse/leap:15.6" used later; update the FROM line to use the
specific release tag (opensuse/leap:15.6) so the generic base stage is pinned
consistently with the other stages for reproducible builds.


# 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 \
Copy link

@coderabbitai coderabbitai bot Nov 14, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

⚠️ Potential issue | 🔴 Critical

🧩 Analysis chain

Verify: libopenssl3 libopenssl-devel combination for openSUSE Leap 15.6.

All three base stages specify libopenssl3 libopenssl-devel (lines 27, 46, 68). The libopenssl3 package is typically the runtime library, while libopenssl-devel provides development headers—this combination appears correct. However, please verify that both package names are available on openSUSE Leap 15.6, particularly since previous reviews flagged incorrect package names in this area.

Also applies to: 46-46, 68-68

🌐 Web query:

openSUSE Leap 15.6 zypper packages libopenssl3 libopenssl-devel availability

💡 Result:

Yes — openSUSE Leap 15.6 provides OpenSSL 3 packages (libopenssl3 and libopenssl-3-devel) in the official repositories. You can install them with zypper, for example:

  • zypper refresh
  • zypper install libopenssl3 libopenssl-3-devel

SUSE security / update listings confirm libopenssl3 and libopenssl-3-devel are packaged for Leap 15.6. [1][2]

Sources:
[1] SUSE update announcement listing libopenssl3 / libopenssl-3-devel for Leap 15.6. [2] SUSE-SU security update listing (Leap 15.6) including libopenssl3 and libopenssl-3-devel.

Update package name to libopenssl-3-devel on lines 27, 46, and 68.

OpenSSL 3 packages for openSUSE Leap 15.6 are available in official repositories as libopenssl3 and libopenssl-3-devel. The Dockerfile currently specifies libopenssl-devel, which appears to be incomplete. Change to libopenssl-3-devel to match the correct official package name.

🤖 Prompt for AI Agents 
In packaging/distros/opensuse/Dockerfile around lines 27, 46 and 68 the OpenSSL
development package is incorrectly listed as libopenssl-devel; update the
package name to libopenssl-3-devel at each occurrence (lines 27, 46, 68) so the
Dockerfile installs the correct OpenSSL 3 development package from the openSUSE
Leap 15.6 repositories.

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=DL3037,DL3029
FROM --platform=arm64 opensuse/leap:15.6 AS opensuse-15.6.arm64v8-base
Copy link

@coderabbitai coderabbitai bot Nov 14, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

⚠️ Potential issue | 🟡 Minor

🧩 Analysis chain

Verify: --platform=arm64 Docker syntax correctness.

Line 52 uses --platform=arm64 in the FROM clause. Verify that this is the correct syntax for your Docker/BuildKit version. Typical platform identifiers in Docker are linux/arm64v8, linux/amd64, etc. Confirm the build succeeds with this syntax, or adjust if needed.

🌐 Web query:

Docker FROM --platform=arm64 correct syntax buildkit

💡 Result:

Short answer — valid Dockerfile syntax (BuildKit / buildx):

  • Hard-coded platform:
    FROM --platform=linux/arm64 node:18-alpine
  • With stage name:
    FROM --platform=linux/arm64 node:18-alpine AS base
  • Use build variables (recommended for multi‑arch builds):
    FROM --platform=${BUILDPLATFORM} golang:alpine AS build

To build multi-arch images, prefer passing --platform to buildx (or docker build) instead of hard-coding a constant in every FROM, e.g.:
docker buildx build --platform linux/amd64,linux/arm64 -t myimage:latest .

References: Docker FROM syntax and guidance, multi-platform build docs, and buildx examples. [1][2][3]

Sources
[1] Docker Docs — Multi-platform builds.
[2] docker/buildx (GitHub) — examples and Dockerfile variables.
[3] FROM instruction reference (syntax: FROM [--platform=] [AS ]).

Correct --platform syntax to use full platform identifier.

Line 52 uses --platform=arm64, but Docker requires full platform identifiers like --platform=linux/arm64. Change to:

FROM --platform=linux/arm64 opensuse/leap:15.6 AS opensuse-15.6.arm64v8-base
🤖 Prompt for AI Agents 
In packaging/distros/opensuse/Dockerfile around line 52, the FROM uses an
incomplete platform identifier (--platform=arm64); update it to the full
platform name required by Docker (e.g., --platform=linux/arm64) so change the
FROM line to use --platform=linux/arm64 and keep the rest of the token
unchanged.


COPY --from=multiarch-aarch64 /usr/bin/qemu-aarch64-static /usr/bin/qemu-aarch64-static

# hadolint ignore=DL3033,DL3037
RUN zypper up -y && \
Copy link
Collaborator

@patrick-stephens patrick-stephens Nov 4, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Let's ignore DL3037 here to suppress the warning

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/*

# 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/" ]
89 changes: 89 additions & 0 deletions packaging/distros/sles/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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

# sles base image
FROM registry.suse.com/bci/bci-base:15.7 AS sles-15.7-base
Copy link
Collaborator

@patrick-stephens patrick-stephens Oct 10, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

What's the main deltas between opensuse and sles? Just want to make sure we capture which one people should use for their targets.

Copy link
Author

@illescad illescad Oct 10, 2025 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Ah i think I caused some confusion, I need to update that comment to say its the SLES base container image not # opensuse/leap base image. But its just building from SLES image vs the community os opensuse, and people would want to target the os they are building for.
@jhansonhpe do you have a better explanation for main deltas?

Copy link
Collaborator

@patrick-stephens patrick-stephens Oct 11, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

When we add the docs page we should be clear on any differences because if it's not important why do we care? :)

Copy link
Collaborator

@patrick-stephens patrick-stephens Nov 4, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Do we need any authentication or suffer from any rate throttling for this registry btw?

Copy link
Author

@illescad illescad Nov 14, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

We are ok here, it's public access and I cant find any documentation for limits on pulling images


# hadolint ignore=DL3037,DL3033
RUN zypper up -y && \
Copy link
Collaborator

@patrick-stephens patrick-stephens Nov 4, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

We seem to be doing both brace expansion and explicit files here to resolve the possible issue with brace expansion - I'd say just remove the brace expansion entirely and keep it simple.

Copy link
Author

@illescad illescad Nov 14, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

ah oops, left that in. pushing out the fixes

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 /var/log/tallylog /var/log/zypper.log /var/log/zypp/history /var/log/YaST2 && \
zypper clean -a

# 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=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 /var/log/tallylog /var/log/zypper.log /var/log/zypp/history /var/log/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/" ]
29 changes: 29 additions & 0 deletions packaging/test-release-packages.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -60,6 +60,12 @@ YUM_TARGETS=(
"amazonlinux:2023"
)

ZYPPER_TARGETS=(
"opensuse/leap:15.6"
"registry.suse.com/bci/bci-base:15.7"
)


for IMAGE in "${YUM_TARGETS[@]}"
do
echo "Testing $IMAGE"
Expand Down Expand Up @@ -113,3 +119,26 @@ 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 --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
11 changes: 10 additions & 1 deletion packaging/update-repos.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,6 +43,8 @@ RPM_REPO_PATHS=( "amazonlinux/2"
"almalinux/8"
"almalinux/9"
"almalinux/10"
"opensuse/leap/15.6"
"sles/15.7"
)

if [[ "${AWS_SYNC:-false}" != "false" ]]; then
Expand All @@ -56,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"
Expand Down
Loading