Switch to s6 from chaperone for container

.gitignore

@@ -2,6 +2,6 @@ deploy/*
 .mypy_cache
 *.swp
 *.swo
-vpnweb
+./vpnweb
 public/*
 test/integration/sipcli/sipcli

Dockerfile

-FROM debian:buster AS build
-RUN apt-get -q update && env DEBIAN_FRONTEND=noninteractive apt-get install -y --no-install-recommends \
-    build-essential pkg-config golang-go git ca-certificates openvpn \
+FROM debian:bullseye AS build
+RUN apt-get -q update \
+  && env DEBIAN_FRONTEND=noninteractive apt-get install -qy --no-install-recommends \
+  build-essential \
+  pkg-config \
+  golang-go \
+  git \
+  ca-certificates \
+  openvpn \
+  && apt-get clean \
   && rm -rf /var/lib/apt/lists/*
 
-# don't need to do bash tricks to keep the layers small, as this is a multi-stage build
-ENV GOPATH=/go
-WORKDIR $GOPATH
-#RUN go get -u 0xacab.org/leap/vpnweb
+ADD . /src
+RUN cd /src && go build -o vpnweb && strip vpnweb
 
-COPY . /vpnweb
-RUN cd /vpnweb && go build
-RUN strip /vpnweb/vpnweb
+FROM registry.git.autistici.org/ai3/docker/s6-base
 
-FROM registry.git.autistici.org/ai3/docker/chaperone-base
-
-COPY --from=build /vpnweb/vpnweb /usr/local/bin/vpnweb
-COPY chaperone.d/ /etc/chaperone.d
-
-ENTRYPOINT ["/usr/local/bin/chaperone"]
+COPY --from=build /src/vpnweb /usr/local/bin/vpnweb
+COPY docker/conf /etc/

chaperone.d/vpnweb.conf

-vpnweb-server.service: {
-     command: "/bin/sh -c 'exec /usr/local/bin/vpnweb'",
-     exit_kills: false
-}

docker/conf/services.d/vpnweb/finish

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

docker/conf/services.d/vpnweb/run

+#!/bin/sh
+
+exec /usr/local/bin/vpnweb