Update Docker files.

.deploy/docker/apache2.conf

@@ -1,73 +1,3 @@
-# This is the main Apache server configuration file.  It contains the
-# configuration directives that give the server its instructions.
-# See http://httpd.apache.org/docs/2.4/ for detailed information about
-# the directives and /usr/share/doc/apache2/README.Debian about Debian specific
-# hints.
-#
-#
-# Summary of how the Apache 2 configuration works in Debian:
-# The Apache 2 web server configuration in Debian is quite different to
-# upstream's suggested way to configure the web server. This is because Debian's
-# default Apache2 installation attempts to make adding and removing modules,
-# virtual hosts, and extra configuration directives as flexible as possible, in
-# order to make automating the changes and administering the server as easy as
-# possible.
-
-# It is split into several files forming the configuration hierarchy outlined
-# below, all located in the /etc/apache2/ directory:
-#
-#	/etc/apache2/
-#	|-- apache2.conf
-#	|	`--  ports.conf
-#	|-- mods-enabled
-#	|	|-- *.load
-#	|	`-- *.conf
-#	|-- conf-enabled
-#	|	`-- *.conf
-# 	`-- sites-enabled
-#	 	`-- *.conf
-#
-#
-# * apache2.conf is the main configuration file (this file). It puts the pieces
-#   together by including all remaining configuration files when starting up the
-#   web server.
-#
-# * ports.conf is always included from the main configuration file. It is
-#   supposed to determine listening ports for incoming connections which can be
-#   customized anytime.
-#
-# * Configuration files in the mods-enabled/, conf-enabled/ and sites-enabled/
-#   directories contain particular configuration snippets which manage modules,
-#   global configuration fragments, or virtual host configurations,
-#   respectively.
-#
-#   They are activated by symlinking available configuration files from their
-#   respective *-available/ counterparts. These should be managed by using our
-#   helpers a2enmod/a2dismod, a2ensite/a2dissite and a2enconf/a2disconf. See
-#   their respective man pages for detailed information.
-#
-# * The binary is called apache2. Due to the use of environment variables, in
-#   the default configuration, apache2 needs to be started/stopped with
-#   /etc/init.d/apache2 or apache2ctl. Calling /usr/bin/apache2 directly will not
-#   work with the default configuration.
-
-
-# Global configuration
-#
-
-#
-# ServerRoot: The top of the directory tree under which the server's
-# configuration, error, and log files are kept.
-#
-# NOTE!  If you intend to place this on an NFS (or otherwise network)
-# mounted filesystem then please read the Mutex documentation (available
-# at <URL:http://httpd.apache.org/docs/2.4/mod/core.html#mutex>);
-# you will save yourself a lot of trouble.
-#
-# Do NOT add a slash at the end of the directory path.
-#
-#ServerRoot "/etc/apache2"
-
 #
 # The accept serialization lock file MUST BE STORED ON A LOCAL DISK.
 #

.deploy/docker/cronjob.conf

@@ -1,11 +0,0 @@
-[program:cron]
-command=/usr/sbin/cron -f -L 15
-user=root
-autostart=true
-autorestart=true
-stdout_events_enabled=true
-stderr_events_enabled=true
-stdout_logfile=/dev/stdout
-stdout_logfile_maxbytes=0
-startsecs=10
-startretries=3

.deploy/docker/docker.env

@@ -1,6 +0,0 @@
-FF_APP_ENV=local
-FF_APP_KEY=S0m3R@nd0mString0f32Ch@rsEx@ct1y
-FF_DB_HOST=
-FF_DB_NAME=
-FF_DB_USER=
-FF_DB_PASSWORD=

.deploy/docker/entrypoint.sh

@@ -1,13 +1,11 @@
 #!/bin/bash
 
 # make sure the correct directories exists (suggested by @chrif):
-mkdir -p $FIREFLY_PATH/storage/app
 mkdir -p $FIREFLY_PATH/storage/app/public
 mkdir -p $FIREFLY_PATH/storage/build
 mkdir -p $FIREFLY_PATH/storage/database
 mkdir -p $FIREFLY_PATH/storage/debugbar
 mkdir -p $FIREFLY_PATH/storage/export
-mkdir -p $FIREFLY_PATH/storage/framework/cache
 mkdir -p $FIREFLY_PATH/storage/framework/cache/data
 mkdir -p $FIREFLY_PATH/storage/framework/sessions
 mkdir -p $FIREFLY_PATH/storage/framework/testing
@@ -22,8 +20,8 @@ then
 fi
 
 # make sure we own the volumes:
-chown -R www-data:www-data -R $FIREFLY_PATH/storage
-chmod -R 775 $FIREFLY_PATH/storage
+chown -R www-data:www-data -R $FIREFLY_PATH
+chmod -R 775 $FIREFLY_PATH
 
 # remove any lingering files that may break upgrades:
 rm -f $FIREFLY_PATH/storage/logs/laravel.log
@@ -39,4 +37,5 @@ php artisan passport:install
 php artisan cache:clear
 
 php artisan firefly:instructions install
-exec /usr/bin/supervisord -c /etc/supervisor/supervisord.conf --nodaemon
+
+exec /bin/bash -c "source /etc/apache2/envvars && exec /usr/sbin/apache2 -DFOREGROUND"

.deploy/docker/firefly-iii.conf

@@ -1,6 +0,0 @@
-[program:apache2]
-command=/bin/bash -c "source /etc/apache2/envvars && exec /usr/sbin/apache2 -DFOREGROUND"
-stdout_events_enabled=true
-stderr_events_enabled=true
-stdout_logfile=/dev/stdout
-stdout_logfile_maxbytes=0

.deploy/docker/supervisord.conf

@@ -1,30 +0,0 @@
-# supervisor config file
-# Adapted from the config file distributed with the supervisor package on Debian
-# Jessie
-
-# Enable supervisord in non-daemon mode. Disable the logfile as we receive
-# log messages via stdout/err. Set up the child process log directory in case
-# the user doesn't set logging to stdout/err.
-[supervisord]
-nodaemon = true
-logfile = NONE
-pidfile = /var/run/supervisord.pid
-childlogdir = /var/log/supervisor
-loglevel=debug
-
-# Enable supervisorctl via RPC interface over Unix socket
-[unix_http_server]
-file = /var/run/supervisor.sock
-chmod = 0700
-
-[rpcinterface:supervisor]
-supervisor.rpcinterface_factory = supervisor.rpcinterface:make_main_rpcinterface
-
-[supervisorctl]
-serverurl = unix:///var/run/supervisor.sock
-
-
-# Include conf files for child processes
-# Debian/Ubuntu packages use /etc/supervisor/conf.d
-[include]
-files = /etc/supervisor/conf.d/*.conf