Skip to content
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

dbld/packages: Ubuntu 24.10 and Fedora 41 support #332

Merged
merged 4 commits into from
Oct 11, 2024
Merged

dbld/packages: Ubuntu 24.10 and Fedora 41 support #332

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
a6edf1d
dbld: add ubuntu-oracular
MrAnno Oct 11, 2024
25de838
dbld: add fedora-41
MrAnno Oct 11, 2024
84d487e
dbld: fix LegacyKeyValueFormat in Dockerfiles
MrAnno Oct 11, 2024
2881ae0
dbld: remove notzdatalegacy flag from ubuntu-nobel and ubuntu-oracular
MrAnno Oct 11, 2024
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
4 changes: 3 additions & 1 deletion .github/workflows/create-packages.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,12 +21,14 @@ on:
"ubuntu-focal",
"ubuntu-jammy",
"ubuntu-noble",
"ubuntu-oracular",
"ubuntu-lunar",
"ubuntu-mantic",
"almalinux-8",
"almalinux-9",
"fedora-39",
"fedora-40"
"fedora-40",
"fedora-41"
]'


Expand Down
2 changes: 2 additions & 0 deletions .github/workflows/dbld-images.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,13 +35,15 @@ jobs:
- almalinux-8
- fedora-39
- fedora-40
- fedora-41
- debian-bullseye
- debian-bookworm
- debian-sid
- debian-testing
- ubuntu-focal
- ubuntu-jammy
- ubuntu-noble
- ubuntu-oracular
- ubuntu-lunar
- ubuntu-mantic
- devshell
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/packages.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,6 +38,6 @@ jobs:
"almalinux-9",
"debian-bookworm",
"debian-testing",
"fedora-40",
"fedora-41",
"ubuntu-noble"
]'
1 change: 1 addition & 0 deletions .github/workflows/upload-packages.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,7 @@ on:
"ubuntu-focal",
"ubuntu-jammy",
"ubuntu-noble",
"ubuntu-oracular",
"ubuntu-lunar",
"ubuntu-mantic"
]'
Expand Down
1 change: 1 addition & 0 deletions README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -139,6 +139,7 @@ The following x86-64 distros are supported:
| Debian 11 | debian-bullseye |
| Debian Unstable | debian-sid |
| Debian Testing | debian-testing |
| Ubuntu 24.10 | ubuntu-oracular |
| Ubuntu 24.04 | ubuntu-noble |
| Ubuntu 23.10 | ubuntu-mantic |
| Ubuntu 23.04 | ubuntu-lunar |
Expand Down
2 changes: 2 additions & 0 deletions dbld/Makefile.am
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,13 +31,15 @@ EXTRA_DIST += \
dbld/images/devshell.dockerfile \
dbld/images/fedora-39.dockerfile \
dbld/images/fedora-40.dockerfile \
dbld/images/fedora-41.dockerfile \
dbld/images/debian-bullseye.dockerfile \
dbld/images/debian-bookworm.dockerfile \
dbld/images/debian-sid.dockerfile \
dbld/images/debian-testing.dockerfile \
dbld/images/ubuntu-focal.dockerfile \
dbld/images/ubuntu-jammy.dockerfile \
dbld/images/ubuntu-noble.dockerfile \
dbld/images/ubuntu-oracular.dockerfile \
dbld/images/ubuntu-lunar.dockerfile \
dbld/images/ubuntu-mantic.dockerfile \
dbld/images/tarball.dockerfile \
Expand Down
1 change: 1 addition & 0 deletions dbld/build.manifest
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,6 +38,7 @@ debian-sid python3,nojava
ubuntu-focal python3,nocriterion,nomqtt,nogrpc,notzdatalegacy,nobpf
ubuntu-jammy python3,notzdatalegacy,nobpf
ubuntu-noble python3,notzdatalegacy
ubuntu-oracular python3,notzdatalegacy
alltilla marked this conversation as resolved.
Show resolved Hide resolved
ubuntu-lunar python3
ubuntu-mantic python3

Expand Down
27 changes: 27 additions & 0 deletions dbld/images/fedora-41.dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,27 @@
FROM fedora:41
LABEL maintainer="László Várady <[email protected]>, Balazs Scheidler <[email protected]>"
ENV OS_DISTRIBUTION=fedora
ENV OS_DISTRIBUTION_CODE_NAME=41

ARG ARG_IMAGE_PLATFORM
ARG COMMIT
ENV IMAGE_PLATFORM ${ARG_IMAGE_PLATFORM}
LABEL COMMIT=${COMMIT}

COPY images/entrypoint.sh /
COPY . /dbld/

RUN /dbld/builddeps update_packages
RUN /dbld/builddeps workaround_rpm_repos
RUN /dbld/builddeps install_dbld_dependencies
RUN /dbld/builddeps add_copr_repo
RUN /dbld/builddeps install_yum_packages
RUN /dbld/builddeps install_rpm_build_deps

RUN /dbld/builddeps install_criterion
RUN /dbld/builddeps install_gradle

VOLUME /source
VOLUME /build

ENTRYPOINT ["/entrypoint.sh"]
26 changes: 26 additions & 0 deletions dbld/images/ubuntu-oracular.dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,26 @@
FROM ubuntu:oracular
LABEL maintainer="Laszlo Varady <[email protected]>"
ENV OS_DISTRIBUTION=ubuntu
ENV OS_DISTRIBUTION_CODE_NAME=oracular

ARG ARG_IMAGE_PLATFORM
ARG COMMIT
ENV IMAGE_PLATFORM ${ARG_IMAGE_PLATFORM}
LABEL COMMIT=${COMMIT}

ENV DEBIAN_FRONTEND=noninteractive
ENV DEBCONF_NONINTERACTIVE_SEEN=true
ENV LANG C.UTF-8

COPY images/entrypoint.sh /
COPY . /dbld/

RUN /dbld/builddeps update_packages
RUN /dbld/builddeps install_dbld_dependencies
RUN /dbld/builddeps install_apt_packages
RUN /dbld/builddeps install_debian_build_deps

VOLUME /source
VOLUME /build

ENTRYPOINT ["/entrypoint.sh"]
2 changes: 2 additions & 0 deletions dbld/rules
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@ BUILDER_IMAGES= \
almalinux-9 \
fedora-39 \
fedora-40 \
fedora-41 \
debian-stretch \
debian-bullseye \
debian-bookworm \
Expand All @@ -13,6 +14,7 @@ BUILDER_IMAGES= \
ubuntu-focal \
ubuntu-jammy \
ubuntu-noble \
ubuntu-oracular \
ubuntu-lunar \
ubuntu-mantic \
tarball
Expand Down
Loading