diff --git a/docker/rocky8/Dockerfile b/docker/rocky8/Dockerfile index 48b59468..0a05901a 100644 --- a/docker/rocky8/Dockerfile +++ b/docker/rocky8/Dockerfile @@ -2,7 +2,7 @@ FROM nvidia/cuda:12.9.1-devel-rockylinux8 LABEL authors="leonarski_f" ARG OPENSSL_VERSION=3.5.4 -ARG QT_VERSION=6.10.0 +ARG QT_VERSION=6.9.0 ARG NODE_MAJOR=22 ARG EIGEN_TAG=3.4.0 @@ -33,6 +33,7 @@ RUN dnf -y update && \ ninja-build \ libxcb-devel \ xcb-util-*-devel \ + xcb-util-devel \ libxkbcommon-devel \ libxkbcommon-x11-devel \ libX11-devel \ @@ -63,12 +64,9 @@ RUN dnf -y update && \ twine \ openblas \ openblas-devel \ - assimp-devel \ - mesa-dri-drivers \ libdrm-devel \ libglvnd-core-devel \ libglvnd-devel \ - libX11-xcb-devel \ freetype-devel && \ dnf clean all && rm -rf /var/cache/dnf @@ -109,7 +107,7 @@ ENV CXX=${GCC_TOOLSET_ROOT}/usr/bin/g++ ARG QT_PREFIX=/opt/qt-${QT_VERSION}-static RUN set -eux; \ cd /tmp; \ - curl -LO https://download.qt.io/official_releases/qt/6.10/${QT_VERSION}/single/qt-everywhere-src-${QT_VERSION}.tar.xz; \ + curl -LO https://download.qt.io/official_releases/qt/6.9/${QT_VERSION}/single/qt-everywhere-src-${QT_VERSION}.tar.xz; \ tar -xf qt-everywhere-src-${QT_VERSION}.tar.xz; \ mkdir -p qt-everywhere-src-${QT_VERSION}/build && cd qt-everywhere-src-${QT_VERSION}/build; \ cmake -G Ninja \ @@ -119,11 +117,11 @@ RUN set -eux; \ -DQT_BUILD_EXAMPLES=OFF \ -DQT_FEATURE_dbus=ON \ -DQT_FEATURE_xcb=ON \ - -DQT_FEATURE_xcb_xlib=ON \ + -DQT_FEATURE_xcb_xlib=OFF \ -DQT_FEATURE_xkbcommon_x11=ON \ -DQT_FEATURE_opengl=ON \ -DQT_FEATURE_opengl_desktop=ON \ - -DQT_FEATURE_opengl_dynamic=ON \ + -DQT_FEATURE_opengl_dynamic=OFF \ -DQT_FEATURE_vulkan=OFF \ -DCMAKE_BUILD_TYPE=Release \ -DCMAKE_INSTALL_PREFIX=${QT_PREFIX} \ diff --git a/docker/rocky9/Dockerfile b/docker/rocky9/Dockerfile index 0890d2da..78fc11b9 100644 --- a/docker/rocky9/Dockerfile +++ b/docker/rocky9/Dockerfile @@ -2,7 +2,7 @@ FROM nvidia/cuda:13.0.1-devel-rockylinux9 LABEL authors="leonarski_f" ARG OPENSSL_VERSION=3.5.4 -ARG QT_VERSION=6.10.0 +ARG QT_VERSION=6.9.0 ARG NODE_MAJOR=22 ARG EIGEN_TAG=3.4.0 @@ -58,9 +58,10 @@ RUN dnf -y update && \ fontconfig-devel \ openblas-devel \ openblas-serial \ - assimp-devel \ mesa-dri-drivers \ libdrm-devel \ + libglvnd-core-devel \ + libglvnd-devel \ freetype-devel && \ dnf clean all && rm -rf /var/cache/dnf @@ -104,14 +105,12 @@ RUN set -eux; \ -DQT_BUILD_EXAMPLES=OFF \ -DQT_FEATURE_dbus=ON \ -DQT_FEATURE_xcb=ON \ - -DQT_FEATURE_xcb_xlib=ON \ + -DQT_FEATURE_xcb_xlib=OFF \ -DQT_FEATURE_xkbcommon_x11=ON \ -DQT_FEATURE_opengl=ON \ -DQT_FEATURE_opengl_desktop=ON \ - -DQT_FEATURE_opengl_dynamic=ON \ + -DQT_FEATURE_opengl_dynamic=OFF \ -DQT_FEATURE_vulkan=OFF \ - -DOPENGL_opengl_LIBRARY=/usr/lib64/libGL.so \ - -DOPENGL_glx_LIBRARY=/usr/lib64/libGLX.so \ -DCMAKE_BUILD_TYPE=Release \ -DCMAKE_INSTALL_PREFIX=${QT_PREFIX} \ -DCMAKE_C_COMPILER=${CC} \