Update docker files. #919 and #915

This commit is contained in:
James Cole
2017-10-11 08:16:57 +02:00
parent b6245d4b0b
commit bea0c8dd55
2 changed files with 2 additions and 5 deletions

View File

@@ -46,10 +46,7 @@ COPY . $FIREFLY_PATH
RUN chown -R www-data:www-data /var/www && chmod -R 775 $FIREFLY_PATH/storage
RUN composer install --prefer-dist --no-dev --no-scripts
RUN composer dump-autoload
RUN php artisan firefly:instructions install
RUN php artisan optimize
RUN composer install --prefer-dist --no-dev --no-scripts && cat .env.docker | envsubst > .env && composer dump-autoload && php artisan firefly:instructions install && php artisan optimize
EXPOSE 80

View File

@@ -1,5 +1,5 @@
#!/bin/bash
cat .env.docker | envsubst > .env
# cat .env.docker | envsubst > .env
exec apache2-foreground