Skip to content

Commit

Permalink
build: add build support for ubuntu 24.04 noble numbat (fluent#8796)
Browse files Browse the repository at this point in the history
Signed-off-by: Markus Bergholz <[email protected]>
  • Loading branch information
markuman committed May 29, 2024
1 parent daf912c commit ba5c28c
Show file tree
Hide file tree
Showing 3 changed files with 35 additions and 0 deletions.
8 changes: 8 additions & 0 deletions packaging/build-config.json
Original file line number Diff line number Diff line change
Expand Up @@ -92,6 +92,14 @@
"target": "ubuntu/22.04.arm64v8",
"type": "deb"
},
{
"target": "ubuntu/24.04",
"type": "deb"
},
{
"target": "ubuntu/24.04.arm64v8",
"type": "deb"
},
{
"target": "raspbian/buster",
"type": "deb"
Expand Down
26 changes: 26 additions & 0 deletions packaging/distros/ubuntu/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -114,6 +114,32 @@ ENV DEBIAN_FRONTEND noninteractive

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

# hadolint ignore=DL3008,DL3015
RUN apt-get update && \
apt-get install -y curl ca-certificates build-essential libsystemd-dev \
cmake make bash wget unzip nano vim valgrind dh-make flex bison \
libpq-dev postgresql-server-dev-all libpq5 \
libsasl2-2 libsasl2-dev openssl libssl-dev libssl3 libyaml-dev pkg-config zlib1g-dev && \
apt-get install -y --reinstall lsb-base lsb-release

# ubuntu/24.04 base image
FROM ubuntu:24.04 as ubuntu-24.04-base
ENV DEBIAN_FRONTEND noninteractive

# hadolint ignore=DL3008,DL3015
RUN apt-get update && \
apt-get install -y curl ca-certificates build-essential libsystemd-dev \
cmake make bash wget unzip nano vim valgrind dh-make flex bison \
libpq-dev postgresql-server-dev-all libpq5 \
libsasl2-2 libsasl2-dev openssl libssl-dev libssl3 libyaml-dev pkg-config zlib1g-dev && \
apt-get install -y --reinstall lsb-base lsb-release

# ubuntu/24.04.arm64v8 base image
FROM arm64v8/ubuntu:24.04 as ubuntu-24.04.arm64v8-base
ENV DEBIAN_FRONTEND noninteractive

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

# hadolint ignore=DL3008,DL3015
RUN apt-get update && \
apt-get install -y curl ca-certificates build-essential libsystemd-dev \
Expand Down
1 change: 1 addition & 0 deletions packaging/update-repos.sh
Original file line number Diff line number Diff line change
Expand Up @@ -54,6 +54,7 @@ DEB_REPO_PATHS=( "debian/bookworm"
"ubuntu/bionic"
"ubuntu/focal"
"ubuntu/jammy"
"ubuntu/noble"
"raspbian/buster"
"raspbian/bullseye" )

Expand Down

0 comments on commit ba5c28c

Please sign in to comment.