diff --git a/backups/rsyncvolumes/Dockerfile b/backups/rsyncvolumes/Dockerfile index 7c6198f..845c0f0 100644 --- a/backups/rsyncvolumes/Dockerfile +++ b/backups/rsyncvolumes/Dockerfile @@ -7,6 +7,9 @@ ENV DEST /var/backups/ RUN apt-get update && apt-get install --no-install-recommends -y \ cron gettext-base rsync python-minimal libpython-stdlib +# Avoid overlayfs bug with tail +VOLUME /var/log + COPY crontab /etc/crontab RUN chmod 644 /etc/crontab diff --git a/backups/rsyncvolumes/crontab b/backups/rsyncvolumes/crontab index 71306ea..bd6c0bd 100644 --- a/backups/rsyncvolumes/crontab +++ b/backups/rsyncvolumes/crontab @@ -1,5 +1,6 @@ # hourly backup # m h dom mon dow user command -15 * * * * root /bin/bash /opt/backup/rsync.sh > /proc/1/fd/1 2>/proc/1/fd/2 -0 3 * * * root /usr/bin/python /opt/backup/plan.py > /proc/1/fd/1 2>/proc/1/fd/2 +15 * * * * root /bin/bash /opt/backup/rsync.sh >> /var/log/cron.log 2>&1 +0 3 * * * root /usr/bin/python /opt/backup/plan.py >> /var/log/cron.log 2>&1 # empty line needed + diff --git a/backups/rsyncvolumes/launch.sh b/backups/rsyncvolumes/launch.sh index 7c4b5c7..29ad6bc 100644 --- a/backups/rsyncvolumes/launch.sh +++ b/backups/rsyncvolumes/launch.sh @@ -2,4 +2,4 @@ envsubst < /opt/backup/rsync.template > /opt/backup/rsync.sh envsubst < /opt/backup/plan.tpl.py > /opt/backup/plan.py -cron -f +touch /var/log/cron.log && cron && tail -f /var/log/cron.log diff --git a/odoo/backups/Dockerfile b/odoo/backups/Dockerfile index 87dd09d..ab9e538 100644 --- a/odoo/backups/Dockerfile +++ b/odoo/backups/Dockerfile @@ -10,6 +10,9 @@ USER root RUN mkdir backups RUN apt-get install -y --no-install-recommends cron gettext-base +# Avoid overlayfs bug with tail +VOLUME /var/log + COPY crontab /etc/crontab RUN chmod 644 /etc/crontab diff --git a/odoo/backups/crontab b/odoo/backups/crontab index 8eebfbc..7b0c140 100644 --- a/odoo/backups/crontab +++ b/odoo/backups/crontab @@ -1,5 +1,6 @@ # daily odoo backup # m h dom mon dow user command -0 2 * * * odoo /bin/bash /home/odoo/backup.sh > /proc/1/fd/1 2>/proc/1/fd/2 -10 2 * * * odoo /usr/bin/python /home/odoo/plan.py /proc/1/fd/1 2>/proc/1/fd/2 +0 2 * * * odoo /bin/bash /home/odoo/backup.sh >> /var/log/cron.log 2>&1 +10 2 * * * odoo /usr/bin/python /home/odoo/plan.py >> /var/log/cron.log 2>&1 # empty line required at the end of this file for a valid cron file. + diff --git a/odoo/backups/launch.sh b/odoo/backups/launch.sh index 558e464..098b975 100644 --- a/odoo/backups/launch.sh +++ b/odoo/backups/launch.sh @@ -2,4 +2,4 @@ envsubst < /home/odoo/backup.template > /home/odoo/backup.sh chown odoo:odoo /home/odoo/backup.sh -cron -f +touch /var/log/cron.log && cron && tail -f /var/log/cron.log