Upgrade PHP, Update Config, and add more dependencies

Dockerfile

@@ -1,11 +1,14 @@
-FROM php:7.1-apache
+FROM php:7.2-apache
 
 # Required Components
 # @see https://secure.phabricator.com/book/phabricator/article/installation_guide/#installing-required-comp
 RUN apt-get update \
   && apt-get install -y --no-install-recommends \
     git \
+    mercurial \
+    subversion \
     ca-certificates \
+    python-pygments \
   && rm -rf /var/lib/apt/lists/*
 
 # install the PHP extensions we need
@@ -20,17 +23,27 @@ RUN set -ex; \
 	apt-get update; \
 	apt-get install -y --no-install-recommends \
 		libcurl4-gnutls-dev \
+    libjpeg62-turbo-dev \
+		libpng-dev \
+    libfreetype6-dev \
 	; \
 	\
+  docker-php-ext-configure gd \
+		--with-jpeg-dir=/usr \
+		--with-png-dir=/usr \
+    --with-freetype-dir=/usr \
+  ; \
+  \
 	docker-php-ext-install -j "$(nproc)" \
+    gd \
     opcache \
 		mbstring \
 		iconv \
 		mysqli \
 		curl \
 		pcntl \
 	; \
-	\
+  \
   # reset apt-mark's "manual" list so that "purge --auto-remove" will remove all build dependencies
 	apt-mark auto '.*' > /dev/null; \
 	apt-mark manual $savedAptMark; \
@@ -58,18 +71,34 @@ RUN { \
   		echo 'opcache.revalidate_freq=60'; \
   		echo 'opcache.fast_shutdown=1'; \
   		echo 'opcache.enable_cli=1'; \
+      echo 'opcache.validate_timestamps=0'; \
     } > /usr/local/etc/php/conf.d/opcache-recommended.ini
 
+# Set the default timezone.
+RUN { \
+  		echo 'date.timezone="UTC"'; \
+    } > /usr/local/etc/php/conf.d/timezone.ini
+
+# File Uploads
+RUN { \
+  		echo 'post_max_size=32M'; \
+      echo 'upload_max_filesize=32M'; \
+    } > /usr/local/etc/php/conf.d/uploads.ini
+
 ENV APACHE_DOCUMENT_ROOT /var/www/phabricator/webroot
 
 RUN { \
   		echo '<VirtualHost *:80>'; \
-  		echo 'DocumentRoot ${APACHE_DOCUMENT_ROOT}'; \
-  		echo 'RewriteEngine on'; \
-  		echo 'RewriteRule ^(.*)$ /index.php?__path__=$1 [B,L,QSA]'; \
+  		echo '  DocumentRoot ${APACHE_DOCUMENT_ROOT}'; \
+  		echo '  RewriteEngine on'; \
+  		echo '  RewriteRule ^(.*)$ /index.php?__path__=$1 [B,L,QSA]'; \
   		echo '</VirtualHost>'; \
     } > /etc/apache2/sites-available/000-default.conf
 
+# Repository Folder.
+RUN mkdir /var/repo \
+  && chown www-data:www-data /var/repo
+
 COPY ./ /var/www
 
 WORKDIR /var/www

Dockerfile.daemon

@@ -1,11 +1,14 @@
-FROM php:7.1-cli
+FROM php:7.2-cli
 
 # Required Components
 # @see https://secure.phabricator.com/book/phabricator/article/installation_guide/#installing-required-comp
 RUN apt-get update \
   && apt-get install -y --no-install-recommends \
     git \
+    mercurial \
+    subversion \
     ca-certificates \
+    python-pygments \
   && rm -rf /var/lib/apt/lists/*
 
 # install the PHP extensions we need
@@ -15,9 +18,19 @@ RUN set -ex; \
 	apt-get update; \
 	apt-get install -y --no-install-recommends \
 		libcurl4-gnutls-dev \
-	; \
-	\
+    libjpeg62-turbo-dev \
+    libpng-dev \
+    libfreetype6-dev \
+  ; \
+  \
+  docker-php-ext-configure gd \
+    --with-jpeg-dir=/usr \
+    --with-png-dir=/usr \
+    --with-freetype-dir=/usr \
+  ; \
+  \
 	docker-php-ext-install -j "$(nproc)" \
+    gd \
     opcache \
 		mbstring \
 		iconv \
@@ -53,8 +66,23 @@ RUN { \
   		echo 'opcache.revalidate_freq=60'; \
   		echo 'opcache.fast_shutdown=1'; \
   		echo 'opcache.enable_cli=1'; \
+      echo 'opcache.validate_timestamps=0'; \
     } > /usr/local/etc/php/conf.d/opcache-recommended.ini
 
+# Set the default timezone.
+RUN { \
+  		echo 'date.timezone="UTC"'; \
+    } > /usr/local/etc/php/conf.d/timezone.ini
+
+# File Uploads
+RUN { \
+  		echo 'post_max_size=32M'; \
+      echo 'upload_max_filesize=32M'; \
+    } > /usr/local/etc/php/conf.d/uploads.ini
+
+# Repository Folder.
+RUN mkdir /var/repo
+
 RUN mkdir -p /var/tmp/phd/log/ \
   && touch /var/tmp/phd/log/daemons.log
 

docker-compose.yml

@@ -5,6 +5,7 @@ services:
     image: phabricator/phabricator
     volumes:
        - config:/var/www/phabricator/conf/local
+       - repo:/var/repo
     ports:
        - 8888:80
     links:
@@ -16,6 +17,7 @@ services:
     image: phabricator/daemon
     volumes:
        - config:/var/www/phabricator/conf/local
+       - repo:/var/repo
     links:
       - database
   database:
@@ -28,4 +30,5 @@ services:
       MYSQL_ROOT_PASSWORD: CHANGEME
 volumes:
   config:
+  repo:
   db-data: