Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 5 additions & 4 deletions Dockerfile.base
Original file line number Diff line number Diff line change
Expand Up @@ -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 \
Expand All @@ -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 \
Expand Down Expand Up @@ -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 . \
Expand Down
4 changes: 2 additions & 2 deletions build.sh
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down