diff --git a/odc_application_dockerfile.txt b/odc_application_dockerfile.txt index 9e17614..a24df4d 100644 --- a/odc_application_dockerfile.txt +++ b/odc_application_dockerfile.txt @@ -19,31 +19,28 @@ USER root RUN apk --no-cache add \ unzip \ sqlite \ - cronie \ - libcap \ php83-sqlite3 \ php83-pdo_sqlite #RUN mkdir /etc/service/crond \ -# && echo "#!/bin/sh" > /etc/service/crond/run \ -# && echo "exec 2>&1" >> /etc/service/crond/run \ -# && echo "exec crond -f" >> /etc/service/crond/run \ -# && chown -R nobody:nobody /etc/service/crond \ -# && chmod -R +x /etc/service/crond +# && echo "#!/bin/sh" > /etc/service/cron/run \ +# && echo "exec 2>&1" >> /etc/service/cron/run \ +# && echo "exec supercronic /var/crontab" >> /etc/service/cron/run \ +# && chown -R nobody:nobody /etc/service/cron \ +# && chmod -R +x /etc/service/cron -RUN chown nobody:nobody /usr/sbin/crond \ - && setcap cap_setgid=ep /usr/sbin/crond \ - && setcap cap_setuid=ep /usr/sbin/crond +RUN wget https://github.com/aptible/supercronic/releases/download/v0.2.33/supercronic-linux-amd64 -O /supercronic \ + && chmod +x /supercronic RUN wget https://git.h2-invent.com/Public-System-Design/Public-Helperscripts/raw/branch/main/distributed_cron.sh -O /distributed_cron.sh \ && chmod +x /distributed_cron.sh -RUN echo "# Docker Cron Jobs" > /etc/crontabs/nobody \ - && echo "SHELL=/bin/sh" >> /etc/crontabs/nobody \ - && echo "* * * * * curl http://localhost:8080/health/check > /dev/null > 2>&1" >> /etc/crontabs/nobody \ - && echo "0 1 * * * curl https://open-datenschutzcenter.de/health/check > /dev/null > 2>&1" >> /etc/crontabs/nobody \ - && echo "0 9 * * 1-5 /bin/sh /distributed_cron.sh '${WEBDIR}/data/cron_log' 'php ${WEBDIR}/bin/console app:cron' >/dev/null 2>&1" >> /etc/crontabs/nobody \ - && echo "" >> /etc/crontabs/nobody +RUN echo "# Docker Cron Jobs" > /var/crontab \ + && echo "SHELL=/bin/sh" >> /var/crontab \ + && echo "* * * * * data" >> /var/crontab \ + && echo "0 1 * * * curl https://open-datenschutzcenter.de/health/check" >> /var/crontab \ + && echo "0 9 * * 1-5 /bin/sh /distributed_cron.sh '${WEBDIR}/data/cron_log' 'php ${WEBDIR}/bin/console app:cron'" >> /var/crontab \ + && echo "" >> /var/crontab RUN echo "#!/bin/sh" > /docker-entrypoint-init.d/01-symfony.sh \ && echo "php ${WEBDIR}/bin/console cache:clear" >> /docker-entrypoint-init.d/01-symfony.sh \