Skip to content

Commit

Permalink
FC41 added
Browse files Browse the repository at this point in the history
  • Loading branch information
alkk committed Nov 26, 2024
1 parent 074e605 commit f99e26f
Show file tree
Hide file tree
Showing 4 changed files with 6 additions and 6 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/package.yml
Original file line number Diff line number Diff line change
Expand Up @@ -27,5 +27,5 @@ jobs:
platforms: linux/amd64,linux/arm64
push: true
tags: |
ghcr.io/${{ github.repository_owner }}/builder-rpm:1.8
ghcr.io/${{ github.repository_owner }}/builder-rpm:1.9
ghcr.io/${{ github.repository_owner }}/builder-rpm:latest
4 changes: 2 additions & 2 deletions Dockerfile
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM fedora:40
FROM fedora:41

#RUN dnf -y install epel-release dnf-plugins-core
RUN dnf install -y mock #nosync
Expand All @@ -8,7 +8,7 @@ VOLUME /build
VOLUME /result

COPY files/ /
ADD 3rdparty/apache-maven-3.9.8-bin.tar.gz /
ADD 3rdparty/apache-maven-3.9.9-bin.tar.gz /

WORKDIR /build

Expand Down
2 changes: 1 addition & 1 deletion files/build.sh
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@ for V in 8 9; do
|| dump_logs_and_exit
done

for V in 39 40; do
for V in 39 40 41; do
mock --enable-network -r fedora-$V-$(arch) --spec SPECS/*.spec --sources SOURCES \
--addrepo https://packages.netxms.org/devel/fedora/$V/$(arch)/stable \
--addrepo https://packages.netxms.org/fedora/$V/$(arch)/stable \
Expand Down
4 changes: 2 additions & 2 deletions files/etc/mock/site-defaults.cfg
Original file line number Diff line number Diff line change
Expand Up @@ -7,8 +7,8 @@ config_opts['plugin_conf']['tmpfs_opts']['keep_mounted'] = False

config_opts['plugin_conf']['bind_mount_enable'] = True
config_opts['plugin_conf']['bind_mount_opts']['dirs'].append(('/var/cache/mock/m2-repo', '/m2-repo' ))
config_opts['plugin_conf']['bind_mount_opts']['dirs'].append(('/apache-maven-3.9.8', '/apache-maven-3.9.8'))
config_opts['plugin_conf']['bind_mount_opts']['dirs'].append(('/apache-maven-3.9.9', '/apache-maven-3.9.9'))

config_opts['environment']['PATH']= '/apache-maven-3.9.8/bin:/usr/sbin:/usr/bin:/sbin:/bin'
config_opts['environment']['PATH']= '/apache-maven-3.9.9/bin:/usr/sbin:/usr/bin:/sbin:/bin'

#config_opts['nosync'] = True

0 comments on commit f99e26f

Please sign in to comment.