From 51a770cfdcc3a17652ec2a2b2a8b69a891b106a7 Mon Sep 17 00:00:00 2001
From: James Cole <thegrumpydictator@gmail.com>
Date: Sat, 11 Aug 2018 07:22:17 +0200
Subject: [PATCH] New experimental Dockerfile #1464

---
 .deploy/docker/entrypoint.sh |  5 +--
 .deploy/docker/vhost.conf    | 26 +++++++++++
 Dockerfile                   | 85 +++++-------------------------------
 3 files changed, 39 insertions(+), 77 deletions(-)
 create mode 100644 .deploy/docker/vhost.conf

diff --git a/.deploy/docker/entrypoint.sh b/.deploy/docker/entrypoint.sh
index 2a6f7cf013..6e234c99c1 100755
--- a/.deploy/docker/entrypoint.sh
+++ b/.deploy/docker/entrypoint.sh
@@ -16,14 +16,13 @@ mkdir -p $FIREFLY_PATH/storage/upload
 
 
 # make sure we own the volumes:
-chown -R www-data:www-data -R $FIREFLY_PATH/storage
+chown -R $APPLICATION_GID:$APPLICATION_UID -R $FIREFLY_PATH/storage
 chmod -R 775 $FIREFLY_PATH/storage
 
 # remove any lingering files that may break upgrades:
 rm -f $FIREFLY_PATH/storage/logs/laravel.log
 
-cat .env.docker | envsubst > .env && cat .env
+cat .env.docker | envsubst > .env
 composer dump-autoload
 php artisan package:discover
 php artisan firefly:instructions install
-exec apache2-foreground
diff --git a/.deploy/docker/vhost.conf b/.deploy/docker/vhost.conf
new file mode 100644
index 0000000000..f5a07256b0
--- /dev/null
+++ b/.deploy/docker/vhost.conf
@@ -0,0 +1,26 @@
+server {
+    listen 80 default_server;
+
+    server_name  _ *.vm docker;
+
+    root "/app/public";
+    index index.php;
+
+    include /opt/docker/etc/nginx/vhost.common.d/*.conf;
+}
+
+##############
+# SSL
+##############
+
+server {
+    listen 443 default_server;
+
+    server_name  _ *.vm docker;
+
+    root "/app/public";
+    index index.php;
+
+    include /opt/docker/etc/nginx/vhost.common.d/*.conf;
+    include /opt/docker/etc/nginx/vhost.ssl.conf;
+}
\ No newline at end of file
diff --git a/Dockerfile b/Dockerfile
index 6d6ca1799b..999d52fd49 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,93 +1,30 @@
-# use PHP 7.1 and Apache as a base.
-FROM php:7.1-apache
+FROM webdevops/php-nginx:7.2
 
-# set working dir
-ENV FIREFLY_PATH /var/www/firefly-iii
-ENV CURL_VERSION 7.60.0
-ENV OPENSSL_VERSION 1.1.1-pre6
+ENV FIREFLY_PATH /app
 WORKDIR $FIREFLY_PATH
 ADD . $FIREFLY_PATH
 
-# install packages
-RUN apt-get update -y && \
-    apt-get install -y --no-install-recommends libcurl4-openssl-dev \
-                                               zlib1g-dev \
-                                               libjpeg62-turbo-dev \
-                                               wget \
-                                               libpng-dev \
-                                               libicu-dev \
-                                               libedit-dev \
-                                               libtidy-dev \
-                                               libxml2-dev \
-                                               libsqlite3-dev \
-                                               libpq-dev \
-                                               libbz2-dev \
-                                               gettext-base \
-                                               cron \
-                                               locales && \
-                                               apt-get clean && \
-                                               rm -rf /var/lib/apt/lists/*
+# gettext is used to update the .env file when the container launches.
+RUN apt-get update -y && apt-get install -y --no-install-recommends gettext-base && apt-get clean
 
-# Setup the Composer installer
+# Install composer
 RUN curl -sS https://getcomposer.org/installer | php -- --install-dir=/usr/local/bin --filename=composer
 
-# Install latest curl
-RUN cd /tmp && \
-    wget https://www.openssl.org/source/openssl-${OPENSSL_VERSION}.tar.gz && \
-    tar -xvf openssl-${OPENSSL_VERSION}.tar.gz && \
-    cd openssl-${OPENSSL_VERSION} && \
-    ./config && \
-    make && \
-    make install
-
-RUN cd /tmp && \
-    wget https://curl.haxx.se/download/curl-${CURL_VERSION}.tar.gz && \
-    tar -xvf curl-${CURL_VERSION}.tar.gz && \
-    cd curl-${CURL_VERSION} && \
-    ./configure --with-ssl && \
-    make && \
-    make install
-
-
-# Create the log file to be able to run tail
-RUN touch /var/log/cron.log
-
-# Setup cron job
-RUN (crontab -l ; echo "* * * * * root $FIREFLY_PATH/artisan schedule:run >> /var/log/cron.log") | crontab
-
-# Install PHP exentions.
-RUN docker-php-ext-install -j$(nproc) curl gd intl json readline tidy zip bcmath xml mbstring pdo_sqlite pdo_mysql bz2 pdo_pgsql
-
 # Generate locales supported by Firefly III
 RUN echo "en_US.UTF-8 UTF-8\nde_DE.UTF-8 UTF-8\nfr_FR.UTF-8 UTF-8\nit_IT.UTF-8 UTF-8\nnl_NL.UTF-8 UTF-8\npl_PL.UTF-8 UTF-8\npt_BR.UTF-8 UTF-8\nru_RU.UTF-8 UTF-8\ntr_TR.UTF-8 UTF-8\n\n" > /etc/locale.gen && locale-gen
 
-# copy Apache config to correct spot.
-COPY ./.deploy/docker/apache2.conf /etc/apache2/apache2.conf
-
-# Enable apache mod rewrite..
-RUN a2enmod rewrite
-
-# Enable apache mod ssl..
-RUN a2enmod ssl
-
-# Create volumes for several directories:
+# Create volumes
 VOLUME $FIREFLY_PATH/storage/export $FIREFLY_PATH/storage/upload
 
-# Enable default site (Firefly III)
-COPY ./.deploy/docker/apache-firefly.conf /etc/apache2/sites-available/000-default.conf
-
 # Make sure we own Firefly III directory
 RUN chown -R www-data:www-data /var/www && chmod -R 775 $FIREFLY_PATH/storage
 
 # Run composer
+ENV COMPOSER_ALLOW_SUPERUSER 1
 RUN composer install --prefer-dist --no-dev --no-scripts --no-suggest
 
-# Expose port 80
-EXPOSE 80
-
-# Run the command on container startup
-CMD cron
-
-# Run entrypoint thing
-ENTRYPOINT [".deploy/docker/entrypoint.sh"]
+# Copy nginx config to correct spot.
+COPY ./.deploy/docker/vhost.conf /opt/docker/etc/nginx/vhost.conf
 
+# Copy entrypoint script to correct spot:
+COPY ./.deploy/docker/entrypoint.sh /opt/docker/provision/entrypoint.d/default.sh