From f4bc9263d97d55e811aeff383545fea7476105ba Mon Sep 17 00:00:00 2001 From: Jean-Philippe Roemer Date: Fri, 12 Feb 2016 02:38:18 +0000 Subject: [PATCH] Add the ability to run crond inside the Docker container - Add the crond init script for s6 - Add the RUN_CROND configuration variable to setup crond - Crond will not be run by default (hence the `down` file in the service directory) - `start.sh` check if RUN_CROND = "true" || "1" and remove this file to tell s6 to run the initscript - Resolves #2597 --- docker/s6/crond/down | 0 docker/s6/crond/run | 9 +++++++++ docker/start.sh | 9 +++++++++ 3 files changed, 18 insertions(+) create mode 100644 docker/s6/crond/down create mode 100755 docker/s6/crond/run diff --git a/docker/s6/crond/down b/docker/s6/crond/down new file mode 100644 index 0000000000..e69de29bb2 diff --git a/docker/s6/crond/run b/docker/s6/crond/run new file mode 100755 index 0000000000..9aa9fb9f27 --- /dev/null +++ b/docker/s6/crond/run @@ -0,0 +1,9 @@ +#!/bin/sh +# Crontabs are located by default in /var/spool/cron/crontabs/ +# The default configuration is also calling all the scripts in /etc/periodic/${period} + +if test -f ./setup; then + source ./setup +fi + +exec gosu root /usr/sbin/crond -fS diff --git a/docker/start.sh b/docker/start.sh index 042bdd05d5..a54c2a9bfd 100755 --- a/docker/start.sh +++ b/docker/start.sh @@ -48,6 +48,15 @@ else create_socat_links fi +CROND=$(echo "$RUN_CROND" | tr '[:upper:]' '[:lower:]') +if [ "$CROND" = "true" -o "$CROND" = "1" ]; then + echo "init:crond | Cron Daemon (crond) will be run as requested by s6" 1>&2 + rm -f /app/gogs/docker/s6/crond/down +else + # Tell s6 not to run the crond service + touch /app/gogs/docker/s6/crond/down +fi + # Exec CMD or S6 by default if nothing present if [ $# -gt 0 ];then exec "$@"