summaryrefslogtreecommitdiff
path: root/sto-tug-kvm2.swamid.se/overlay
diff options
context:
space:
mode:
authorJohan Lundberg <lundberg@nordu.net>2015-04-07 18:10:31 +0200
committerJohan Lundberg <lundberg@nordu.net>2015-04-07 18:10:31 +0200
commitf956e753f6d3c21ff1b9ada967e379c1cc278d6f (patch)
tree153d98a4c628e851dc3129e704a5ed8c5588d07e /sto-tug-kvm2.swamid.se/overlay
parent688e27ff245665ced64e0723237634ef4ba056da (diff)
Seems like docker behaves badly when being runned from cron without "-it -a stdout -a stderr".sunet-ops-2015-04-07-v02
Diffstat (limited to 'sto-tug-kvm2.swamid.se/overlay')
-rw-r--r--sto-tug-kvm2.swamid.se/overlay/etc/cron.d/flog_daily4
1 files changed, 2 insertions, 2 deletions
diff --git a/sto-tug-kvm2.swamid.se/overlay/etc/cron.d/flog_daily b/sto-tug-kvm2.swamid.se/overlay/etc/cron.d/flog_daily
index fab47df..0759dca 100644
--- a/sto-tug-kvm2.swamid.se/overlay/etc/cron.d/flog_daily
+++ b/sto-tug-kvm2.swamid.se/overlay/etc/cron.d/flog_daily
@@ -2,6 +2,6 @@
0 23 * * * root /usr/local/bin/scriptherder --mode wrap --name flog_update_institutions -- /usr/bin/curl https://meta.eduroam.se/institution.xml -so /opt/flog/institution.xml
1 0 * * * root /usr/local/bin/scriptherder --mode wrap --syslog --name flog_db_backup -- /usr/local/bin/postgres_backup
# Run aggregation and caching for eduroam data
-20 0 * * * root /usr/local/bin/scriptherder --mode wrap --name flog_daily_eduroam -- /usr/bin/docker run --rm -v /opt/flog/dotenv:/opt/flog/.env -v /var/log/flog_cron/:/opt/flog/logs/ -v /opt/flog/institution.xml:/opt/flog/institution.xml -v /opt/flog/dotenv:/opt/flog/.env -v /etc/passwd:/etc/passwd:ro -v /etc/group:/etc/group:ro --link flog_db:flog_db.docker docker.sunet.se/flog/flog_app /bin/sh -e /usr/local/bin/daily_eduroam
+20 0 * * * root /usr/local/bin/scriptherder --mode wrap --name flog_daily_eduroam -- /usr/bin/docker run --rm -it -a stdout -a stderr -v /opt/flog/dotenv:/opt/flog/.env -v /var/log/flog_cron/:/opt/flog/logs/ -v /opt/flog/institution.xml:/opt/flog/institution.xml -v /opt/flog/dotenv:/opt/flog/.env -v /etc/passwd:/etc/passwd:ro -v /etc/group:/etc/group:ro --link flog_db:flog_db.docker docker.sunet.se/flog/flog_app /bin/sh -e /usr/local/bin/daily_eduroam
# Run aggregation and caching for sso data
-25 0 * * * root /usr/local/bin/scriptherder --mode wrap --name flog_daily_sso -- /usr/bin/docker run --rm -v /opt/flog/dotenv:/opt/flog/.env -v /var/log/flog_cron/:/opt/flog/logs/ -v /opt/flog/dotenv:/opt/flog/.env -v /etc/passwd:/etc/passwd:ro -v /etc/group:/etc/group:ro --link flog_db:flog_db.docker docker.sunet.se/flog/flog_app /bin/sh -e /usr/local/bin/daily_sso
+25 0 * * * root /usr/local/bin/scriptherder --mode wrap --name flog_daily_sso -- /usr/bin/docker run --rm -it -a stdout -a stderr -v /opt/flog/dotenv:/opt/flog/.env -v /var/log/flog_cron/:/opt/flog/logs/ -v /opt/flog/dotenv:/opt/flog/.env -v /etc/passwd:/etc/passwd:ro -v /etc/group:/etc/group:ro --link flog_db:flog_db.docker docker.sunet.se/flog/flog_app /bin/sh -e /usr/local/bin/daily_sso