d3v1l/matrixion
1
0
Fork 0
mirror of https://github.com/Nheko-Reborn/nheko.git synced 2024-11-22 19:08:58 +03:00
Code Issues Projects Releases Packages Wiki Activity Actions

Make some Dockerfile improvements

Browse source
This commit is contained in:
redsky17 2019-02-24 14:39:45 -05:00
parent 75fb95855d
commit 4e17b7df72
1 changed files with 3 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
Dockerfile
View file

@ -1,14 +1,12 @@
FROM ubuntu:trusty FROM ubuntu:bionic
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 && \
add-apt-repository -y ppa:chris-lea/libsodium && \
apt-get update -qq && \ apt-get update -qq && \
apt-get install -y \ apt-get install -y \
qt510base qt510tools qt510svg qt510multimedia \ qtbase5-dev qttools5-dev libqt5svg5-dev qtmultimedia5-dev \
gcc-5 g++-5 gcc-5 g++-5
RUN \ RUN \
@ -26,7 +24,7 @@ RUN \
RUN \ RUN \
wget https://cmake.org/files/v3.12/cmake-3.12.2-Linux-x86_64.sh && \ 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 sh cmake-3.12.2-Linux-x86_64.sh --skip-license --prefix=/usr/local
RUN \ RUN \
update-alternatives --install /usr/bin/gcc gcc /usr/bin/gcc-5 10 && \ update-alternatives --install /usr/bin/gcc gcc /usr/bin/gcc-5 10 && \