Merge pull request #48115 from shikhi7/master

Automatic merge from submit-queue (batch tested with PRs 48317, 48313, 48351, 48357, 48115) Formatted Dockerfile to be cleaner and precise **What this PR does / why we need it**: This PR includes good practices which should be followed while writing Dockerfiles as it involves cleaner and clearer syntax. **Special notes for your reviewer**: Includes good practices of writing Dockerfile. Maybe we may allow these types of changes to all old Dockerfiles.

Merge pull request #48115 from shikhi7/master
754ed208 · Kubernetes Submit Queue · GitHub · 36342629 · 7a279e59 · 754ed208
Commit 754ed208 authored Jun 30, 2017 by Kubernetes Submit Queue Committed by GitHub Jun 30, 2017
Hide whitespace changes
Inline Side-by-side

Showing with 15 additions and 11 deletions

Dockerfile examples/phabricator/php-phabricator/Dockerfile +15 -11

No files found.
--- a/examples/phabricator/php-phabricator/Dockerfile
+++ b/examples/phabricator/php-phabricator/Dockerfile
@@ -15,21 +15,25 @@
 FROM ubuntu:14.04
 # Install all the required packages.
-RUN apt-get update
+RUN apt-get update && \
-RUN apt-get -y install \
+  apt-get -y install \
  git apache2 dpkg-dev python-pygments \
-  php5 php5-mysql php5-gd php5-dev php5-curl php-apc php5-cli php5-json php5-xhprof
+  php5 php5-mysql php5-gd php5-dev php5-curl php-apc php5-cli php5-json php5-xhprof && \
-RUN a2enmod rewrite
+  apt-get -y clean autoclean && \
-RUN apt-get source php5
+  rm -rf /var/lib/apt/lists/* /tmp/* /var/tmp/*
-RUN (cd `ls -1F | grep '^php5-.*/$'`/ext/pcntl && phpize && ./configure && make && sudo make install)
+#Configure php
+RUN a2enmod rewrite && \
+  apt-get source php5 && \
+  (cd `ls -1F | grep '^php5-.*/$'`/ext/pcntl && phpize && ./configure && make && sudo make install)
 # Load code source.
 RUN mkdir /home/www-data
-RUN cd /home/www-data && git clone https://github.com/phacility/libphutil.git
+RUN cd /home/www-data && git clone https://github.com/phacility/libphutil.git && \
-RUN cd /home/www-data && git clone https://github.com/phacility/arcanist.git
+  cd /home/www-data && git clone https://github.com/phacility/arcanist.git && \
-RUN cd /home/www-data && git clone https://github.com/phacility/phabricator.git
+  cd /home/www-data && git clone https://github.com/phacility/phabricator.git && \
-RUN chown -R www-data /home/www-data
+  chown -R www-data /home/www-data && \
-RUN chgrp -R www-data /home/www-data
+  chgrp -R www-data /home/www-data
 ADD 000-default.conf /etc/apache2/sites-available/000-default.conf
 ADD run.sh /run.sh