aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorobscuren <geffobscura@gmail.com>2015-01-29 19:02:45 +0800
committerobscuren <geffobscura@gmail.com>2015-01-29 19:02:45 +0800
commitd0c6559204b2bbb83afd276a266e15d41f61b2ff (patch)
treefeaed3bddf315122c1e817334458742356530356
parent6d012f628bbfc22b2587828968eff513dfeb4d8e (diff)
parent83b385a290ce967d88e532eec3f6d08ca92d3c58 (diff)
downloadgo-tangerine-d0c6559204b2bbb83afd276a266e15d41f61b2ff.tar.gz
go-tangerine-d0c6559204b2bbb83afd276a266e15d41f61b2ff.tar.zst
go-tangerine-d0c6559204b2bbb83afd276a266e15d41f61b2ff.zip
Merge branch 'develop' into qt5.4
-rw-r--r--Dockerfile6
1 files changed, 3 insertions, 3 deletions
diff --git a/Dockerfile b/Dockerfile
index 726e6b71f..94a8f098f 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -13,9 +13,9 @@ 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
## Build and install Go
-RUN git clone https://go.googlesource.com/go
-RUN cd go && git checkout go1.4.1
-RUN cd go/src && ./all.bash && go version
+RUN git clone https://go.googlesource.com/go golang
+RUN cd golang && git checkout go1.4.1
+RUN cd golang/src && ./all.bash && go version
## Install GUI dependencies
RUN add-apt-repository ppa:ubuntu-sdk-team/ppa -y