Merge branch 's6' into 'master'

Run with S6

See merge request !1

Dockerfile

-FROM registry.git.autistici.org/ai3/docker/chaperone-base:master
+FROM registry.git.autistici.org/ai3/docker/s6-base:master
 
 RUN apt-get -q update && \
     env DEBIAN_FRONTEND=noninteractive apt-get -qy install --no-install-recommends \
-        python3-flask python3-sqlalchemy python3-flask-sqlalchemy python3-flask-script
+        python3-flask python3-sqlalchemy python3-flask-sqlalchemy python3-flask-script \
+        python3-setuptools ca-certificates
 
 ADD . /tmp/src
 WORKDIR /tmp/src

conf/chaperone.d/feedbackloop.conf

-feedbackloop.service: {
-    command: "/bin/sh -c '/usr/local/bin/feedbackloop server --port=${PORT:-4099} --addr=${ADDR:-0.0.0.0}'",
-    exit_kills: true,
-}
-
-ingest.service: {
-    type: cron,
-    interval: "44 * * * *",
-    command: "/usr/local/bin/feedbackloop ingest",
-}
-
-expire.service: {
-    type: cron,
-    interval: "39 5 * * *",
-    command: "/usr/local/bin/feedbackloop expire --days=30",
-}

conf/services.d/expire/run

+#!/bin/sh
+
+period=${EXPIRE_PERIOD_SECS:-86400}
+offset=$(shuf -i 0-${period} -n 1)
+
+sleep $offset
+while true; do
+    /usr/local/bin/feedbackloop expire --days=30
+    sleep $period
+done

conf/services.d/feedbackloop/finish

+#!/usr/bin/execlineb -S0
+
+s6-svscanctl -t /var/run/s6/services

conf/services.d/feedbackloop/run

+#!/bin/sh
+exec /usr/local/bin/feedbackloop server --port=${PORT:-4099} --addr=${ADDR:-0.0.0.0}

conf/services.d/ingest/run

+#!/bin/sh
+
+period=${INGEST_PERIOD_SECS:-3600}
+offset=$(shuf -i 0-${period} -n 1)
+
+sleep $offset
+while true; do
+    /usr/local/bin/feedbackloop ingest
+    sleep $period
+done