Refactor installation for better caching

Author: andrewnicols

Dockerfile

@@ -1,8 +1,5 @@
 FROM php:7.1-apache-stretch
 
-ENV LD_LIBRARY_PATH /usr/local/instantclient
-
-# Setup the required extensions.
 ARG DEBIAN_FRONTEND=noninteractive
 
 # Install NVM and the current (as of 26/02/2019) LTS version of Node.
@@ -12,14 +9,21 @@ RUN mkdir -p $NVM_DIR && \
     curl -o- https://raw.githubusercontent.com/creationix/nvm/v0.34.0/install.sh | bash && \
     . $NVM_DIR/nvm.sh && nvm install $NODE_VERSION && nvm use --delete-prefix $NODE_VERSION
 
-ADD root/ /
-# Fix the original permissions of /tmp, the PHP default upload tmp dir.
-RUN chmod 777 /tmp && chmod +t /tmp
+# Install the standard PHP extensions.
+ADD root/tmp/setup/php-extensions.sh /tmp/setup/
+RUN chmod 777 /tmp && chmod +t /tmp && \
+    /tmp/setup/php-extensions.sh
+
+# Install the PHP MSSQL Extension.
+ADD root/tmp/setup/mssql-extension.sh /tmp/setup/
+RUN chmod 777 /tmp && chmod +t /tmp && \
+    /tmp/setup/mssql-extension.sh
 
-# Setup the required extensions.
-RUN /tmp/setup/php-extensions.sh
-RUN /tmp/setup/oci8-extension.sh
+# Install the PHP OCI8 Extension.
 ENV LD_LIBRARY_PATH /usr/local/instantclient
+ADD root/tmp/setup/oci8-extension.sh /tmp/setup/
+RUN chmod 777 /tmp && chmod +t /tmp && \
+    /tmp/setup/oci8-extension.sh
 
 RUN mkdir /var/www/moodledata && chown www-data /var/www/moodledata && \
     mkdir /var/www/phpunitdata && chown www-data /var/www/phpunitdata && \

root/tmp/setup/mssql-extension.sh

@@ -0,0 +1,25 @@
+#!/usr/bin/env bash
+
+set -e
+
+BUILD_PACKAGES="gnupg unixodbc-dev"
+
+apt-get update
+apt-get install -y --no-install-recommends apt-transport-https \
+    $BUILD_PACKAGES
+
+# Install Microsoft dependcies for sqlsrv.
+curl https://packages.microsoft.com/keys/microsoft.asc | apt-key add -
+curl https://packages.microsoft.com/config/debian/9/prod.list -o /etc/apt/sources.list.d/mssql-release.list
+apt-get update
+ACCEPT_EULA=Y apt-get install -y msodbcsql17
+
+pecl install sqlsrv
+docker-php-ext-enable sqlsrv
+
+# Keep our image size down..
+pecl clear-cache
+apt-get remove --purge -y $BUILD_PACKAGES
+apt-get autoremove -y
+apt-get clean
+rm -rf /var/lib/apt/lists/*

root/tmp/setup/php-extensions.sh

@@ -7,7 +7,7 @@ echo "Installing apt dependencies"
 # Build packages will be added during the build, but will be removed at the end.
 BUILD_PACKAGES="gettext gnupg libcurl4-openssl-dev libfreetype6-dev libicu-dev libjpeg62-turbo-dev \
   libldap2-dev libmariadbclient-dev libmemcached-dev libpng-dev libpq-dev libxml2-dev libxslt-dev \
-  unixodbc-dev zlib1g-dev"
+  zlib1g-dev"
 
 # Packages for Postgres.
 PACKAGES_POSTGRES="libpq5"
@@ -64,15 +64,6 @@ docker-php-ext-enable solr memcached redis apcu igbinary
 
 echo 'apc.enable_cli = On' >> /usr/local/etc/php/conf.d/docker-php-ext-apcu.ini
 
-# Install Microsoft dependcies for sqlsrv.
-curl https://packages.microsoft.com/keys/microsoft.asc | apt-key add -
-curl https://packages.microsoft.com/config/debian/9/prod.list -o /etc/apt/sources.list.d/mssql-release.list
-apt-get update
-ACCEPT_EULA=Y apt-get install -y msodbcsql17
-
-pecl install sqlsrv
-docker-php-ext-enable sqlsrv
-
 # Keep our image size down..
 pecl clear-cache
 apt-get remove --purge -y $BUILD_PACKAGES