From c91bd1b9729b98f57ca335fbc82dfdbc1e8bdfd5 Mon Sep 17 00:00:00 2001 From: Moss Cantwell Date: Mon, 5 Aug 2024 16:15:31 +1200 Subject: [PATCH] fix: add python3.11 stop downloading on package builds from mirrors --- images/rpmbuild-almalinux8/Dockerfile | 3 ++- images/rpmbuild-centos-stream9/Dockerfile | 10 ++++++++-- 2 files changed, 10 insertions(+), 3 deletions(-) diff --git a/images/rpmbuild-almalinux8/Dockerfile b/images/rpmbuild-almalinux8/Dockerfile index da54d35..c3f2140 100644 --- a/images/rpmbuild-almalinux8/Dockerfile +++ b/images/rpmbuild-almalinux8/Dockerfile @@ -12,7 +12,8 @@ RUN dnf update -y && \ kernel-devel libdbi libdbi-devel libgfortran libxml2 \ libxml2-devel make ncurses ncurses-devel nodejs npm octave \ openssl pango pango-devel perl-devel python3.11 qt5-qtwebengine \ - rpm-build rpmdevtools rpm-sign rpmlint shadow-utils systemd unzip + rpm-build rpmdevtools rpm-sign rpmlint shadow-utils systemd unzip \ + python3.11-devel python3.11 RUN curl "https://awscli.amazonaws.com/awscli-exe-linux-x86_64.zip" -o "awscliv2.zip" && unzip awscliv2.zip RUN ./aws/install diff --git a/images/rpmbuild-centos-stream9/Dockerfile b/images/rpmbuild-centos-stream9/Dockerfile index b759aad..e6ab3ee 100644 --- a/images/rpmbuild-centos-stream9/Dockerfile +++ b/images/rpmbuild-centos-stream9/Dockerfile @@ -4,8 +4,14 @@ FROM ghcr.io/geonet/base-images/centos:stream9 RUN dnf module enable -y nodejs:20 && \ dnf update -y && \ dnf install -y \ - rpm-build rpmdevtools rpm-sign rpmlint git dnf-plugins-core nodejs npm make automake gcc \ - gcc-c++ kernel-devel python3 glibc systemd openssl fontconfig-devel freetype freetype-devel boost unzip + boost automake boost-filesystem boost-iostreams \ + boost-program-options boost-regex boost-system \ + boost-thread cairo cairo-devel dnf-plugins-core fontconfig \ + fontconfig-devel freetype freetype-devel gcc gcc-c++ git glibc \ + kernel-devel libgfortran libxml2 libxml2-devel make ncurses \ + ncurses-devel nodejs npm python3.11-devel python3.11 \ + openssl pango pango-devel perl-devel python3.11 qt5-qtbase \ + rpm-build rpmdevtools rpm-sign rpmlint shadow-utils systemd unzip RUN curl "https://awscli.amazonaws.com/awscli-exe-linux-x86_64.zip" -o "awscliv2.zip" RUN unzip awscliv2.zip