Skip to content

Slightly adjusted how ENVs are propagated to cron daemon #40

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
elsombrante merged 1 commit into from
Dec 13, 2022
Merged

Slightly adjusted how ENVs are propagated to cron daemon #40

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
24 changes: 12 additions & 12 deletions .env
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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=
8 changes: 4 additions & 4 deletions crontab/crontab
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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
1 change: 1 addition & 0 deletions docker-compose.simple-install.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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}
Expand Down
5 changes: 0 additions & 5 deletions docker-cron-entrypoint.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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 "$@"