diff --git a/22/Dockerfile.rhel8 b/22/Dockerfile.rhel8 index 15d4896e..5c214d01 100644 --- a/22/Dockerfile.rhel8 +++ b/22/Dockerfile.rhel8 @@ -54,10 +54,10 @@ LABEL summary="$SUMMARY" \ usage="s2i build ubi8/$NAME-$NODEJS_VERSION:latest " RUN dnf -y module enable nodejs:$NODEJS_VERSION && \ - MODULE_DEPS="make gcc gcc-c++ libatomic_ops git openssl-devel" && \ + MODULE_DEPS="make gcc-toolset-14-gcc gcc-toolset-14-gcc-c++ gcc-toolset-14-runtime \ + libatomic_ops git openssl-devel python3.12" && \ INSTALL_PKGS="$MODULE_DEPS nodejs npm nodejs-nodemon nss_wrapper-libs which" && \ ln -s /usr/lib/node_modules/nodemon/bin/nodemon.js /usr/bin/nodemon && \ - ln -s /usr/libexec/platform-python /usr/bin/python3 && \ dnf install -y --setopt=tsflags=nodocs $INSTALL_PKGS && \ rpm -V $INSTALL_PKGS && \ node -v | grep -qe "^v$NODEJS_VERSION\." && echo "Found VERSION $NODEJS_VERSION" && \ @@ -76,5 +76,10 @@ RUN chown -R 1001:0 ${APP_ROOT} && chmod -R ug+rwx ${APP_ROOT} && \ USER 1001 +# Enable the SCL for all bash scripts. +ENV BASH_ENV=/opt/rh/gcc-toolset-14/enable \ + ENV=/opt/rh/gcc-toolset-14/enable \ + PROMPT_COMMAND=". /opt/rh/gcc-toolset-14/enable" + # Set the default CMD to print the usage of the language image CMD $STI_SCRIPTS_PATH/usage