diff options
| author | redsky17 <joedonofry@gmail.com> | 2019-02-27 01:00:00 +0000 |
|---|---|---|
| committer | redsky17 <joedonofry@gmail.com> | 2019-02-27 01:00:00 +0000 |
| commit | 1ac56e9c4e505aac47b7c4c2eec5bfee724d4190 (patch) | |
| tree | 50f7f72814070a55a294f973d8c9a266244522b9 /Dockerfile | |
| parent | Attempt to fix appimage issue (diff) | |
| download | nheko-1ac56e9c4e505aac47b7c4c2eec5bfee724d4190.tar.xz | |
Revert dockerfile to trusty and build sodium locally
Diffstat (limited to '')
| -rw-r--r-- | Dockerfile | 16 |
1 files changed, 12 insertions, 4 deletions
diff --git a/Dockerfile b/Dockerfile index 3fcc75ff..2e01b40b 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,12 +1,13 @@ -FROM ubuntu:bionic +FROM ubuntu:trusty RUN \ apt-get update -qq && \ 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 && \ apt-get update -qq && \ apt-get install -y \ - qtbase5-dev qttools5-dev libqt5svg5-dev qtmultimedia5-dev qt5-default \ + qt510base qt510tools qt510svg qt510multimedia \ gcc-5 g++-5 RUN \ @@ -14,7 +15,6 @@ RUN \ make \ pkg-config \ ninja-build \ - libsodium-dev \ liblmdb-dev \ libssl-dev \ mesa-common-dev \ @@ -32,8 +32,16 @@ RUN \ update-alternatives --set gcc "/usr/bin/gcc-5" && \ update-alternatives --set g++ "/usr/bin/g++-5" +RUN \ + mkdir libsodium-1.0.14 && \ + wget https://download.libsodium.org/libsodium/releases/old/libsodium-1.0.14.tar.gz && \ + tar -xzvf libsodium-1.0.14.tar.gz -C libsodium-1.0.14 && \ + cd libsodium-1.0.14/libsodium-1.0.14 && \ + ./configure && \ + make && make install + ENV PATH=/opt/qt510/bin:$PATH RUN mkdir /build -WORKDIR /build +WORKDIR /build \ No newline at end of file |