Fix docker and entry point.

.deploy/docker/entrypoint.sh

@@ -16,7 +16,7 @@ mkdir -p $FIREFLY_PATH/storage/upload
 
 
 # make sure we own the volumes:
-chown -R $APPLICATION_GID:$APPLICATION_UID -R $FIREFLY_PATH/storage
+chown -R www-data:www-data -R $FIREFLY_PATH/storage
 chmod -R 775 $FIREFLY_PATH/storage
 
 # remove any lingering files that may break upgrades:

.env.docker

@@ -35,12 +35,12 @@ APP_LOG_LEVEL=notice
 
 # Database credentials. Make sure the database exists. I recommend a dedicated user for Firefly III
 # For other database types, please see the FAQ: http://firefly-iii.readthedocs.io/en/latest/support/faq.html
-DB_CONNECTION=mysql
+DB_CONNECTION=${FF_DB_CONNECTION}
-DB_HOST=127.0.0.1
+DB_HOST=${FF_DB_HOST}
-DB_PORT=3306
+DB_PORT=${FF_DB_PORT}
-DB_DATABASE=homestead
+DB_DATABASE=${FF_DB_NAME}
-DB_USERNAME=homestead
+DB_USERNAME=${FF_DB_USER}
-DB_PASSWORD=secret
+DB_PASSWORD=${FF_DB_PASSWORD}
 
 # If you're looking for performance improvements, you could install memcached.
 CACHE_DRIVER=file

Dockerfile

@@ -82,7 +82,7 @@ VOLUME $FIREFLY_PATH/storage/export $FIREFLY_PATH/storage/upload
 COPY ./.deploy/docker/apache-firefly.conf /etc/apache2/sites-available/000-default.conf
 
 # Make sure we own Firefly III directory
-RUN chown -R $APPLICATION_GID:$APPLICATION_UID /var/www && chmod -R 775 $FIREFLY_PATH/storage
+RUN chown -R www-data:www-data /var/www && chmod -R 775 $FIREFLY_PATH/storage
 
 # Copy in Firefly Source
 WORKDIR $FIREFLY_PATH

docker-compose.yml

@@ -12,7 +12,7 @@ services:
       - FF_APP_KEY=S0m3R@nd0mStr1ngOf32Ch@rsEx@ctly
       - FF_APP_ENV=local
       - TZ=Europe/Amsterdam
-    image: jc5x/firefly-iii
+    image: jc5x/firefly-iii:develop
     links: 
       - firefly_iii_db
     networks: