Skip to content

Commit

Permalink
dbld: support fedora-40
Browse files Browse the repository at this point in the history
Signed-off-by: László Várady <[email protected]>
Signed-off-by: Balazs Scheidler <[email protected]>
  • Loading branch information
MrAnno committed May 25, 2024
1 parent 23a22df commit 25370fb
Show file tree
Hide file tree
Showing 6 changed files with 32 additions and 2 deletions.
3 changes: 2 additions & 1 deletion .github/workflows/create-packages.yml
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,8 @@ on:
"ubuntu-lunar",
"ubuntu-mantic",
"almalinux-8",
"fedora-39"
"fedora-39",
"fedora-40"
]'


Expand Down
1 change: 1 addition & 0 deletions .github/workflows/dbld-images.yml
Original file line number Diff line number Diff line change
Expand Up @@ -31,6 +31,7 @@ jobs:
image:
- almalinux-8
- fedora-39
- fedora-40
- debian-bullseye
- debian-bookworm
- debian-sid
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/packages.yml
Original file line number Diff line number Diff line change
Expand Up @@ -37,6 +37,6 @@ jobs:
"almalinux-8",
"debian-bookworm",
"debian-testing",
"fedora-39",
"fedora-40",
"ubuntu-noble"
]'
1 change: 1 addition & 0 deletions dbld/Makefile.am
Original file line number Diff line number Diff line change
Expand Up @@ -29,6 +29,7 @@ EXTRA_DIST += \
dbld/images/almalinux-8.dockerfile \
dbld/images/devshell.dockerfile \
dbld/images/fedora-39.dockerfile \
dbld/images/fedora-40.dockerfile \
dbld/images/debian-bullseye.dockerfile \
dbld/images/debian-bookworm.dockerfile \
dbld/images/debian-sid.dockerfile \
Expand Down
26 changes: 26 additions & 0 deletions dbld/images/fedora-40.dockerfile
Original file line number Diff line number Diff line change
@@ -0,0 +1,26 @@
FROM fedora:40
LABEL maintainer="László Várady <[email protected]>, Balazs Scheidler <[email protected]>"
ENV OS_DISTRIBUTION=fedora
ENV OS_DISTRIBUTION_CODE_NAME=40

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

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

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"]
1 change: 1 addition & 0 deletions dbld/rules
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@
BUILDER_IMAGES= \
almalinux-8 \
fedora-39 \
fedora-40 \
debian-stretch \
debian-bullseye \
debian-bookworm \
Expand Down

0 comments on commit 25370fb

Please sign in to comment.