aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorIvan Komissarov <ABBAPOH@gmail.com>2021-02-13 22:28:26 +0100
committerIvan Komissarov <ABBAPOH@gmail.com>2021-03-19 11:42:49 +0000
commit49ace4593124456fb066a3eaee83fcbf16b1b804 (patch)
tree7b21b9a1e6b36969a0a699409bafba1b48104e68
parent40baf2db26197545cac9ebe810c0399f7b10f0e8 (diff)
Add Qt6 docker image and update Qt5 image
...to add additional packages required for the Qt6 image Change-Id: I42791440eaa754a1ae4ea3c24f86dd0ccedc1ed6 Reviewed-by: Denis Shienkov <denis.shienkov@gmail.com>
-rw-r--r--docker-compose.yml13
-rw-r--r--docker/focal/Dockerfile3
2 files changed, 14 insertions, 2 deletions
diff --git a/docker-compose.yml b/docker-compose.yml
index f03de93a2..2df603fc5 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -21,7 +21,7 @@ services:
focal:
<< : *linux
hostname: focal
- image: ${DOCKER_USER:-qbsbuild}/qbsdev:focal-5.15.2_1.17.1-0
+ image: ${DOCKER_USER:-qbsbuild}/qbsdev:focal-5.15.2_1.17.1-1
build:
dockerfile: docker/focal/Dockerfile
context: .
@@ -29,6 +29,17 @@ services:
QT_VERSION: 5.15.2
QTCREATOR_VERSION: 4.13.3
+ focal-qt6:
+ << : *linux
+ hostname: focal-qt6
+ image: ${DOCKER_USER:-qbsbuild}/qbsdev:focal-qt6-6.0.2_1.18.1-0
+ build:
+ dockerfile: docker/focal/Dockerfile
+ context: .
+ args:
+ QT_VERSION: 6.0.2
+ QTCREATOR_VERSION: 4.14.1
+
focal-android-513:
<< : *linux
hostname: focal-android
diff --git a/docker/focal/Dockerfile b/docker/focal/Dockerfile
index e4e239529..22c5c3373 100644
--- a/docker/focal/Dockerfile
+++ b/docker/focal/Dockerfile
@@ -57,6 +57,7 @@ RUN apt-get update -qq && \
libnanopb-dev \
libprotobuf-dev \
libgrpc++-dev \
+ libxkbcommon-x11-0 \
nanopb \
ninja-build \
nsis \
@@ -85,7 +86,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 icu && \
+RUN ./install-qt.sh --version ${QT_VERSION} qtbase qtdeclarative qtscript 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