diff options
| author | Ivan Komissarov <ABBAPOH@gmail.com> | 2020-02-19 21:02:51 +0100 |
|---|---|---|
| committer | Ivan Komissarov <ABBAPOH@gmail.com> | 2020-02-21 19:34:18 +0000 |
| commit | 9a84e6931d64a153b5c6f605d1d2555abf91592d (patch) | |
| tree | b53e66bcd2c9ab82cf9d570fe8247636fb0d1d14 /docker/bionic | |
| parent | 8c300ef4c78e8bd759e0b6f0cabe07cb12c708e3 (diff) | |
Use python3 in Travis for building docs and running clang-tidy
Change-Id: I2f0d72abdf12a4e64b79bf9a3c02b32cf4cbeed6
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/Dockerfile | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/docker/bionic/Dockerfile b/docker/bionic/Dockerfile index 31c124e6b..0a702109c 100644 --- a/docker/bionic/Dockerfile +++ b/docker/bionic/Dockerfile @@ -142,7 +142,8 @@ RUN apt-get update -qq && \ protobuf-compiler \ protobuf-compiler-grpc \ psmisc \ - python-pip \ + python3-pip \ + python3-setuptools \ p7zip-full \ subversion \ unzip \ @@ -150,7 +151,9 @@ RUN apt-get update -qq && \ 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 + update-alternatives --install /usr/bin/python python /usr/bin/python3 100 && \ + update-alternatives --install /usr/bin/pip pip /usr/bin/pip3 100 && \ + pip install beautifulsoup4 lxml pyyaml ENV LLVM_INSTALL_DIR=/usr/lib/llvm-8 |