aboutsummaryrefslogtreecommitdiffstats
path: root/docker/bionic
diff options
context:
space:
mode:
authorIvan Komissarov <ABBAPOH@gmail.com>2020-02-06 12:14:44 +0100
committerIvan Komissarov <ABBAPOH@gmail.com>2020-02-10 13:00:20 +0000
commit50133328dd92373fefdd354a62aa3e49eec239a8 (patch)
tree937d6d24460e3dd378b12ad3af39c5c8db02a787 /docker/bionic
parentc612c156844073af1307dd8bd868069595b0a532 (diff)
Install more packages in bionic image to run more tests
Change-Id: I21691196660a6f5650f6328abe43ec2269a09dbc Reviewed-by: Richard Weickelt <richard@weickelt.de> Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
Diffstat (limited to 'docker/bionic')
-rw-r--r--docker/bionic/Dockerfile22
1 files changed, 17 insertions, 5 deletions
diff --git a/docker/bionic/Dockerfile b/docker/bionic/Dockerfile
index 178186c67..31c124e6b 100644
--- a/docker/bionic/Dockerfile
+++ b/docker/bionic/Dockerfile
@@ -119,25 +119,37 @@ ENTRYPOINT ["/sbin/entrypoint.sh"]
# Qbs build dependencies
RUN apt-get update -qq && \
apt-get install -qq -y --no-install-recommends \
+ bison \
build-essential \
ca-certificates \
ccache \
+ clang-8 \
+ clang-tidy-8 \
curl \
+ flex \
git \
+ help2man \
+ icoutils \
libclang-3.9-dev \
- clang-8 \
- clang-tidy-8 \
libdbus-1-3 \
libfreetype6 \
libfontconfig1 \
libgl1-mesa-dev \
libgl1-mesa-glx \
+ libprotobuf-dev \
+ nsis \
pkg-config \
- help2man \
+ protobuf-compiler \
+ protobuf-compiler-grpc \
+ psmisc \
python-pip \
- p7zip-full && \
+ p7zip-full \
+ 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 && \
pip install beautifulsoup4 lxml # for building the documentation
ENV LLVM_INSTALL_DIR=/usr/lib/llvm-8
@@ -148,7 +160,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 icu && \
+RUN ./install-qt.sh --version ${QT_VERSION} qtbase qtdeclarative qtscript qttools qtx11extras qtscxml 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