rnhmjoj/nheko
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Revert dockerfile to trusty and build sodium locally

Browse Source
This commit is contained in:
redsky17 2019-02-27 01:00:00 +00:00
parent 0c9af63d1a
commit 1ac56e9c4e
No known key found for this signature in database
GPG Key ID: E8A1D78EF044B0CB
1 changed files with 12 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
Dockerfile
View File

@ -1,12 +1,13 @@
FROM ubuntu:bionic FROM ubuntu:trusty
RUN \ RUN \
apt-get update -qq && \ apt-get update -qq && \
apt-get install -y software-properties-common && \ 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:ubuntu-toolchain-r/test && \
apt-get update -qq && \ apt-get update -qq && \
apt-get install -y \ apt-get install -y \
qtbase5-dev qttools5-dev libqt5svg5-dev qtmultimedia5-dev qt5-default \ qt510base qt510tools qt510svg qt510multimedia \
gcc-5 g++-5 gcc-5 g++-5
RUN \ RUN \
@ -14,7 +15,6 @@ RUN \
make \ make \
pkg-config \ pkg-config \
ninja-build \ ninja-build \
libsodium-dev \
liblmdb-dev \ liblmdb-dev \
libssl-dev \ libssl-dev \
mesa-common-dev \ mesa-common-dev \
@ -32,8 +32,16 @@ RUN \
update-alternatives --set gcc "/usr/bin/gcc-5" && \ update-alternatives --set gcc "/usr/bin/gcc-5" && \
update-alternatives --set g++ "/usr/bin/g++-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 ENV PATH=/opt/qt510/bin:$PATH
RUN mkdir /build RUN mkdir /build
WORKDIR /build WORKDIR /build