THRIFT-3042: Dockerfiles fail to build
client: build
patch: jfarrell
Updating dockerfiles to latest versions
diff --git a/build/docker/centos/Dockerfile b/build/docker/centos/Dockerfile
index 36c474f..c4c273c 100644
--- a/build/docker/centos/Dockerfile
+++ b/build/docker/centos/Dockerfile
@@ -23,7 +23,7 @@
ENV HOME /root
-RUN yum -y update
+# RUN yum -y update
# General dependencies
RUN yum -y install -y tar m4 perl gcc git libtool zlib-devel openssl-devel autoconf make bison bison-devel flex
@@ -56,9 +56,6 @@
RUN yum install -y ruby ruby-devel rubygems && \
gem install bundler rake
-# Node.js Dependencies
-RUN yum install -y nodejs nodejs-devel npm
-
# Perl Dependencies
RUN yum install -y perl-Bit-Vector perl-Class-Accessor perl-ExtUtils-MakeMaker perl-Test-Simple
@@ -69,7 +66,8 @@
RUN yum install -y glib2-devel
# Erlang Dependencies
-RUN yum install -y erlang-kernel erlang-erts erlang-stdlib erlang-eunit erlang-rebar
+RUN curl -sSL http://packages.erlang-solutions.com/rpm/centos/erlang_solutions.repo -o /etc/yum.repos.d/erlang_solutions.repo && \
+ yum install -y erlang-kernel erlang-erts erlang-stdlib erlang-eunit erlang-rebar
# Go Dependencies
RUN curl -sSL https://storage.googleapis.com/golang/go1.4.2.linux-amd64.tar.gz | tar -C /usr/lib/ -xz && \
@@ -79,17 +77,20 @@
ENV GOPATH /usr/share/go
ENV PATH ${GOROOT}/bin:${GOPATH}/bin:$PATH
-# C# Dependencies
-RUN yum install -y mono-core mono-devel mono-web-devel mono-extras mingw32-binutils mingw32-runtime mingw32-nsis
-
# Haskell Dependencies
RUN yum -y install cabal-dev && \
cabal update && \
cabal install cabal-install && \
cd $HOME
+# Node.js Dependencies
+RUN yum install -y nodejs nodejs-devel npm
+
+# C# Dependencies
+RUN yum install -y mono-core mono-devel mono-web-devel mono-extras mingw32-binutils mingw32-runtime mingw32-nsis
+
# Clean up
RUN rm -rf /tmp/* && \
yum clean all
-WORKDIR $HOME
\ No newline at end of file
+WORKDIR $HOME
diff --git a/build/docker/ubuntu/Dockerfile b/build/docker/ubuntu/Dockerfile
index cbfb2be..0148006 100644
--- a/build/docker/ubuntu/Dockerfile
+++ b/build/docker/ubuntu/Dockerfile
@@ -53,7 +53,10 @@
RUN apt-get install -y libglib2.0-dev
# Erlang dependencies
-RUN apt-get install -y erlang-base erlang-eunit erlang-dev
+RUN echo 'deb http://packages.erlang-solutions.com/debian trusty contrib' > /etc/apt/sources.list.d/erlang_solutions.list && \
+ curl -sSL http://packages.erlang-solutions.com/debian/erlang_solutions.asc | sudo apt-key add - && \
+ apt-get update && \
+ apt-get install -y erlang-base erlang-eunit erlang-dev
# GO dependencies
RUN curl -sSL https://storage.googleapis.com/golang/go1.4.2.linux-amd64.tar.gz | tar -C /usr/lib/ -xz && \
@@ -71,8 +74,8 @@
# Haxe
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 && \
+ curl http://haxe.org/website-content/downloads/3.2.0/downloads/haxe-3.2.0-linux64.tar.gz -o /tmp/haxe/haxe-3.2.0-linux64.tar.gz && \
+ tar -xvzf /tmp/haxe/haxe-3.2.0-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 && \
mkdir -p /usr/lib/haxe/lib && \
@@ -92,10 +95,11 @@
# D dependencies
# THRIFT-2916: DMD pinned to 2.065.0-0 due to regression in 2.066
-RUN curl http://master.dl.sourceforge.net/project/d-apt/files/d-apt.list -o /etc/apt/sources.list.d/d-apt.list && \
- apt-get update && apt-get -y --allow-unauthenticated install --reinstall d-apt-keyring && \
- apt-get update && \
- apt-get install -y xdg-utils dmd-bin=2.065.0-0 libphobos2-dev=2.065.0-0
+# THRIFT-3253: DMD pinned to 2.065.0-0 due to deprecations 2.067.1
+RUN apt-get install -y gcc-multilib xdg-utils && \
+ curl -sSL http://downloads.dlang.org/releases/2.x/2.065.0/dmd_2.065.0-0_amd64.deb -o /tmp/dmd_2.065.0-0_amd64.deb && \
+ dpkg -i /tmp/dmd_2.065.0-0_amd64.deb && \
+ rm /tmp/dmd_2.065.0-0_amd64.deb
# Clean up
RUN apt-get clean && \