Merge branch 's6' into 'master'

Use S6 instead of chaperone

See merge request !5

Dockerfile

@@ -5,8 +5,7 @@ FROM registry.git.autistici.org/ai3/tools/smtpd-pipe:master AS smtpd
 FROM registry.git.autistici.org/ai3/tools/sendmail-go:master AS sendmail
 
 # Stage 2: build the final container
-FROM registry.git.autistici.org/ai3/docker/apache2-base:master
-COPY start.sh /start.sh
+FROM registry.git.autistici.org/ai3/docker/apache2-base:s6
 COPY build.sh /tmp/build.sh
 COPY conf/ /etc/
 RUN /tmp/build.sh && rm /tmp/build.sh

build.sh

@@ -45,8 +45,8 @@ install_packages ${BUILD_PACKAGES} ${PACKAGES} \
     || die "could not install packages"
 
 # Install some useful RT extensions.
-perl -MCPAN -e 'install RT::Extension::ExtractCustomFieldValues ' </dev/null
-perl -MCPAN -e 'install RT::Extension::CommandByMail ' </dev/null
+env http_proxy= perl -MCPAN -e 'install RT::Extension::ExtractCustomFieldValues ' </dev/null
+env http_proxy= perl -MCPAN -e 'install RT::Extension::CommandByMail ' </dev/null
 
 # Enable the apache modules we need, and our rt4-fcgi config.
 a2enmod -q ${APACHE_MODULES_ENABLE}

conf/chaperone.d/smtpd.conf

-smtpd.service: {
-    command: "/usr/bin/smtpd",
-    exit_kills: true,
-    env_set: {"LANG": "C", "LC_ALL": "C", "LC_CTYPE": "C"},
-}
-

conf/chaperone.d/start.conf

-rt4_setup.service: {
-    type: oneshot,
-    stdout: inherit,
-    service_groups: INIT,
-    process_timeout: 1800,
-    command: "/start.sh",
-    env_set: {"LANG": "C", "LC_ALL": "C", "LC_CTYPE": "C"},
-}

start.sh → conf/cont-init.d/90rt4-setup

@@ -8,6 +8,8 @@
 # directories are correctly symlinked to $static_dir.
 #
 
+export LANG=C LC_ALL=C LC_CTYPE=C
+
 # Get the upstream version from the Debian package, keeping
 # just the N.N.N part.
 RT_VERSION=$(dpkg-query --show \

conf/services.d/smtpd/finish

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

conf/services.d/smtpd/run

+#!/bin/sh
+export LANG=C LC_ALL=C LC_CTYPE=C
+exec /usr/bin/smtpd