From b3f2dd1196dbd87f4ec07283b317b48e2d6fa4b5 Mon Sep 17 00:00:00 2001 From: El Date: Thu, 20 Mar 2025 18:46:33 +0500 Subject: [PATCH] KASM-6788 Update Dockerfiles to use GCC Toolset 14 and add libSM-devel --- builder/dockerfile.opensuse_15.build | 2 +- builder/dockerfile.oracle_8.build | 6 +++++- builder/dockerfile.oracle_9.build | 6 +++++- 3 files changed, 11 insertions(+), 3 deletions(-) diff --git a/builder/dockerfile.opensuse_15.build b/builder/dockerfile.opensuse_15.build index 3d4cfe3..2a4b5ec 100644 --- a/builder/dockerfile.opensuse_15.build +++ b/builder/dockerfile.opensuse_15.build @@ -13,7 +13,7 @@ RUN zypper install -ny \ ffmpeg-4-libavcodec-devel \ fonttosfnt \ font-util \ - gcc \ + gcc14 \ gcc14-c++ \ giflib-devel \ git \ diff --git a/builder/dockerfile.oracle_8.build b/builder/dockerfile.oracle_8.build index 4a98a19..4aa7e5b 100644 --- a/builder/dockerfile.oracle_8.build +++ b/builder/dockerfile.oracle_8.build @@ -15,6 +15,7 @@ RUN \ dnf-plugins-core \ gcc \ gcc-c++ \ + gcc-toolset-14 \ git \ gnutls-devel \ libjpeg-turbo-devel \ @@ -48,7 +49,10 @@ RUN dnf install -y \ xorg-x11-xtrans-devel \ libXrandr-devel \ libXtst-devel \ - libXcursor-devel + libXcursor-devel \ + libSM-devel + +RUN scl enable gcc-toolset-14 bash ENV SCRIPTS_DIR=/tmp/scripts COPY builder/scripts $SCRIPTS_DIR diff --git a/builder/dockerfile.oracle_9.build b/builder/dockerfile.oracle_9.build index ca94b69..41f5830 100644 --- a/builder/dockerfile.oracle_9.build +++ b/builder/dockerfile.oracle_9.build @@ -15,6 +15,7 @@ RUN \ dnf-plugins-core \ gcc \ gcc-c++ \ + gcc-toolset-14 \ git \ gnutls-devel \ libjpeg-turbo-devel \ @@ -47,7 +48,10 @@ RUN dnf install -y \ xorg-x11-xtrans-devel \ libXrandr-devel \ libXtst-devel \ - libXcursor-devel + libXcursor-devel \ + libSM-devel + +RUN scl enable gcc-toolset-14 bash ENV SCRIPTS_DIR=/tmp/scripts