Skip to content

Commit 7590d18

Browse files
illescadillescad
committed
packaging: target will be opensuse/15.6 but make sure repository is still opensuse/leap/*. no need for build.sh to change if we arent using a for target opensuse/leap:15.6
Signed-off-by: Dan Illescas <[email protected]>
1 parent 1e4ad4d commit 7590d18

File tree

5 files changed

+63
-70
lines changed

5 files changed

+63
-70
lines changed

‎packaging/README.md‎

Lines changed: 50 additions & 50 deletions
Original file line numberDiff line numberDiff line change
@@ -9,56 +9,56 @@ This can take some time to complete so is only triggered via the label on-demand
99

1010
The [`distros`](./distros/) directory contains OCI container definitions used to build [Fluent Bit](http://fluentbit.io) Linux packages for different distros, the following table describe the supported targets:
1111

12-
| Distro | Version / Code Name | Arch | Target Option |
13-
|---------------|---------------------------|---------|----------------------------|
14-
| AlmaLinux | 10 | x86_64 | almalinux/10 |
15-
| AlmaLinux | 10 | arm64v8 | almalinux/10.arm64v8 |
16-
| AlmaLinux | 9 | x86_64 | almalinux/9 |
17-
| AlmaLinux | 9 | arm64v8 | almalinux/9.arm64v8 |
18-
| AlmaLinux | 8 | x86_64 | almalinux/8 |
19-
| AlmaLinux | 8 | arm64v8 | almalinux/8.arm64v8 |
20-
| AmazonLinux | 2023 | x86_64 | amazonlinux/2023 |
21-
| AmazonLinux | 2023 | arm64v8 | amazonlinux/2023.arm64v8 |
22-
| AmazonLinux | 2 | x86_64 | amazonlinux/2 |
23-
| AmazonLinux | 2 | arm64v8 | amazonlinux/2.arm64v8 |
24-
| CentOS Stream | 10 | x86_64 | centos/10 |
25-
| CentOS Stream | 10 | arm64v8 | centos/10.arm64v8 |
26-
| CentOS Stream | 9 | x86_64 | centos/9 |
27-
| CentOS Stream | 9 | arm64v8 | centos/9.arm64v8 |
28-
| CentOS | 8 | x86_64 | centos/8 |
29-
| CentOS | 8 | arm64v8 | centos/8.arm64v8 |
30-
| CentOS | 7 | x86_64 | centos/7 |
31-
| CentOS | 7 | arm64v8 | centos/7.arm64v8 |
32-
| Debian | 13 | x86_64 | debian/trixie |
33-
| Debian | 13 | arm64v8 | debian/trixie.arm64v8 |
34-
| Debian | 12 | x86_64 | debian/bookworm |
35-
| Debian | 12 | arm64v8 | debian/bookworm.arm64v8 |
36-
| Debian | 11 | x86_64 | debian/bullseye |
37-
| Debian | 11 | arm64v8 | debian/bullseye.arm64v8 |
38-
| Debian | 10 | x86_64 | debian/buster |
39-
| Debian | 10 | arm64v8 | debian/buster.arm64v8 |
40-
| openSUSE | 15.6 | x86_64 | opensuse/leap:15.6 |
41-
| openSUSE | 15.6 | arm64v8 | opensuse/leap:15.6.arm64v8 |
42-
| SLES | 15.7 | x86_64 | sles/15.7 |
43-
| SLES | 15.7 | arm64v8 | sles/15.7.arm64v8 |
44-
| Ubuntu | 24.04 / Noble Numbat | x86_64 | ubuntu/24.04 |
45-
| Ubuntu | 24.04 / Noble Numbat | arm64v8 | ubuntu/24.04.arm64v8 |
46-
| Ubuntu | 22.04 / Jammy Jellyfish | x86_64 | ubuntu/22.04 |
47-
| Ubuntu | 22.04 / Jammy Jellyfish | arm64v8 | ubuntu/22.04.arm64v8 |
48-
| Ubuntu | 20.04 / Focal Fossa | x86_64 | ubuntu/20.04 |
49-
| Ubuntu | 20.04 / Focal Fossa | arm64v8 | ubuntu/20.04.arm64v8 |
50-
| Ubuntu | 18.04 / Bionic Beaver | x86_64 | ubuntu/18.04 |
51-
| Ubuntu | 18.04 / Bionic Beaver | arm64v8 | ubuntu/18.04.arm64v8 |
52-
| Ubuntu | 16.04 / Xenial Xerus | x86_64 | ubuntu/16.04 |
53-
| Raspbian | 12 / Bookworm | arm32v7 | raspbian/bookworm |
54-
| Raspbian | 11 / Bullseye | arm32v7 | raspbian/bullseye |
55-
| Raspbian | 10 / Buster | arm32v7 | raspbian/buster |
56-
| Rocky Linux | 10 | x86_64 | rockylinux/10 |
57-
| Rocky Linux | 10 | arm64v8 | rockylinux/10.arm64v8 |
58-
| Rocky Linux | 9 | x86_64 | rockylinux/9 |
59-
| Rocky Linux | 9 | arm64v8 | rockylinux/9.arm64v8 |
60-
| Rocky Linux | 8 | x86_64 | rockylinux/8 |
61-
| Rocky Linux | 8 | arm64v8 | rockylinux/8.arm64v8 |
12+
| Distro | Version / Code Name | Arch | Target Option |
13+
|---------------|---------------------------|---------|--------------------------|
14+
| AlmaLinux | 10 | x86_64 | almalinux/10 |
15+
| AlmaLinux | 10 | arm64v8 | almalinux/10.arm64v8 |
16+
| AlmaLinux | 9 | x86_64 | almalinux/9 |
17+
| AlmaLinux | 9 | arm64v8 | almalinux/9.arm64v8 |
18+
| AlmaLinux | 8 | x86_64 | almalinux/8 |
19+
| AlmaLinux | 8 | arm64v8 | almalinux/8.arm64v8 |
20+
| AmazonLinux | 2023 | x86_64 | amazonlinux/2023 |
21+
| AmazonLinux | 2023 | arm64v8 | amazonlinux/2023.arm64v8 |
22+
| AmazonLinux | 2 | x86_64 | amazonlinux/2 |
23+
| AmazonLinux | 2 | arm64v8 | amazonlinux/2.arm64v8 |
24+
| CentOS Stream | 10 | x86_64 | centos/10 |
25+
| CentOS Stream | 10 | arm64v8 | centos/10.arm64v8 |
26+
| CentOS Stream | 9 | x86_64 | centos/9 |
27+
| CentOS Stream | 9 | arm64v8 | centos/9.arm64v8 |
28+
| CentOS | 8 | x86_64 | centos/8 |
29+
| CentOS | 8 | arm64v8 | centos/8.arm64v8 |
30+
| CentOS | 7 | x86_64 | centos/7 |
31+
| CentOS | 7 | arm64v8 | centos/7.arm64v8 |
32+
| Debian | 13 | x86_64 | debian/trixie |
33+
| Debian | 13 | arm64v8 | debian/trixie.arm64v8 |
34+
| Debian | 12 | x86_64 | debian/bookworm |
35+
| Debian | 12 | arm64v8 | debian/bookworm.arm64v8 |
36+
| Debian | 11 | x86_64 | debian/bullseye |
37+
| Debian | 11 | arm64v8 | debian/bullseye.arm64v8 |
38+
| Debian | 10 | x86_64 | debian/buster |
39+
| Debian | 10 | arm64v8 | debian/buster.arm64v8 |
40+
| openSUSE | 15.6 | x86_64 | opensuse/15.6 |
41+
| openSUSE | 15.6 | arm64v8 | opensuse/15.6.arm64v8 |
42+
| SLES | 15.7 | x86_64 | sles/15.7 |
43+
| SLES | 15.7 | arm64v8 | sles/15.7.arm64v8 |
44+
| Ubuntu | 24.04 / Noble Numbat | x86_64 | ubuntu/24.04 |
45+
| Ubuntu | 24.04 / Noble Numbat | arm64v8 | ubuntu/24.04.arm64v8 |
46+
| Ubuntu | 22.04 / Jammy Jellyfish | x86_64 | ubuntu/22.04 |
47+
| Ubuntu | 22.04 / Jammy Jellyfish | arm64v8 | ubuntu/22.04.arm64v8 |
48+
| Ubuntu | 20.04 / Focal Fossa | x86_64 | ubuntu/20.04 |
49+
| Ubuntu | 20.04 / Focal Fossa | arm64v8 | ubuntu/20.04.arm64v8 |
50+
| Ubuntu | 18.04 / Bionic Beaver | x86_64 | ubuntu/18.04 |
51+
| Ubuntu | 18.04 / Bionic Beaver | arm64v8 | ubuntu/18.04.arm64v8 |
52+
| Ubuntu | 16.04 / Xenial Xerus | x86_64 | ubuntu/16.04 |
53+
| Raspbian | 12 / Bookworm | arm32v7 | raspbian/bookworm |
54+
| Raspbian | 11 / Bullseye | arm32v7 | raspbian/bullseye |
55+
| Raspbian | 10 / Buster | arm32v7 | raspbian/buster |
56+
| Rocky Linux | 10 | x86_64 | rockylinux/10 |
57+
| Rocky Linux | 10 | arm64v8 | rockylinux/10.arm64v8 |
58+
| Rocky Linux | 9 | x86_64 | rockylinux/9 |
59+
| Rocky Linux | 9 | arm64v8 | rockylinux/9.arm64v8 |
60+
| Rocky Linux | 8 | x86_64 | rockylinux/8 |
61+
| Rocky Linux | 8 | arm64v8 | rockylinux/8.arm64v8 |
6262

6363
These container images are intended to be built from the root of this repo to build the locally checked out/updated version of the source easily for any target.
6464

‎packaging/build-config.json‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -97,11 +97,11 @@
9797
"type": "rpm"
9898
},
9999
{
100-
"target": "opensuse/leap:15.6",
100+
"target": "opensuse/15.6",
101101
"type": "rpm"
102102
},
103103
{
104-
"target": "opensuse/leap:15.6.arm64v8",
104+
"target": "opensuse/15.6.arm64v8",
105105
"type": "rpm"
106106
},
107107
{

‎packaging/build.sh‎

Lines changed: 1 addition & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -59,16 +59,7 @@ MAIN_IMAGE="flb-$FLB_DISTRO"
5959
IMAGE_CONTEXT_DIR="$SCRIPT_DIR/distros/$FLB_DISTRO"
6060
if [[ ! -d "$SCRIPT_DIR/distros/$FLB_DISTRO" ]]; then
6161
IMAGE_CONTEXT_DIR="$SCRIPT_DIR/distros/${FLB_DISTRO%%/*}"
62-
63-
# Extract distro and version parts
64-
DISTRO_NAME=${FLB_DISTRO%%/*} # e.g., opensuse
65-
DISTRO_VERSION=${FLB_DISTRO##*/} # e.g., leap:15.6
66-
67-
# Replace invalid characters in the version part for a valid stage name
68-
CLEANED_DISTRO_VERSION=${DISTRO_VERSION/:/-}
69-
70-
# Construct the BASE_BUILDER argument using the cleaned names
71-
FLB_ARG="$FLB_ARG --build-arg BASE_BUILDER=${DISTRO_NAME}-${CLEANED_DISTRO_VERSION}-base --target builder"
62+
FLB_ARG="$FLB_ARG --build-arg BASE_BUILDER=${FLB_DISTRO%%/*}-${FLB_DISTRO##*/}-base --target builder"
7263
fi
7364

7465
if [[ ! -f "$IMAGE_CONTEXT_DIR/Dockerfile" ]]; then

‎packaging/distros/opensuse/Dockerfile‎

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -9,9 +9,10 @@ ARG BASE_BUILDER
99
FROM multiarch/qemu-user-static:x86_64-aarch64 AS multiarch-aarch64
1010

1111
# opensuse/leap base image
12+
# hadolint ignore=DL3006
1213
FROM opensuse/leap AS opensuse-leap-base
1314

14-
# hadolint ignore=DL3033
15+
# hadolint ignore=DL3037,DL3033
1516
RUN zypper up -y && \
1617
zypper install -y --no-recommends \
1718
rpm-build \
@@ -28,9 +29,9 @@ RUN zypper up -y && \
2829
zypper clean -a && rm -rf /var/cache/zypp/*
2930

3031
# opensuse/leap base image
31-
FROM opensuse/leap:15.6 AS opensuse-leap-15.6-base
32+
FROM opensuse/leap:15.6 AS opensuse-15.6-base
3233

33-
# hadolint ignore=DL3033
34+
# hadolint ignore=DL3037,DL3033
3435
RUN zypper up -y && \
3536
zypper install -y --no-recommends \
3637
rpm-build \
@@ -47,8 +48,8 @@ RUN zypper up -y && \
4748
zypper clean -a && rm -rf /var/cache/zypp/*
4849

4950
# opensuse/leap.arm64v8 base image
50-
# hadolint ignore=DL3029
51-
FROM --platform=arm64 opensuse/leap:15.6 AS opensuse-leap-15.6.arm64v8-base
51+
# hadolint ignore=DL3037,DL3029
52+
FROM --platform=arm64 opensuse/leap:15.6 AS opensuse-15.6.arm64v8-base
5253

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

‎packaging/distros/sles/Dockerfile‎

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -8,14 +8,15 @@ FROM multiarch/qemu-user-static:x86_64-aarch64 AS multiarch-aarch64
88
# sles base image
99
FROM registry.suse.com/bci/bci-base:15.7 AS sles-15.7-base
1010

11-
# hadolint ignore=DL3033
11+
# hadolint ignore=DL3037,DL3033
1212
RUN zypper up -y && \
1313
zypper install -y --no-recommends \
1414
rpm-build curl ca-certificates gcc gcc-c++ cmake-full make bash \
1515
wget unzip systemd-devel flex bison \
1616
postgresql-server postgresql-devel cyrus-sasl-devel \
1717
libopenssl-devel libyaml-devel && \
1818
rm -rf /var/log/{lastlog,tallylog,zypper.log,zypp/history,YaST2} && \
19+
rm -rf /var/log/lastlog /var/log/tallylog /var/log/zypper.log /var/log/zypp/history /var/log/YaST2 && \
1920
zypper clean -a
2021

2122
# sles base image is the same name for all architectures
@@ -24,14 +25,14 @@ FROM --platform=arm64 registry.suse.com/bci/bci-base:15.7 AS sles-15.7.arm64v8-b
2425

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

27-
# hadolint ignore=DL3033
28+
# hadolint ignore=DL3037,DL3033
2829
RUN zypper up -y && \
2930
zypper install -y --no-recommends \
3031
rpm-build curl ca-certificates gcc gcc-c++ cmake-full make bash \
3132
wget unzip systemd-devel flex bison \
3233
postgresql-server postgresql-devel cyrus-sasl-devel \
3334
libopenssl-devel libyaml-devel && \
34-
rm -rf /var/log/{lastlog,tallylog,zypper.log,zypp/history,YaST2} && \
35+
rm -rf /var/log/lastlog /var/log/tallylog /var/log/zypper.log /var/log/zypp/history /var/log/YaST2 && \
3536
zypper clean -a
3637

3738
# Need larger page size

0 commit comments

Comments
 (0)