Replace cron with supercronic (#185)

* Issue 183: replace cron with supercronic

* Issue 183: stop redirecting output of crontab jobs

* Issue 183: use the same entrypoint for app and job containers

* Issue 183: we now use the command override to specify the container role

* Issue 183: Implement recommendation from hadolint

* Issue 183: Apply recommendations from Copilot

---------

Co-authored-by: Robin Alexander <colisee@hotmail>

Author: colisee

.examples/docker/docker-compose-local.yml

@@ -22,8 +22,7 @@ services:
   cron:
     image: librebooking/librebooking:develop
     restart: always
-    user: root
-    entrypoint: /usr/local/bin/cron.sh
+    command: supercronic /config/lb-jobs-cron
     depends_on:
       - app
     volumes:

.examples/docker/docker-compose-public.yml

@@ -58,8 +58,7 @@ services:
     restart: always
     depends_on:
       - lb1
-    user: root
-    entrypoint: /usr/local/bin/cron.sh
+    command: supercronic /config/lb-jobs-cron
     volumes:
       - lb1_conf:/config
     env_file:
@@ -89,8 +88,7 @@ services:
     restart: always
     depends_on:
       - lb2
-    user: root
-    entrypoint: /usr/local/bin/cron.sh
+    command: supercronic /config/lb-jobs-cron
     volumes:
       - lb2_conf:/config
     env_file:

Dockerfile

@@ -21,6 +21,16 @@ fi
 rm -rf .git
 EORUN
 
+# Build supercronic
+FROM golang:trixie AS supercronic
+ADD https://github.com/aptible/supercronic.git#v0.2.44 src
+WORKDIR /go/src
+RUN <<EORUN
+set -eux
+go mod vendor
+go install
+EORUN
+
 FROM php:${VERSION_PHP}-apache
 # Labels
 LABEL org.opencontainers.image.title="LibreBooking"
@@ -40,6 +50,10 @@ COPY --chown=www-data:www-data --chmod=0755 \
 # Copy composer
 COPY --from=comp /usr/bin/composer /usr/bin/composer
 
+# Copy supercronic
+COPY --from=supercronic \
+     /go/bin/supercronic /usr/local/bin/supercronic
+
 # Copy Librebooking
 COPY --from=upstream \
      --chown=www-data:root --chmod=0775 \

RUN.md

@@ -60,10 +60,7 @@ scheduler. For a full list of background jobs, checkout the
 The background jobs can either be handled by the:
 
 * Container itself, by running a separate `librebooking/librebooking` container
-where the:
-
-  * user is set to `root`
-  * entrypoint is set to `cron.sh`
+where the command is set to `supercronic /config/lb-jobs-cron`
 
 * Host running the container, by calling the desired script, as in
 

bin/cron.sh

@@ -1,6 +1,6 @@
-* * * * * /usr/local/bin/php -f /var/www/html/Jobs/autorelease.php > /dev/stdout 2>&1
-* * * * * /usr/local/bin/php -f /var/www/html/Jobs/sendmissedcheckin.php > /dev/stdout 2>&1
-* * * * * /usr/local/bin/php -f /var/www/html/Jobs/sendreminders.php > /dev/stdout 2>&1
-0 0 * * * /usr/local/bin/php -f /var/www/html/Jobs/sendseriesend.php > /dev/stdout 2>&1
-* * * * * /usr/local/bin/php -f /var/www/html/Jobs/sendwaitlist.php > /dev/stdout 2>&1
-0 0 * * * /usr/local/bin/php -f /var/www/html/Jobs/sessioncleanup.php > /dev/stdout 2>&1
+* * * * * /usr/local/bin/php -f /var/www/html/Jobs/autorelease.php
+* * * * * /usr/local/bin/php -f /var/www/html/Jobs/sendmissedcheckin.php
+* * * * * /usr/local/bin/php -f /var/www/html/Jobs/sendreminders.php
+0 0 * * * /usr/local/bin/php -f /var/www/html/Jobs/sendseriesend.php
+* * * * * /usr/local/bin/php -f /var/www/html/Jobs/sendwaitlist.php
+0 0 * * * /usr/local/bin/php -f /var/www/html/Jobs/sessioncleanup.php

lb-jobs-cron

@@ -12,7 +12,6 @@ set -x
 apt-get update
 apt-get upgrade --yes
 apt-get install --yes --no-install-recommends \
-  cron \
   libjpeg-dev \
   libldap-dev \
   libpng-dev \