diff options
| author | Alexandre Van de Sande <alex.vandesande@ethdev.com> | 2015-02-16 21:43:30 +0800 |
|---|---|---|
| committer | Alexandre Van de Sande <alex.vandesande@ethdev.com> | 2015-02-16 21:43:30 +0800 |
| commit | 3068e2688d88912ec33f3d80fd0fe26c4e897dcd (patch) | |
| tree | ee32ccd17faf650f3e933e9a2d8b4ab52f0d7746 /Dockerfile | |
| parent | 1878630b591b039fadb6f88e15340d04f4af3ed1 (diff) | |
| parent | 68f6ddc5aaa7ff29d09c1519ccd38d9cf16c0f75 (diff) | |
| download | dexon-3068e2688d88912ec33f3d80fd0fe26c4e897dcd.tar dexon-3068e2688d88912ec33f3d80fd0fe26c4e897dcd.tar.gz dexon-3068e2688d88912ec33f3d80fd0fe26c4e897dcd.tar.bz2 dexon-3068e2688d88912ec33f3d80fd0fe26c4e897dcd.tar.lz dexon-3068e2688d88912ec33f3d80fd0fe26c4e897dcd.tar.xz dexon-3068e2688d88912ec33f3d80fd0fe26c4e897dcd.tar.zst dexon-3068e2688d88912ec33f3d80fd0fe26c4e897dcd.zip | |
merge conflicts
Diffstat (limited to 'Dockerfile')
| -rw-r--r-- | Dockerfile | 23 |
1 files changed, 11 insertions, 12 deletions
diff --git a/Dockerfile b/Dockerfile index 6e29a638d..907b96c21 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,27 +1,26 @@ -FROM ubuntu:14.04 +FROM ubuntu:14.04.1 ## Environment setup 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 +ENV PATH /root/go/bin:/usr/local/go/bin:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:/usr/games 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 wget 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 -RUN cd golang && git checkout go1.4.1 -RUN cd golang/src && ./make.bash && go version +# Install Golang +RUN wget https://storage.googleapis.com/golang/go1.4.1.linux-amd64.tar.gz +RUN tar -C /usr/local -xzf go*.tar.gz && go version # this is a workaround, to make sure that docker's cache is invalidated whenever the git repo changes ADD https://api.github.com/repos/ethereum/go-ethereum/git/refs/heads/develop file_does_not_exist |