Merge pull request #40 from eramba/fixes-for-conflict-with-eramba-files

Slightly adjusted how ENVs are propagated to cron daemon

.env

@@ -1,12 +1,12 @@
-DB_HOST="mysql"
-DB_DATABASE="docker"
-DB_USERNAME="docker"
-DB_PASSWORD="Your_DB_user_P@ssw0rd"
-CACHE_URL="Redis://?server=redis&port=6379&password=&timeout=3"
-MYSQL_ROOT_PASSWORD="Your_MysQl_ROOt_P@ssw0rd"
-USE_PROXY="0"
-PROXY_HOST=""
-PROXY_PORT=""
-USE_PROXY_AUTH="0"
-PROXY_AUTH_USER=""
-PROXY_AUTH_PASS=""
+DB_HOST=mysql
+DB_DATABASE=docker
+DB_USERNAME=docker
+DB_PASSWORD=Your_DB_user_P@ssw0rd
+CACHE_URL=Redis://?server=redis&port=6379&password=&timeout=3
+MYSQL_ROOT_PASSWORD=Your_MysQl_ROOt_P@ssw0rd
+USE_PROXY=0
+PROXY_HOST=
+PROXY_PORT=
+USE_PROXY_AUTH=0
+PROXY_AUTH_USER=
+PROXY_AUTH_PASS=

crontab/crontab

@@ -1,5 +1,5 @@
-@hourly export $(cat /var/www/eramba/.env) && /bin/sh /var/www/eramba/app/upgrade/bin/cake cron job hourly >> /var/log/cron.log 2>&1
-@daily export $(cat /var/www/eramba/.env) && /bin/sh /var/www/eramba/app/upgrade/bin/cake cron job daily >> /var/log/cron.log 2>&1
-@yearly export $(cat /var/www/eramba/.env) && /bin/sh /var/www/eramba/app/upgrade/bin/cake cron job yearly >> /var/log/cron.log 2>&1
-* * * * * export $(cat /var/www/eramba/.env) && /bin/sh /var/www/eramba/app/upgrade/bin/cake queue run -v >> /var/log/cron.log 2>&1
+@hourly export $(cat /var/www/docker.env) && /bin/sh /var/www/eramba/app/upgrade/bin/cake cron job hourly >> /var/log/cron.log 2>&1
+@daily export $(cat /var/www/docker.env) && /bin/sh /var/www/eramba/app/upgrade/bin/cake cron job daily >> /var/log/cron.log 2>&1
+@yearly export $(cat /var/www/docker.env) && /bin/sh /var/www/eramba/app/upgrade/bin/cake cron job yearly >> /var/log/cron.log 2>&1
+* * * * * export $(cat /var/www/docker.env) && /bin/sh /var/www/eramba/app/upgrade/bin/cake queue run -v >> /var/log/cron.log 2>&1
 # remember to end this file with an empty new line

docker-compose.simple-install.yml

@@ -61,6 +61,7 @@ services:
       - logs:/var/www/eramba/app/upgrade/logs
       - ./docker-cron-entrypoint.sh:/docker-cron-entrypoint.sh
       - ./crontab/crontab:/etc/cron.d/eramba-crontab
+      - .env:/var/www/docker.env
     environment:
       DB_HOST: ${DB_HOST}
       DB_DATABASE: ${DB_DATABASE}

docker-cron-entrypoint.sh

@@ -1,10 +1,5 @@
 #!/bin/sh
 
-su -s /bin/bash -c "printenv | grep DB_ > /var/www/eramba/.env" www-data
-su -s /bin/bash -c "printenv | grep CACHE_URL >> /var/www/eramba/.env" www-data
-su -s /bin/bash -c "printenv | grep USE_PROXY >> /var/www/eramba/.env" www-data
-su -s /bin/bash -c "printenv | grep PROXY_ >> /var/www/eramba/.env" www-data
-
 su -s /bin/bash -c "crontab -u www-data /etc/cron.d/eramba-crontab" www-data
 
 exec docker-php-entrypoint "$@"