aboutsummaryrefslogtreecommitdiffstats
path: root/docker
diff options
context:
space:
mode:
Diffstat (limited to 'docker')
-rw-r--r--docker/focal/Dockerfile24
-rw-r--r--docker/focal/test-android.Dockerfile8
-rw-r--r--docker/focal/test-qt4.Dockerfile4
-rw-r--r--docker/focal/test-qt6-static.Dockerfile13
-rw-r--r--docker/leap/Dockerfile2
-rw-r--r--docker/windowsservercore/Dockerfile18
6 files changed, 44 insertions, 25 deletions
diff --git a/docker/focal/Dockerfile b/docker/focal/Dockerfile
index df687f3a0..917d4d0a7 100644
--- a/docker/focal/Dockerfile
+++ b/docker/focal/Dockerfile
@@ -40,8 +40,8 @@ RUN apt-get update -qq && \
ca-certificates \
capnproto \
ccache \
- clang-8 \
- clang-tidy-8 \
+ clang-12 \
+ clang-tidy-12 \
cmake \
curl \
flex \
@@ -58,6 +58,7 @@ RUN apt-get update -qq && \
libprotobuf-dev \
libgrpc++-dev \
libxkbcommon-x11-0 \
+ locales \
nanopb \
ninja-build \
nsis \
@@ -71,13 +72,20 @@ RUN apt-get update -qq && \
subversion \
unzip \
zip && \
- update-alternatives --install /usr/bin/clang clang /usr/bin/clang-8 100 && \
- update-alternatives --install /usr/bin/clang++ clang++ /usr/bin/clang++-8 100 && \
- update-alternatives --install /usr/bin/clang-check clang-check /usr/bin/clang-check-8 100 && \
+ update-alternatives --install /usr/bin/clang clang /usr/bin/clang-12 100 && \
+ update-alternatives --install /usr/bin/clang++ clang++ /usr/bin/clang++-12 100 && \
+ update-alternatives --install /usr/bin/clang-check clang-check /usr/bin/clang-check-12 100 && \
update-alternatives --install /usr/bin/python python /usr/bin/python3 100 && \
- pip install beautifulsoup4 lxml protobuf pyyaml
+ pip install beautifulsoup4 lxml protobuf==3.19.1 pyyaml
-ENV LLVM_INSTALL_DIR=/usr/lib/llvm-8
+# Set the locale
+RUN sed -i '/en_US.UTF-8/s/^# //g' /etc/locale.gen && \
+ locale-gen
+ENV LANG en_US.UTF-8
+ENV LANGUAGE en_US:en
+ENV LC_ALL en_US.UTF-8
+
+ENV LLVM_INSTALL_DIR=/usr/lib/llvm-12
#
@@ -85,7 +93,7 @@ ENV LLVM_INSTALL_DIR=/usr/lib/llvm-8
#
COPY scripts/install-qt.sh install-qt.sh
-RUN ./install-qt.sh --version ${QT_VERSION} qtbase qtdeclarative qtscript qttools qtx11extras qtscxml qt5compat icu && \
+RUN ./install-qt.sh --version ${QT_VERSION} qtbase qtdeclarative qttools qtx11extras qtscxml qt5compat icu && \
./install-qt.sh --version ${QTCREATOR_VERSION} qtcreator && \
echo "export PATH=/opt/Qt/${QT_VERSION}/gcc_64/bin:/opt/Qt/Tools/QtCreator/bin:\${PATH}" > /etc/profile.d/qt.sh
diff --git a/docker/focal/test-android.Dockerfile b/docker/focal/test-android.Dockerfile
index 31f4eb773..5f479e4fc 100644
--- a/docker/focal/test-android.Dockerfile
+++ b/docker/focal/test-android.Dockerfile
@@ -37,10 +37,18 @@ RUN apt-get update -qq && \
curl \
libasan5 \
libglib2.0-0 \
+ locales \
openjdk-8-jdk-headless \
p7zip-full \
unzip
+# Set the locale
+RUN sed -i '/en_US.UTF-8/s/^# //g' /etc/locale.gen && \
+ locale-gen
+ENV LANG en_US.UTF-8
+ENV LANGUAGE en_US:en
+ENV LC_ALL en_US.UTF-8
+
ENV JAVA_HOME=/usr/lib/jvm/java-8-openjdk-amd64
RUN echo "export JAVA_HOME=${JAVA_HOME}" > /etc/profile.d/android.sh && \
echo "export PATH=${JAVA_HOME}/bin:\${PATH}" >> /etc/profile.d/android.sh
diff --git a/docker/focal/test-qt4.Dockerfile b/docker/focal/test-qt4.Dockerfile
index c23a664d2..e49e255f9 100644
--- a/docker/focal/test-qt4.Dockerfile
+++ b/docker/focal/test-qt4.Dockerfile
@@ -36,5 +36,5 @@ RUN sudo add-apt-repository ppa:gezakovacs/ppa -y && \
apt-get update -qq && \
apt-get install -qq -y \
build-essential \
- libqt4-dev
-
+ libqt4-dev \
+ qt4-dev-tools
diff --git a/docker/focal/test-qt6-static.Dockerfile b/docker/focal/test-qt6-static.Dockerfile
index 61316e372..b7c0bbc62 100644
--- a/docker/focal/test-qt6-static.Dockerfile
+++ b/docker/focal/test-qt6-static.Dockerfile
@@ -43,6 +43,7 @@ RUN apt-get update -qq && \
build-essential \
git \
perl \
+ clang-12 \
cmake \
python \
zlib1g-dev \
@@ -56,6 +57,7 @@ RUN apt-get update -qq && \
libvulkan-dev \
libicu-dev \
libb2-dev \
+ libclang-12-dev \
libsystemd-dev \
libfontconfig1-dev \
libfreetype6-dev \
@@ -101,6 +103,7 @@ RUN apt-get update -qq && \
libxcb-damage0-dev \
libxcb-dpms0-dev \
libgstreamer1.0-dev \
+ llvm-12-dev \
apt-transport-https
ENV QT_HOME="/home/${USER_NAME}/qt"
@@ -153,8 +156,8 @@ RUN apt-get update -qq && \
ca-certificates \
capnproto \
ccache \
- clang-8 \
- clang-tidy-8 \
+ clang-12 \
+ clang-tidy-12 \
cmake \
curl \
flex \
@@ -186,9 +189,9 @@ RUN apt-get update -qq && \
zip \
libb2-1 \
libpcre++ && \
- update-alternatives --install /usr/bin/clang clang /usr/bin/clang-8 100 && \
- update-alternatives --install /usr/bin/clang++ clang++ /usr/bin/clang++-8 100 && \
- update-alternatives --install /usr/bin/clang-check clang-check /usr/bin/clang-check-8 100 && \
+ update-alternatives --install /usr/bin/clang clang /usr/bin/clang-12 100 && \
+ update-alternatives --install /usr/bin/clang++ clang++ /usr/bin/clang++-12 100 && \
+ update-alternatives --install /usr/bin/clang-check clang-check /usr/bin/clang-check-12 100 && \
update-alternatives --install /usr/bin/python python /usr/bin/python3 100 && \
pip install beautifulsoup4 lxml protobuf pyyaml
diff --git a/docker/leap/Dockerfile b/docker/leap/Dockerfile
index 308f854ab..12f789e21 100644
--- a/docker/leap/Dockerfile
+++ b/docker/leap/Dockerfile
@@ -76,7 +76,7 @@ RUN zypper install -y \
#
COPY scripts/install-qt.sh install-qt.sh
-RUN ./install-qt.sh --version ${QT_VERSION} qtbase qtdeclarative qtscript qttools qtx11extras qtscxml qt5compat icu && \
+RUN ./install-qt.sh --version ${QT_VERSION} qtbase qtdeclarative qttools qtx11extras qtscxml qt5compat icu && \
./install-qt.sh --version ${QTCREATOR_VERSION} qtcreator && \
echo "export PATH=/opt/Qt/${QT_VERSION}/gcc_64/bin:/opt/Qt/Tools/QtCreator/bin:\${PATH}" > /etc/profile.d/qt.sh
diff --git a/docker/windowsservercore/Dockerfile b/docker/windowsservercore/Dockerfile
index 50a1400ef..8fce9fa59 100644
--- a/docker/windowsservercore/Dockerfile
+++ b/docker/windowsservercore/Dockerfile
@@ -6,7 +6,7 @@ LABEL Description="Windows Server Core development environment for Qbs with Qt,
RUN reg add "HKLM\SOFTWARE\Microsoft\Windows\Windows Error Reporting" /v Disabled /t REG_DWORD /d 1 /f
RUN reg add "HKLM\SOFTWARE\Microsoft\Windows\Windows Error Reporting" /v DontShowUI /t REG_DWORD /d 1 /f
-# Install VS from the website since chocolatey has broken .NET 4.8 (dotnetfx package) which is a
+# Install VS 2019 from the website since chocolatey has broken .NET 4.8 (dotnetfx package) which is a
# dependency for the visualstudio2019buildtools package
RUN powershell -NoProfile -ExecutionPolicy Bypass -Command \
Invoke-WebRequest "https://aka.ms/vs/16/release/vs_community.exe" \
@@ -14,18 +14,17 @@ RUN powershell -NoProfile -ExecutionPolicy Bypass -Command \
RUN "%TEMP%\vs_community.exe" --quiet --wait --norestart --noUpdateInstaller \
--add Microsoft.VisualStudio.Component.VC.Tools.x86.x64 \
- --add Microsoft.VisualStudio.Component.Windows10SDK.18362
+ --add Microsoft.VisualStudio.Component.Windows10SDK.20348
RUN powershell -NoProfile -ExecutionPolicy Bypass -Command \
$Env:chocolateyVersion = '0.10.15' ; \
$Env:chocolateyUseWindowsCompression = 'false' ; \
"[Net.ServicePointManager]::SecurityProtocol = \"tls12, tls11, tls\"; iex ((New-Object System.Net.WebClient).DownloadString('http://chocolatey.org/install.ps1'))" && SET "PATH=%PATH%;%ALLUSERSPROFILE%\chocolatey\bin"
-ARG QBS_VERSION
-RUN choco install -y python && \
+RUN choco install -y python --version 3.9 && \
choco install -y 7zip --version 19.0 && \
choco install -y git --version 2.24.0 --params "/GitAndUnixToolsOnPath" && \
- choco install -y qbs --version %QBS_VERSION%
+ choco install -y vswhere
# for building the documentation
RUN pip install beautifulsoup4 lxml
@@ -42,13 +41,14 @@ RUN certutil -generateSSTFromWU roots.sst && \
ARG QT_VERSION
COPY scripts/install-qt.sh install-qt.sh
-RUN bash -c "./install-qt.sh -d /c/Qt --version ${QT_VERSION} --toolchain win64_msvc2019_64 qtbase qtdeclarative qttools qtscript"
+RUN bash -c "./install-qt.sh -d /c/Qt --version ${QT_VERSION} --toolchain win64_msvc2019_64 qtbase qtdeclarative qttools qt5compat"
ENV QTDIR64=C:\\Qt\\${QT_VERSION}\\msvc2019_64
-RUN bash -c "./install-qt.sh -d /c/Qt --version ${QT_VERSION} --toolchain win32_msvc2019 qtbase qtdeclarative qttools qtscript"
-ENV QTDIR=C:\\Qt\\${QT_VERSION}\\msvc2019
+########### Install Qbs #############
+ARG QTCREATOR_VERSION
+RUN bash -c "./install-qt.sh -d /c/Qt --version ${QTCREATOR_VERSION} qtcreator"
+RUN setx PATH "C:\\Qt\\Tools\\QtCreator\\bin;%PATH%"
RUN qbs setup-toolchains --detect && \
qbs setup-qt %QTDIR64%/bin/qmake.exe qt64 && \
- qbs setup-qt %QTDIR%/bin/qmake.exe qt && \
qbs config defaultProfile qt64
generated by cgit v1.2.3 (git 2.25.1) at 2023-12-05 14:47:30 +0000