commit a15060acd81d72fa364a7aab327aa8c41d02958f
author Robert Lu <robberphex@gmail.com> Thu Dec 28 15:29:39 2017 +0800
committer James E. King, III <jking@apache.org> Thu Jan 11 09:37:37 2018 -0500
tree 088e8e03c03a82477656ae99734535c7dd557019
parent 19a6493ff03ee335cabe109ea6831366f3d7a701

THRIFT-4423: migrate to psr-4
Client: php

This closes #1445

build/docker/ubuntu-trusty/Dockerfile

diff --git a/build/docker/ubuntu-trusty/Dockerfile b/build/docker/ubuntu-trusty/Dockerfile
index db2041a..394e84f 100644
--- a/build/docker/ubuntu-trusty/Dockerfile
+++ b/build/docker/ubuntu-trusty/Dockerfile
@@ -25,8 +25,8 @@
 MAINTAINER Apache Thrift <dev@thrift.apache.org>
 ENV DEBIAN_FRONTEND noninteractive
 
-RUN apt-get update && \ 
-    apt-get dist-upgrade -y && \ 
+RUN apt-get update && \
+    apt-get dist-upgrade -y && \
     apt-get install -y --no-install-recommends \
       apt \
       apt-transport-https \
@@ -166,8 +166,8 @@
       php5-cli \
       php5-dev \
       php-pear \
-      re2c \
-      phpunit
+      re2c && \
+      wget https://getcomposer.org/installer -O - -q | php -- --quiet --install-dir=/usr/local/bin/ --filename=composer
 
 RUN apt-get install -y --no-install-recommends \
 `# Python dependencies` \
@@ -189,7 +189,7 @@
       python3-wheel \
       python3-zope.interface && \
     pip install -U ipaddress backports.ssl_match_hostname tornado && \
-    pip3 install -U backports.ssl_match_hostname tornado 
+    pip3 install -U backports.ssl_match_hostname tornado
 # installing tornado by pip/pip3 instead of debian package
 # if we install the debian package, the build fails in py2