Merge pull request #21 from continuousphp/docker/enhancement

Docker/enhancement

Author: oswaldderiemaecker

.dockerignore

@@ -0,0 +1 @@
+.git

infra/docker/.htaccess

@@ -0,0 +1,25 @@
+RewriteEngine On
+# The following rule tells Apache that if the requested filename
+# exists, simply serve it.
+RewriteCond %{REQUEST_FILENAME} -s [OR]
+RewriteCond %{REQUEST_FILENAME} -l [OR]
+RewriteCond %{REQUEST_FILENAME} -d
+RewriteRule ^.*$ - [NC,L]
+# The following rewrites all other queries to index.php. The 
+# condition ensures that if you are using Apache aliases to do
+# mass virtual hosting, the base path will be prepended to 
+# allow proper resolution of the index.php file; it will work
+# in non-aliased environments as well, providing a safe, one-size 
+# fits all solution.
+RewriteCond %{REQUEST_URI}::$1 ^(/.+)(.+)::\2$
+RewriteRule ^(.*) - [E=BASE:%1]
+RewriteRule ^(.*)$ %{ENV:BASE}index.php [NC,L]
+
+# supress php errors
+php_flag display_startup_errors off
+php_flag display_errors off
+php_flag html_errors off
+
+# enable PHP error logging
+php_flag  log_errors on
+php_value error_log /var/app/data/logs/error.log

infra/docker/Dockerfile

@@ -4,16 +4,17 @@ FROM php:7.0-apache
 RUN ln -sf /usr/share/zoneinfo/Europe/Paris /etc/localtime
 
 # Install last update and php extension
-RUN apt-get update && apt-get install -y \
-    git \
+RUN apt-get update && apt-get install -y --no-install-recommends \
     vim \
     bzip2 \
     zip \
+    unzip \
     libbz2-dev \
     libmcrypt-dev \
     libicu-dev \
     && docker-php-ext-configure mysqli \
-    && docker-php-ext-install mysqli pdo_mysql bz2 mcrypt intl
+    && docker-php-ext-install mysqli pdo_mysql bz2 mcrypt intl \
+    && rm -rf /var/lib/apt/lists/*
 
 # Install composer
 RUN curl -sS https://getcomposer.org/installer | php \ 
@@ -26,11 +27,17 @@ RUN a2enmod rewrite
 COPY infra/docker/vhost.conf /etc/apache2/sites-available/000-default.conf
 
 # Implement application
+WORKDIR /var/app
 COPY . /var/app/
 
-RUN rm -rf /var/app/.git
-RUN cd /var/app; \
-    /usr/bin/composer update; \
-    ./scripts/post-create-project
+# htaccess specific to docker app
+COPY infra/docker/.htaccess public/
 
-CMD ["apache2-foreground"]
+# Update project
+RUN /usr/bin/composer install --no-dev \
+    && ./scripts/post-create-project \
+    && chown www-data:www-data -R .
+
+COPY infra/docker/entrypoint.sh /
+
+ENTRYPOINT ["/entrypoint.sh", "apache2-foreground"]

infra/docker/entrypoint.sh

@@ -0,0 +1,11 @@
+#!/bin/bash
+set -e
+
+chown -R www-data:www-data /var/app/data
+
+if [ -d /mnt/applications ]
+then
+    chown -R www-data:www-data /mnt/applications
+fi
+
+exec "$@"