From 2a87116097526f1f3e87320e0f8c68c5f5e6a6c7 Mon Sep 17 00:00:00 2001
From: Valerian Pereira <valerianpereira25@gmail.com>
Date: Mon, 25 Jun 2018 16:27:17 +0530
Subject: [PATCH] Docker image size improvement

Docker image size improvement

Run the following command and check the image size pre and post
`docker images`
---
 Dockerfile | 78 +++++++++++++++++++++++-------------------------------
 1 file changed, 33 insertions(+), 45 deletions(-)

diff --git a/Dockerfile b/Dockerfile
index 163cdd8..23a2e42 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,56 +1,44 @@
 FROM ubuntu:15.04
-MAINTAINER Shaked KleinO Orbach <klein.shaked+whatsapp@gmail.com>
+LABEL maintainer="Shaked KleinO Orbach <klein.shaked+whatsapp@gmail.com>"
 
 #Updates apt repository
-RUN apt-get update -y
-
 #Installs PHP5.6, some extensions and apcu.
-RUN apt-get install -y software-properties-common
-RUN add-apt-repository ppa:ondrej/php5-5.6
-RUN apt-get install -y vim
-RUN apt-get install -y php5  php5-dev
-
 #Installs curl, pear, wget, git, memcached and mysql-server
-RUN apt-get install -y curl php-pear wget git memcached
-
-
-#Installs PHPUnit
-RUN wget https://phar.phpunit.de/phpunit.phar
-RUN chmod +x phpunit.phar
-RUN mv phpunit.phar /usr/local/bin/phpunit
-
-#Installs Composer
-RUN curl -sS https://getcomposer.org/installer | php -- --install-dir=/usr/local/bin --filename=composer
-
-#Installs PHP CodeSniffer
-RUN pear install PHP_CodeSniffer
-
+RUN apt-get update -y && \
+    apt-get install -y software-properties-common && \
+    add-apt-repository ppa:ondrej/php5-5.6 && \
+    apt-get install -y vim && \
+    apt-get install -y php5  php5-dev && \
+    apt-get install -y curl php-pear wget git memcached
+
+#Installs PHPUnit, Composer && PHP CodeSniffer
 #Fetches a sample php.ini file with most configurations already good-to-go.
-RUN wget https://raw.githubusercontent.com/naroga/docker-php56/master/php.ini
-RUN rm -r /etc/php5/cli/php.ini
-RUN rm -r /etc/php5/apache2/php.ini
-RUN cp php.ini /etc/php5/cli/php.ini
-RUN cp php.ini /etc/php5/apache2/php.ini
+RUN wget https://phar.phpunit.de/phpunit.phar && \
+    chmod +x phpunit.phar && \
+    mv phpunit.phar /usr/local/bin/phpunit && \
+    curl -sS https://getcomposer.org/installer | php -- --install-dir=/usr/local/bin --filename=composer && \
+    pear install PHP_CodeSniffer
+
+RUN wget https://raw.githubusercontent.com/naroga/docker-php56/master/php.ini && \
+    rm -r /etc/php5/cli/php.ini && \
+    rm -r /etc/php5/apache2/php.ini && \
+    cp php.ini /etc/php5/cli/php.ini && \
+    cp php.ini /etc/php5/apache2/php.ini
 
 # Whatsapp dependencies
 ADD ./start.sh /tmp/start.sh
-RUN chmod +x /tmp/start.sh
-RUN /tmp/start.sh
-RUN apt-get install -y ffmpeg
-RUN apt-get install -y php5-gd
-RUN apt-get install -y php5-curl
-RUN apt-get install -y libapache2-mod-php5  #php5-sockets
-RUN apt-get install -y php5-sqlite
-RUN apt-get install -y php5-mcrypt
-RUN php5enmod mcrypt
-RUN mkdir /whatsapp
-RUN cd /whatsapp && composer require whatsapp/chat-api
+RUN chmod +x /tmp/start.sh && \
+    /tmp/start.sh && \
+    apt-get install -y ffmpeg php5-gd php5-curl libapache2-mod-php5 php5-sqlite php5-mcrypt && \
+    php5enmod mcrypt && \
+    mkdir /whatsapp && \
+    cd /whatsapp && composer require whatsapp/chat-api
 
 #Tests build
-RUN php -v
-RUN phpunit --version
-RUN composer --version
-RUN phpcs --version
-RUN php -i | grep timezone
-RUN php -r "echo json_encode(get_loaded_extensions());"
-RUN php -m | grep -w --color 'curve25519\|protobuf\|crypto'
\ No newline at end of file
+RUN php -v && \
+    phpunit --version && \
+    composer --version && \
+    phpcs --version && \
+    php -i | grep timezone && \
+    php -r "echo json_encode(get_loaded_extensions());" && \
+    php -m | grep -w --color 'curve25519\|protobuf\|crypto'