aboutsummaryrefslogtreecommitdiffstats
path: root/docker
diff options
context:
space:
mode:
Diffstat (limited to 'docker')
-rw-r--r--docker/focal/Dockerfile14
-rw-r--r--docker/focal/test-qt4.Dockerfile4
2 files changed, 9 insertions, 9 deletions
diff --git a/docker/focal/Dockerfile b/docker/focal/Dockerfile
index df687f3a0..50354431f 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 \
@@ -71,13 +71,13 @@ 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
+ENV LLVM_INSTALL_DIR=/usr/lib/llvm-12
#
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