From 5100790d827cb746079f2c2f4481baf509c51818 Mon Sep 17 00:00:00 2001 From: TheAssassin Date: Thu, 13 Jul 2023 15:17:33 +0200 Subject: [PATCH] Update to devtoolset-10 --- Dockerfile.centos7-i386 | 4 ++-- Dockerfile.centos7-x86_64 | 2 +- entrypoint-centos.sh | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/Dockerfile.centos7-i386 b/Dockerfile.centos7-i386 index c8bd7a8..5ebcae4 100644 --- a/Dockerfile.centos7-i386 +++ b/Dockerfile.centos7-i386 @@ -8,8 +8,8 @@ ARG VERBOSE=0 # thanks CloudLinux, you're really helping us poor AppImage creators seeking for maximum compatibility by providing devtoolset i386 builds RUN yum install -y yum-utils && \ rpm --import https://repo.cloudlinux.com/cloudlinux/security/RPM-GPG-KEY-CloudLinux && \ - yum-config-manager --add-repo https://www.repo.cloudlinux.com/cloudlinux/7/sclo/devtoolset-9/i386/ && \ - yum install -y devtoolset-9 \ + yum-config-manager --add-repo https://www.repo.cloudlinux.com/cloudlinux/7/sclo/devtoolset-10/i386/ && \ + yum install -y devtoolset-10 \ wget make gnupg zip git subversion glib2-devel automake libtool patch zlib-devel cairo-devel openssl-devel curl-devel \ fuse-devel vim-common zlib-devel desktop-file-utils fuse fuse-libs gtest-devel \ libXft-devel librsvg2-devel curl libffi-devel gettext-devel file python2 bzip2 \ diff --git a/Dockerfile.centos7-x86_64 b/Dockerfile.centos7-x86_64 index 050af71..3221d10 100644 --- a/Dockerfile.centos7-x86_64 +++ b/Dockerfile.centos7-x86_64 @@ -6,7 +6,7 @@ ENV ARCH=x86_64 DIST=centos7 ARG VERBOSE=0 RUN yum install -y centos-release-scl && \ - yum install -y devtoolset-9 \ + yum install -y devtoolset-10 \ wget make gnupg zip git subversion glib2-devel automake libtool patch zlib-devel cairo-devel openssl-devel curl-devel \ fuse-devel vim-common zlib-devel desktop-file-utils fuse fuse-libs gtest-devel \ libXft-devel librsvg2-devel curl libffi-devel gettext-devel file python2 bzip2 \ diff --git a/entrypoint-centos.sh b/entrypoint-centos.sh index f90551d..a1a9c74 100755 --- a/entrypoint-centos.sh +++ b/entrypoint-centos.sh @@ -2,7 +2,7 @@ set -eo pipefail -source /opt/rh/devtoolset-9/enable +source /opt/rh/devtoolset-10/enable export PATH=/deps/bin/:"$PATH" export PKG_CONFIG_PATH=/deps/lib/pkgconfig:"$PKG_CONFIG_PATH"