diff --git a/Dockerfile.base b/Dockerfile.base index 9bf0ee8..4dd56b5 100644 --- a/Dockerfile.base +++ b/Dockerfile.base @@ -16,7 +16,7 @@ ENV CI_DOCKER_VERSION=$CI_DOCKER_VERSION ENV LANG=en_US.UTF-8 ENV LANGUAGE=en_US:en ENV LC_ALL=en_US.UTF-8 -ENV QT_PLUGIN_PATH=/usr/local/Qt-6.7.2/plugins +ENV QT_PLUGIN_PATH=/usr/local/Qt-6.10.0/plugins # Install apt sources RUN if [ "${BASE_IMAGE_VERSION}" = "12-slim" ]; then \ @@ -29,6 +29,7 @@ RUN if [ "${BASE_IMAGE_VERSION}" = "12-slim" ]; then \ curl \ git \ libbz2-dev \ + libdbus-1-dev \ libexpat1-dev \ libfontconfig1-dev \ libfreetype6-dev \ @@ -75,9 +76,9 @@ RUN if [ "${BASE_IMAGE_VERSION}" = "12-slim" ]; then \ && apt-get purge && rm -rf /var/lib/apt/lists/* # Install Qt6 -RUN curl -O -L https://download.qt.io/archive/qt/6.7/6.7.2/single/qt-everywhere-src-6.7.2.tar.xz \ -&& tar -xf qt-everywhere-src-6.7.2.tar.xz \ -&& cd qt-everywhere-src-6.7.2/ \ +RUN curl -O -L https://download.qt.io/archive/qt/6.10/6.10.0/single/qt-everywhere-src-6.10.0.tar.xz \ +&& tar -xf qt-everywhere-src-6.10.0.tar.xz \ +&& cd qt-everywhere-src-6.10.0/ \ && ./configure -opensource -nomake examples -nomake tests -bundled-xcb-xinput -confirm-license \ && cmake --build . --parallel \ && cmake --install . \ diff --git a/build.sh b/build.sh index 9a5f234..8518f87 100755 --- a/build.sh +++ b/build.sh @@ -8,8 +8,8 @@ timestamp() { REPO=ghcr.io/educelab/ci-docker VER_MAJOR=12 -VER_MINOR=1 -VER_PATCH=3 +VER_MINOR=2 +VER_PATCH=0 VER_EXTRA= VER_FULL=${VER_MAJOR}.${VER_MINOR}.${VER_PATCH}${VER_EXTRA} BASE_IMAGE_VERSION=${VER_MAJOR}-slim diff --git a/vc-deps b/vc-deps index 4a70bc4..0bc0e63 160000 --- a/vc-deps +++ b/vc-deps @@ -1 +1 @@ -Subproject commit 4a70bc4bdb16d4aa371e63f1a6311ac64c92c7e1 +Subproject commit 0bc0e63e182833a9a47f09b5ce63c4433324e105