THRIFT-3042: Dockerfiles fail to build
Client: build
Patch: Jfarrell
Updates Dockerfiles for Ubuntu and Centos to latest versions
diff --git a/build/docker/ubuntu/Dockerfile b/build/docker/ubuntu/Dockerfile
index eff474f..cbfb2be 100644
--- a/build/docker/ubuntu/Dockerfile
+++ b/build/docker/ubuntu/Dockerfile
@@ -25,18 +25,19 @@
# General dependencies
RUN apt-get install -y automake libtool flex bison pkg-config g++ libssl-dev make libqt4-dev git \
- debhelper
+ debhelper cmake
# C++ dependencies
RUN apt-get install -y libboost-dev libboost-test-dev libboost-program-options-dev \
- libboost-filesystem-dev libboost-system-dev libevent-dev
+ libboost-filesystem-dev libboost-system-dev libboost-thread-dev libevent-dev
# Java dependencies
RUN apt-get install -y ant openjdk-7-jdk maven && \
update-java-alternatives -s java-1.7.0-openjdk-amd64
# Python dependencies
-RUN apt-get install -y python-all python-all-dev python-all-dbg python-setuptools python-support
+RUN apt-get install -y python-all python-all-dev python-all-dbg python-setuptools python-support \
+ python-twisted python-zope.interface
# Ruby dependencies
RUN apt-get install -y ruby ruby-dev && \
@@ -55,8 +56,12 @@
RUN apt-get install -y erlang-base erlang-eunit erlang-dev
# GO dependencies
-RUN echo "golang-go golang-go/dashboard boolean false" | debconf-set-selections && \
- apt-get install -y golang golang-go
+RUN curl -sSL https://storage.googleapis.com/golang/go1.4.2.linux-amd64.tar.gz | tar -C /usr/lib/ -xz && \
+ mkdir -p /usr/share/go
+
+ENV GOROOT /usr/lib/go
+ENV GOPATH /usr/share/go
+ENV PATH ${GOROOT}/bin:${GOPATH}/bin:$PATH
# Haskell dependencies
RUN apt-get install -y ghc cabal-install libghc-binary-dev libghc-network-dev libghc-http-dev \
@@ -64,13 +69,12 @@
cabal update
# Haxe
-RUN apt-get install -y libneko0 && \
+RUN apt-get install -y neko neko-dev libneko0 && \
mkdir -p /tmp/haxe /usr/lib/haxe && \
curl http://haxe.org/website-content/downloads/3,1,3/downloads/haxe-3.1.3-linux64.tar.gz -o /tmp/haxe/haxe-3.1.3-linux64.tar.gz && \
tar -xvzf /tmp/haxe/haxe-3.1.3-linux64.tar.gz -C /usr/lib/haxe --strip-components=1 && \
ln -s /usr/lib/haxe/haxe /usr/bin/haxe && \
ln -s /usr/lib/haxe/haxelib /usr/bin/haxelib && \
- ln -s /usr/lib/libneko.so.0 /usr/lib/libneko.so && \
mkdir -p /usr/lib/haxe/lib && \
chmod -R 777 /usr/lib/haxe/lib && \
haxelib setup /usr/lib/haxe/lib && \