From 4284f8f8a6937b6813c5920a7cf22e0e28f4a4fe Mon Sep 17 00:00:00 2001
From: El <eldargafiyatov@gmail.com>
Date: Sun, 23 Mar 2025 16:37:28 +0500
Subject: [PATCH] KASM-6788 Refactor Dockerfile to streamline build process

---
 builder/dockerfile.oracle_8.build | 12 +++++-------
 1 file changed, 5 insertions(+), 7 deletions(-)

diff --git a/builder/dockerfile.oracle_8.build b/builder/dockerfile.oracle_8.build
index 4aa7e5b..f28c1df 100644
--- a/builder/dockerfile.oracle_8.build
+++ b/builder/dockerfile.oracle_8.build
@@ -39,6 +39,7 @@ RUN dnf install -y --nogpgcheck https://mirrors.rpmfusion.org/free/el/rpmfusion-
 
 # Install from new repos
 RUN dnf install -y \
+  tbb-devel \
   ffmpeg-devel \
   giflib-devel \
   lbzip2 \
@@ -52,16 +53,13 @@ RUN dnf install -y \
   libXcursor-devel \
   libSM-devel
 
-RUN scl enable gcc-toolset-14 bash
-
 ENV SCRIPTS_DIR=/tmp/scripts
 COPY builder/scripts $SCRIPTS_DIR
-RUN $SCRIPTS_DIR/build-webp
-RUN $SCRIPTS_DIR/build-libjpeg-turbo
-
-RUN useradd -m docker && echo "docker:docker" | chpasswd
+RUN echo "source /opt/rh/gcc-toolset-14/enable" > /etc/profile.d/gcc-toolset.sh && \
+  $SCRIPTS_DIR/build-webp && $SCRIPTS_DIR/build-libjpeg-turbo && \
+  useradd -m docker && echo "docker:docker" | chpasswd
 
 COPY --chown=docker:docker . /src/
 
 USER docker
-ENTRYPOINT ["/src/builder/build.sh"]
+ENTRYPOINT ["bash", "-l", "-c", "/src/builder/build.sh"]