Merge pull request #113 from joffilyfe/access-crontab

Adiciona crontab ao nível do container, remove bloqueio de urls relacionadas ao cache e atualiza banco de cache durante build

.gitignore

@@ -36,8 +36,10 @@ user_guide_src/cilexer/pycilexer.egg-info/*
 node_modules/
 
 # CSS Files
-static/style.css
-static/style.css.map
+static/css/style.css
+static/css/style.css.map
+static/css/journal-print.css
+static/css/journal-print.css.map
 
 # JavaScript
 static/js/scielo-min.js

.htaccess

@@ -3,6 +3,5 @@ RewriteEngine on
 RewriteCond %{REQUEST_FILENAME} !-f
 RewriteCond %{REQUEST_FILENAME} !-d
 RewriteCond $1 !^(index\.php|images|css|javascript|rte|robots\.txt)
-RewriteCond $1 !cache_util
 RewriteRule ^(.*)$ index.php?$1 [L,QSA]
 </IfModule>

Dockerfile

@@ -14,7 +14,7 @@ FROM ubuntu:18.04
 RUN apt-get update && \
     DEBIAN_FRONTEND=noninteractive apt-get -y install apache2 \
       libapache2-mod-php php-gd php-curl php-memcached curl python-setuptools \
-	  python-pip php-sqlite3 php-xml  php-mbstring php-cli && \
+	  python-pip php-sqlite3 php-xml  php-mbstring php-cli cron && \
 	rm -rf /var/lib/apt/lists/* && \
 	pip install supervisor
 
@@ -35,6 +35,7 @@ ENV CI_ENV production
 
 ADD . /var/www/site/
 COPY --from=buildstatic /app/static/ /var/www/site/static/
+COPY docker/application-cron /etc/cron.d/application-cron
 
 ADD docker/apache-config.conf /etc/apache2/sites-enabled/000-default.conf
 ADD docker/foreground.sh /etc/apache2/foreground.sh
@@ -44,6 +45,11 @@ RUN chmod -R 0777 /var/www/site/application/cache
 RUN chmod 755 /etc/apache2/foreground.sh
 RUN mkdir /var/log/supervisor/
 
+RUN chmod 0644 /etc/cron.d/application-cron
+RUN crontab /etc/cron.d/application-cron
+
+RUN php /var/www/site/index.php cache_util update_database
+
 WORKDIR /var/www/site
 EXPOSE 80
 CMD ["supervisord" , "-n", "-c", "/etc/supervisord.conf"]

docker/application-cron

@@ -0,0 +1,2 @@
+*/60 * * * * echo Cleaning application cache > /proc/1/fd/1 && php /var/www/site/index.php cache_util clean_cache >&1
+0 3 * * 1,5 echo Updating application database > /proc/1/fd/1 && php /var/www/site/index.php cache_util update_database >&1

docker/supervisord.conf

@@ -154,3 +154,7 @@ startretries=10
 ;autorestart=true
 ;priority=300
 
+[program:cron]
+command = cron -f
+autostart=true
+autorestart=true