diff --git a/.github/workflows/package.yml b/.github/workflows/package.yml index 27aa29f..04d4cbe 100644 --- a/.github/workflows/package.yml +++ b/.github/workflows/package.yml @@ -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 diff --git a/Dockerfile b/Dockerfile index b8c6b01..8133d1f 100644 --- a/Dockerfile +++ b/Dockerfile @@ -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 @@ -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 diff --git a/files/build.sh b/files/build.sh index cfc11da..7bfbe33 100755 --- a/files/build.sh +++ b/files/build.sh @@ -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 \ diff --git a/files/etc/mock/site-defaults.cfg b/files/etc/mock/site-defaults.cfg index 2f1ad08..f282e06 100644 --- a/files/etc/mock/site-defaults.cfg +++ b/files/etc/mock/site-defaults.cfg @@ -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