IntenseFinance/firefly-iii
3
0
Fork 0
mirror of https://github.com/firefly-iii/firefly-iii.git synced 2025-02-25 18:45:27 -06:00
Code Issues Packages Projects Releases Wiki Activity

Various improvements to Docker files.

Browse Source
This commit is contained in:
James Cole 2018-12-21 07:36:53 +01:00
parent 3c9c46d574
commit a8ff77addd
No known key found for this signature in database
GPG Key ID: C16961E655E74B5E
2 changed files with 11 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
.deploy/docker/entrypoint.sh
View File

@ -23,6 +23,15 @@ chmod -R 775 $FIREFLY_PATH/storage
chown -R www-data:www-data -R $FIREFLY_PATH/app chown -R www-data:www-data -R $FIREFLY_PATH/app
chmod -R 775 $FIREFLY_PATH/app chmod -R 775 $FIREFLY_PATH/app
chown -R www-data:www-data -R $FIREFLY_PATH/framework
chmod -R 775 $FIREFLY_PATH/framework
chown -R www-data:www-data -R $FIREFLY_PATH/logs
chmod -R 775 $FIREFLY_PATH/logs
chown -R www-data:www-data -R $FIREFLY_PATH/upload
chmod -R 775 $FIREFLY_PATH/upload
# remove any lingering files that may break upgrades: # remove any lingering files that may break upgrades:
rm -f $FIREFLY_PATH/storage/logs/laravel.log rm -f $FIREFLY_PATH/storage/logs/laravel.log
@ -36,6 +45,5 @@ php artisan firefly:verify
php artisan passport:install php artisan passport:install
php artisan cache:clear php artisan cache:clear
php artisan firefly:instructions install php artisan firefly:instructions install
exec /usr/bin/supervisord -c /etc/supervisor/supervisord.conf --nodaemon exec /usr/bin/supervisord -c /etc/supervisor/supervisord.conf --nodaemon

7
Dockerfile
View File

@ -87,11 +87,8 @@ RUN echo "en_US.UTF-8 UTF-8\nde_DE.UTF-8 UTF-8\nfr_FR.UTF-8 UTF-8\nit_IT.UTF-8 U
# copy Apache config to correct spot. # copy Apache config to correct spot.
COPY ./.deploy/docker/apache2.conf /etc/apache2/apache2.conf COPY ./.deploy/docker/apache2.conf /etc/apache2/apache2.conf
# Enable apache mod rewrite.. # Enable apache mod rewrite and mod ssl..
RUN a2enmod rewrite RUN a2enmod rewrite && a2enmod ssl
# Enable apache mod ssl..
RUN a2enmod ssl
# Create volumes # Create volumes
VOLUME $FIREFLY_PATH/storage/export $FIREFLY_PATH/storage/upload VOLUME $FIREFLY_PATH/storage/export $FIREFLY_PATH/storage/upload