kenmirrors/firefly-iii
1
0
Fork 0
mirror of https://github.com/firefly-iii/firefly-iii.git synced 2025-11-20 08:30:06 +00:00
Code Issues Projects Releases Wiki Activity

Fix call to cron job, clear cache after running.

Browse Source
This commit is contained in:
James Cole
2018-08-21 18:20:01 +02:00
parent 024cf610a8
commit cc234b594d
2 changed files with 9 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
Dockerfile
View File

@@ -9,6 +9,9 @@ ENV FIREFLY_PATH /var/www/firefly-iii/
ENV CURL_VERSION 7.60.0 ENV CURL_VERSION 7.60.0
ENV OPENSSL_VERSION 1.1.1-pre6 ENV OPENSSL_VERSION 1.1.1-pre6
LABEL version="1.0" maintainer="thegrumpydictator@gmail.com"
# install packages # install packages
RUN apt-get update -y && \ RUN apt-get update -y && \
apt-get install -y --no-install-recommends libcurl4-openssl-dev \ apt-get install -y --no-install-recommends libcurl4-openssl-dev \
@@ -64,8 +67,8 @@ COPY ./.deploy/docker/firefly-iii.conf /etc/supervisor/conf.d/firefly-iii.conf
COPY ./.deploy/docker/cronjob.conf /etc/supervisor/conf.d/cronjob.conf COPY ./.deploy/docker/cronjob.conf /etc/supervisor/conf.d/cronjob.conf
# test crons added via crontab # test crons added via crontab
RUN echo "0 3 * * * /usr/local/bin/php /var/www/firefly-iii/artisan firefly:cron >> /dev/stdout 2>&1" | crontab - RUN echo "0 3 * * * /usr/local/bin/php /var/www/firefly-iii/artisan firefly:cron" | crontab -
#RUN (crontab -l ; echo "*/1 * * * * free >> /var/www/firefly-iii/public/cron.html") 2>&1 | crontab -
# Install PHP exentions. # Install PHP exentions.
RUN docker-php-ext-install -j$(nproc) gd intl tidy zip bcmath pdo_mysql bz2 pdo_pgsql RUN docker-php-ext-install -j$(nproc) gd intl tidy zip bcmath pdo_mysql bz2 pdo_pgsql
@@ -75,6 +78,7 @@ RUN curl -sS https://getcomposer.org/installer | php -- --install-dir=/usr/local
# Generate locales supported by Firefly III # 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 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 Apache config to correct spot.
COPY ./.deploy/docker/apache2.conf /etc/apache2/apache2.conf COPY ./.deploy/docker/apache2.conf /etc/apache2/apache2.conf

3
app/Jobs/CreateRecurringTransactions.php
View File

@@ -119,6 +119,9 @@ class CreateRecurringTransactions implements ShouldQueue
} }
Log::debug('Done with handle()'); Log::debug('Done with handle()');
// clear cache:
app('preferences')->mark();
} }
/** /**