Fix the docker build
fixes #334
1 files changed, 26 insertions, 24 deletions
diff --git a/Dockerfile b/Dockerfile
index 963e9a24..9e9cda1b 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,36 +1,38 @@
-FROM ubuntu:xenial
+FROM ubuntu:trusty
RUN \
apt-get update -qq && \
- apt-get install -y software-properties-common
-
-RUN \
- add-apt-repository -y ppa:beineri/opt-qt-5.10.1-xenial && \
+ apt-get install -y software-properties-common && \
+ add-apt-repository -y ppa:beineri/opt-qt-5.10.1-trusty && \
+ add-apt-repository -y ppa:ubuntu-toolchain-r/test && \
+ add-apt-repository -y ppa:chris-lea/libsodium && \
apt-get update -qq && \
apt-get install -y \
- qt510base \
- qt510tools \
- qt510svg \
- qt510multimedia
+ qt510base qt510tools qt510svg qt510multimedia \
+ gcc-5 g++-5
RUN \
- add-apt-repository ppa:ubuntu-toolchain-r/test && \
- apt-add-repository "deb http://apt.llvm.org/xenial/ llvm-toolchain-xenial-5.0 main" && \
- apt-get update -qq && \
- apt-get install -y --allow-unauthenticated \
- gcc-7 \
- g++-7 \
- cmake \
- clang-5.0 \
- clang-format-5.0 \
- liblmdb-dev
+ apt-get install -y \
+ make \
+ pkg-config \
+ ninja-build \
+ libsodium-dev \
+ liblmdb-dev \
+ libssl-dev \
+ mesa-common-dev \
+ wget \
+ fuse \
+ git
-RUN apt-get install -y mesa-common-dev wget fuse git
+RUN \
+ wget https://cmake.org/files/v3.12/cmake-3.12.2-Linux-x86_64.sh && \
+ sudo sh cmake-3.12.2-Linux-x86_64.sh --skip-license --prefix=/usr/local
-RUN update-alternatives --install \
- /usr/bin/clang-format \
- clang-format \
- /usr/bin/clang-format-5.0 100
+RUN \
+ update-alternatives --install /usr/bin/gcc gcc /usr/bin/gcc-5 10 && \
+ update-alternatives --install /usr/bin/g++ g++ /usr/bin/g++-5 10 && \
+ update-alternatives --set gcc "/usr/bin/gcc-5" && \
+ update-alternatives --set g++ "/usr/bin/g++-5"
ENV PATH=/opt/qt510/bin:$PATH
|
