aboutsummaryrefslogtreecommitdiffstats
path: root/Dockerfile
diff options
context:
space:
mode:
authorTaylor Gerring <taylor.gerring@gmail.com>2015-02-16 19:12:14 +0800
committerTaylor Gerring <taylor.gerring@gmail.com>2015-02-16 19:12:14 +0800
commitd68e607aa5917b4b35c0d54bed45334fc27ac12c (patch)
tree4fc13e2bd472ea5f17d094fe21fe75e23fef7711 /Dockerfile
parentf63c4a9bcbe48ef0e3204d420a939256edd4ca38 (diff)
downloaddexon-d68e607aa5917b4b35c0d54bed45334fc27ac12c.tar
dexon-d68e607aa5917b4b35c0d54bed45334fc27ac12c.tar.gz
dexon-d68e607aa5917b4b35c0d54bed45334fc27ac12c.tar.bz2
dexon-d68e607aa5917b4b35c0d54bed45334fc27ac12c.tar.lz
dexon-d68e607aa5917b4b35c0d54bed45334fc27ac12c.tar.xz
dexon-d68e607aa5917b4b35c0d54bed45334fc27ac12c.tar.zst
dexon-d68e607aa5917b4b35c0d54bed45334fc27ac12c.zip
Group Qt dependencies together
Diffstat (limited to 'Dockerfile')
-rw-r--r--Dockerfile12
1 files changed, 6 insertions, 6 deletions
diff --git a/Dockerfile b/Dockerfile
index 6e29a638d..c0c41e410 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -4,19 +4,19 @@ FROM ubuntu:14.04
ENV HOME /root
ENV GOPATH /root/go
ENV PATH /golang/bin:/root/go/bin:/usr/local/go/bin:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:/usr/games
-ENV PKG_CONFIG_PATH /opt/qt54/lib/pkgconfig
RUN mkdir -p /root/go
ENV DEBIAN_FRONTEND noninteractive
## Install base dependencies
RUN apt-get update && apt-get upgrade -y
-RUN apt-get install -y git mercurial build-essential software-properties-common pkg-config libgmp3-dev libreadline6-dev libpcre3-dev libpcre++-dev mesa-common-dev libglu1-mesa-dev
+RUN apt-get install -y git mercurial build-essential software-properties-common pkg-config libgmp3-dev libreadline6-dev libpcre3-dev libpcre++-dev
-## Install Qt5.4 dependencies from PPA
-RUN add-apt-repository ppa:beineri/opt-qt54-trusty -y
-RUN apt-get update -y
-RUN apt-get install -y qt54quickcontrols qt54webengine
+## Install Qt5.4
+# RUN add-apt-repository ppa:beineri/opt-qt54-trusty -y
+# RUN apt-get update -y
+# RUN apt-get install -y qt54quickcontrols qt54webengine mesa-common-dev libglu1-mesa-dev
+# ENV PKG_CONFIG_PATH /opt/qt54/lib/pkgconfig
## Build and install latest Go
RUN git clone https://go.googlesource.com/go golang