diff options
author | redsky17 <rubberduckie3554@gmail.com> | 2019-02-24 14:39:45 -0500 |
---|---|---|
committer | redsky17 <rubberduckie3554@gmail.com> | 2019-02-24 15:09:12 -0500 |
commit | 4e17b7df72eeb2ac0c1f12590f8d4c517c50288b (patch) | |
tree | a78316c5ad335c6e4764602df9c659bfecc753cd /Dockerfile | |
parent | 75fb95855d9f48f531c62028c30d3b588a23710a (diff) |
Make some Dockerfile improvements
Diffstat (limited to 'Dockerfile')
-rw-r--r-- | Dockerfile | 8 |
1 files changed, 3 insertions, 5 deletions
@@ -1,14 +1,12 @@ -FROM ubuntu:trusty +FROM ubuntu:bionic 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 && \ - add-apt-repository -y ppa:chris-lea/libsodium && \ apt-get update -qq && \ apt-get install -y \ - qt510base qt510tools qt510svg qt510multimedia \ + qtbase5-dev qttools5-dev libqt5svg5-dev qtmultimedia5-dev \ gcc-5 g++-5 RUN \ @@ -26,7 +24,7 @@ RUN \ 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 + sh cmake-3.12.2-Linux-x86_64.sh --skip-license --prefix=/usr/local RUN \ update-alternatives --install /usr/bin/gcc gcc /usr/bin/gcc-5 10 && \ |