Skip to content

Commit 3c86ca8

Browse files
aminvakilaminvakil
committed
build: remove buster, replace with bullseye when necessary
Signed-off-by: Amin Vakil <info@aminvakil.com>
1 parent fb653d4 commit 3c86ca8

File tree

13 files changed

+18
-90
lines changed

13 files changed

+18
-90
lines changed

‎.github/actions/generate-package-build-matrix/action.yaml‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -67,18 +67,18 @@ runs:
6767
echo '{ "distro" : ['
6868
echo '"amazonlinux/2", "amazonlinux/2.arm64v8",'
6969
echo '"centos/7", "centos/7.arm64v8", "centos/8", "centos/8.arm64v8",'
70-
echo '"debian/buster", "debian/buster.arm64v8", "debian/bullseye", "debian/bullseye.arm64v8",'
70+
echo '"debian/bullseye", "debian/bullseye.arm64v8",'
7171
echo '"ubuntu/16.04", "ubuntu/18.04", "ubuntu/20.04", "ubuntu/22.04",'
7272
echo '"ubuntu/18.04.arm64v8", "ubuntu/20.04.arm64v8", "ubuntu/22.04.arm64v8",'
73-
echo '"raspbian/buster", "raspbian/bullseye"'
73+
echo '"raspbian/bullseye"'
7474
echo ']}'
7575
) | jq -c .)
7676
echo "MATRIX=$matrix" >> $GITHUB_ENV
7777
debmatrix=$((
7878
echo '{ "distro" : ['
79-
echo '"debian/buster", "debian/bullseye",'
79+
echo '"debian/bullseye",'
8080
echo '"ubuntu/16.04", "ubuntu/18.04", "ubuntu/20.04", "ubuntu/22.04",'
81-
echo '"raspbian/buster", "raspbian/bullseye"'
81+
echo '"raspbian/bullseye"'
8282
echo ']}'
8383
) | jq -c .)
8484
echo "DEB_MATRIX=$debmatrix" >> $GITHUB_ENV

‎lib/cfl/.github/workflows/build.yaml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -100,9 +100,9 @@ jobs:
100100
working-directory: cfl
101101

102102
build-debian:
103-
name: Debian Buster build to confirm no issues once used downstream
103+
name: Debian Bullseye build to confirm no issues once used downstream
104104
runs-on: ubuntu-latest
105-
container: debian:buster
105+
container: debian:bullseye
106106
steps:
107107
- name: Set up base image dependencies
108108
run: |

‎lib/cmetrics/.github/workflows/build.yaml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -84,9 +84,9 @@ jobs:
8484
working-directory: cmetrics
8585

8686
build-debian:
87-
name: Debian Buster build to confirm no issues once used downstream
87+
name: Debian Bullseye build to confirm no issues once used downstream
8888
runs-on: ubuntu-latest
89-
container: debian:buster
89+
container: debian:bullseye
9090
steps:
9191
- name: Set up base image dependencies
9292
run: |

‎lib/cprofiles/.github/workflows/build.yaml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -75,9 +75,9 @@ jobs:
7575
working-directory: cprofiles/build
7676

7777
build-debian:
78-
name: Debian Buster build to confirm no issues once used downstream
78+
name: Debian Bullseye build to confirm no issues once used downstream
7979
runs-on: ubuntu-latest
80-
container: debian:buster
80+
container: debian:bullseye
8181
steps:
8282
- name: Set up base image dependencies
8383
run: |

‎lib/ctraces/.github/workflows/build.yaml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -79,9 +79,9 @@ jobs:
7979
working-directory: ctraces
8080

8181
build-debian:
82-
name: Debian Buster build to confirm no issues once used downstream
82+
name: Debian Bullseye build to confirm no issues once used downstream
8383
runs-on: ubuntu-latest
84-
container: debian:buster
84+
container: debian:bullseye
8585
steps:
8686
- name: Set up base image dependencies
8787
run: |

‎packaging/README.md‎

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -35,8 +35,6 @@ The [`distros`](./distros/) directory contains OCI container definitions used to
3535
| Debian | 12 | arm64v8 | debian/bookworm.arm64v8 |
3636
| Debian | 11 | x86_64 | debian/bullseye |
3737
| Debian | 11 | arm64v8 | debian/bullseye.arm64v8 |
38-
| Debian | 10 | x86_64 | debian/buster |
39-
| Debian | 10 | arm64v8 | debian/buster.arm64v8 |
4038
| Ubuntu | 24.04 / Noble Numbat | x86_64 | ubuntu/24.04 |
4139
| Ubuntu | 24.04 / Noble Numbat | arm64v8 | ubuntu/24.04.arm64v8 |
4240
| Ubuntu | 22.04 / Jammy Jellyfish | x86_64 | ubuntu/22.04 |
@@ -48,7 +46,6 @@ The [`distros`](./distros/) directory contains OCI container definitions used to
4846
| Ubuntu | 16.04 / Xenial Xerus | x86_64 | ubuntu/16.04 |
4947
| Raspbian | 12 / Bookworm | arm32v7 | raspbian/bookworm |
5048
| Raspbian | 11 / Bullseye | arm32v7 | raspbian/bullseye |
51-
| Raspbian | 10 / Buster | arm32v7 | raspbian/buster |
5249
| Rocky Linux | 10 | x86_64 | rockylinux/10 |
5350
| Rocky Linux | 10 | arm64v8 | rockylinux/10.arm64v8 |
5451
| Rocky Linux | 9 | x86_64 | rockylinux/9 |

‎packaging/build-config.json‎

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -104,14 +104,6 @@
104104
"target": "debian/bookworm.arm64v8",
105105
"type": "deb"
106106
},
107-
{
108-
"target": "debian/buster",
109-
"type": "deb"
110-
},
111-
{
112-
"target": "debian/buster.arm64v8",
113-
"type": "deb"
114-
},
115107
{
116108
"target": "debian/bullseye",
117109
"type": "deb"

‎packaging/distros/debian/Dockerfile‎

Lines changed: 0 additions & 60 deletions
Original file line numberDiff line numberDiff line change
@@ -9,66 +9,6 @@ ARG BASE_BUILDER
99
# Multiarch support
1010
FROM multiarch/qemu-user-static:x86_64-aarch64 AS multiarch-aarch64
1111

12-
# debian/buster base image
13-
FROM debian:buster-slim AS debian-buster-base
14-
ENV DEBIAN_FRONTEND="noninteractive" \
15-
CMAKE_HOME="/opt/cmake"
16-
17-
ARG CMAKE_VERSION="3.31.6"
18-
ARG CMAKE_URL="https://github.com/Kitware/CMake/releases/download"
19-
20-
# Patch to archive.debian.org
21-
# https://lists.debian.org/debian-devel-announce/2025/06/msg00001.html
22-
RUN sed -i s/deb.debian.org/archive.debian.org/g /etc/apt/sources.list && \
23-
sed -i s/security.debian.org/archive.debian.org/g /etc/apt/sources.list
24-
25-
# hadolint ignore=DL3008,DL3015
26-
RUN apt-get -qq update && \
27-
apt-get install -y curl ca-certificates build-essential \
28-
make bash sudo wget unzip dh-make \
29-
libsystemd-dev zlib1g-dev flex bison \
30-
libssl1.1 libssl-dev libpq-dev postgresql-server-dev-all \
31-
libsasl2-2 libsasl2-dev libyaml-dev libcurl4-openssl-dev pkg-config \
32-
tar gzip && \
33-
apt-get install -y --reinstall lsb-base lsb-release && \
34-
mkdir -p "${CMAKE_HOME}" && \
35-
cmake_download_url="${CMAKE_URL}/v${CMAKE_VERSION}/cmake-${CMAKE_VERSION}-linux-$(uname -m).tar.gz" && \
36-
echo "Downloading CMake ${CMAKE_VERSION}: ${cmake_download_url} -> ${CMAKE_HOME}" && \
37-
curl -jksSL "${cmake_download_url}" | tar -xzf - -C "${CMAKE_HOME}" --strip-components 1
38-
39-
ENV PATH="${CMAKE_HOME}/bin:${PATH}"
40-
41-
# debian/buster.arm64v8 base image
42-
FROM arm64v8/debian:buster-slim AS debian-buster.arm64v8-base
43-
ENV DEBIAN_FRONTEND="noninteractive" \
44-
CMAKE_HOME="/opt/cmake"
45-
46-
COPY --from=multiarch-aarch64 /usr/bin/qemu-aarch64-static /usr/bin/qemu-aarch64-static
47-
48-
ARG CMAKE_VERSION="3.31.6"
49-
ARG CMAKE_URL="https://github.com/Kitware/CMake/releases/download"
50-
51-
# Patch to archive.debian.org
52-
# https://lists.debian.org/debian-devel-announce/2025/06/msg00001.html
53-
RUN sed -i s/deb.debian.org/archive.debian.org/g /etc/apt/sources.list && \
54-
sed -i s/security.debian.org/archive.debian.org/g /etc/apt/sources.list
55-
56-
# hadolint ignore=DL3008,DL3015
57-
RUN apt-get -qq update && \
58-
apt-get install -y curl ca-certificates build-essential \
59-
make bash sudo wget unzip dh-make \
60-
libsystemd-dev zlib1g-dev flex bison \
61-
libssl1.1 libssl-dev libpq-dev postgresql-server-dev-all \
62-
libsasl2-2 libsasl2-dev libyaml-dev libcurl4-openssl-dev pkg-config \
63-
tar gzip && \
64-
apt-get install -y --reinstall lsb-base lsb-release && \
65-
mkdir -p "${CMAKE_HOME}" && \
66-
cmake_download_url="${CMAKE_URL}/v${CMAKE_VERSION}/cmake-${CMAKE_VERSION}-linux-$(uname -m).tar.gz" && \
67-
echo "Downloading CMake ${CMAKE_VERSION}: ${cmake_download_url} -> ${CMAKE_HOME}" && \
68-
curl -jksSL "${cmake_download_url}" | tar -xzf - -C "${CMAKE_HOME}" --strip-components 1
69-
70-
ENV PATH="${CMAKE_HOME}/bin:${PATH}"
71-
7212
# debian/bullseye base image
7313
FROM debian:bullseye-slim AS debian-bullseye-base
7414
ENV DEBIAN_FRONTEND="noninteractive" \

‎packaging/distros/raspbian/Dockerfile‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ ARG BASE_BUILDER
66
# Lookup the name to use below but should follow the '<distro>-base' convention with slashes replaced.
77
# Use buildkit to skip unused base images: DOCKER_BUILDKIT=1
88

9-
FROM balenalib/rpi-raspbian:buster AS raspbian-buster-base
9+
FROM balenalib/rpi-raspbian:bullseye AS raspbian-bullseye-base
1010
ENV DEBIAN_FRONTEND noninteractive
1111

1212
# Builder image so dependencies can be latest, recommended and no need to wipe

‎packaging/testing/smoke/packages/Dockerfile.debian10‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
11
# For staging upgrade we use the 'official-install' as the base
2-
ARG STAGING_BASE=docker.io/dokken/debian-10
2+
ARG STAGING_BASE=docker.io/dokken/debian-11
33

44
ARG RELEASE_URL=https://packages.fluentbit.io
55
ARG RELEASE_KEY=https://packages.fluentbit.io/fluentbit.key
66

77
# hadolint ignore=DL3006
8-
FROM docker.io/dokken/debian-10 as official-install
8+
FROM docker.io/dokken/debian-11 as official-install
99

1010
ARG RELEASE_URL
1111
ENV FLUENT_BIT_PACKAGES_URL=${RELEASE_URL}
@@ -37,7 +37,7 @@ ENV FLUENT_BIT_PACKAGES_KEY=${STAGING_KEY}
3737

3838
SHELL ["/bin/bash", "-o", "pipefail", "-c"]
3939
RUN wget -qO - $FLUENT_BIT_PACKAGES_KEY | apt-key add -
40-
RUN echo "deb $FLUENT_BIT_PACKAGES_URL/debian/buster buster main" >> /etc/apt/sources.list
40+
RUN echo "deb $FLUENT_BIT_PACKAGES_URL/debian/bullseye bullseye main" >> /etc/apt/sources.list
4141
# hadolint ignore=DL3015,DL3008,DL3009
4242
RUN apt-get update && apt-get install -y fluent-bit
4343
RUN systemctl enable fluent-bit

0 commit comments

Comments
 (0)