From 731b11dcc4ffe0c1e6eb166e321e07b3a6b4efc5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?R=C3=A9mi=20Verschelde?= Date: Tue, 10 May 2022 13:16:44 +0200 Subject: [PATCH] Update podman builders to recent versions Fedora 36 for the Windows builder, and keeping CentOS 7 but applying updates for the Linux one (needed to get newer ca-certificates). --- Dockerfile.linux-builder | 3 ++- Dockerfile.windows-builder | 2 +- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/Dockerfile.linux-builder b/Dockerfile.linux-builder index fecf4d1ede..2ba2987070 100644 --- a/Dockerfile.linux-builder +++ b/Dockerfile.linux-builder @@ -1,6 +1,7 @@ FROM centos:7 -RUN yum -y install yum install centos-release-scl && \ +RUN yum -y update && \ + yum -y install centos-release-scl && \ yum -y install devtoolset-9 && \ yum -y install make ncurses-devel which unzip perl cpio rsync fileutils bc bzip2 gzip sed git python file patch wget perl-Thread-Queue perl-Data-Dumper perl-ExtUtils-MakeMaker && \ yum clean all diff --git a/Dockerfile.windows-builder b/Dockerfile.windows-builder index 50aa4fd5d6..3e647176d4 100644 --- a/Dockerfile.windows-builder +++ b/Dockerfile.windows-builder @@ -1,4 +1,4 @@ -FROM fedora:33 +FROM fedora:36 RUN dnf -y install mingw32-nsis xz bzip2 zip diffutils texinfo gcc gcc-c++ make mingw64-winpthreads mingw64-winpthreads-static mingw64-gcc mingw64-gcc-c++ curl && \ dnf clean all