THRIFT-3425 Minor fixes + simplification for CentOS Dockerfile
Client: Build
Patch: Nobuaki Sukegawa
This closes #699
diff --git a/build/docker/centos/Dockerfile b/build/docker/centos/Dockerfile
index 2ba73c3..95601db 100644
--- a/build/docker/centos/Dockerfile
+++ b/build/docker/centos/Dockerfile
@@ -23,44 +23,28 @@
ENV HOME /root
-# 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
-
-RUN mkdir -p /tmp/epel && \
- curl -sSL "http://dl.fedoraproject.org/pub/epel/7/x86_64/e/epel-release-7-5.noarch.rpm" -o /tmp/epel/epel-release-7-5.noarch.rpm && \
- cd /tmp/epel && \
- rpm -ivh epel-release*.rpm && \
- cd $HOME
-
-# Automake
-RUN mkdir -p /tmp/automake && \
- curl -SL "http://ftp.gnu.org/gnu/automake/automake-1.14.tar.gz" | tar -xzC /tmp/automake && \
- cd /tmp/automake/automake-1.14 && \
- ./configure --prefix=/usr && \
- make && \
- make install && \
- cd $HOME
+RUN yum install -y tar m4 perl gcc gcc-c++ git libtool zlib-devel openssl-devel autoconf make bison bison-devel flex epel-release
# C++ dependencies
-RUN yum install -y libboost-dev libevent-devel
+RUN yum install -y boost-devel-static libevent-devel
# Java Dependencies
-RUN yum install -y ant junit ant-nodeps ant-junit java-1.7.0-openjdk-devel
+RUN yum install -y ant junit ant-junit java-1.7.0-openjdk-devel
# Python Dependencies
-RUN yum install -y python-devel python-setuptools python-twisted python-six
+RUN yum install -y python-devel python-setuptools python-twisted-web python-six
# Ruby Dependencies
RUN yum install -y ruby ruby-devel rubygems && \
gem install bundler rake
# Perl Dependencies
-RUN yum install -y perl-Bit-Vector perl-Class-Accessor perl-ExtUtils-MakeMaker perl-Test-Simple
+RUN yum install -y perl-Bit-Vector perl-Class-Accessor perl-ExtUtils-MakeMaker perl-Test-Simple \
+ perl-IO-Socket-SSL perl-Net-SSLeay perl-Crypt-SSLeay
# PHP Dependencies
-RUN yum install -y php php-devel php-pear re2c
+RUN yum install -y php php-devel php-pear re2c php-phpunit-PHPUnit bzip2
# GLibC Dependencies
RUN yum install -y glib2-devel
@@ -70,24 +54,17 @@
yum install -y erlang-kernel erlang-erts erlang-stdlib erlang-eunit erlang-rebar erlang-tools
# Go Dependencies
-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
+RUN curl -sSL https://storage.googleapis.com/golang/go1.4.3.linux-amd64.tar.gz | tar -C /usr/local/ -xz
+ENV PATH /usr/local/go/bin:$PATH
# Haskell Dependencies
-RUN yum -y install cabal-dev && \
- cabal update && \
- cabal install cabal-install && \
- cd $HOME
+RUN yum -y install haskell-platform
# 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
+RUN yum install -y mono-core mono-devel mono-web-devel mono-extras mingw32-binutils mingw32-crt mingw32-nsis
# Clean up
RUN rm -rf /tmp/* && \