Merge branch 's6' into 'master'

Use S6 instead of chaperone

See merge request ai/website!18

Dockerfile

@@ -19,7 +19,7 @@ COPY --from=gobuild /go/bin/sitesearch /usr/bin/sitesearch
 COPY --from=gobuild /go/bin/jsonsubst /usr/bin/jsonsubst
 RUN ./scripts/lint.sh && ./scripts/update.sh
 
-FROM registry.git.autistici.org/ai3/docker/apache2-base:master
+FROM registry.git.autistici.org/ai3/docker/apache2-base:s6
 COPY --from=build /src/public /var/www/autistici.org
 COPY --from=gobuild /go/bin/sitesearch /usr/sbin/sitesearch
 COPY --from=build /src/index /var/lib/sitesearch/index

docker/conf/chaperone.d/sitesearch.conf

-search.service: {
-  command: "/usr/sbin/sitesearch --index=/var/lib/sitesearch/index --templates=/var/lib/sitesearch/templates --http=127.0.0.1:3301",
-  restart: true,
-}
-

docker/conf/services.d/sitesearch/run

+#!/bin/sh
+
+exec /usr/sbin/sitesearch --index=/var/lib/sitesearch/index --templates=/var/lib/sitesearch/templates --http=127.0.0.1:3301

render-test/render_test.py

@@ -8,6 +8,7 @@ SCREENSHOTS = [
     ('/', 'home.png'),
     ('/about', 'about.png'),
     ('/donate', 'donate.png'),
+    ('/search?q=imap', 'search.png'),
 ]