use new s6-rc layout [skip CI]

.editorconfig

@@ -1,9 +0,0 @@
-root = true
-
-[*]
-end_of_line = lf
-charset = utf-8
-trim_trailing_whitespace = true
-insert_final_newline = true
-indent_style = space
-indent_size = 4

.gitlab-ci.yml

@@ -1,13 +1,18 @@
 variables:
-  IMAGE_NAME: thallian/postfix-ldap
+  CONTAINER_NAME: thallian/postfix
 
 build:
   stage: build
+  image:
+    name: gcr.io/kaniko-project/executor:debug
+    entrypoint: [""]
   script:
-    - docker login -u $DOCKER_USER -p $DOCKER_PASSWORD $DOCKER_REGISTRY
+    - mkdir -p /kaniko/.docker
-    - docker build -t $IMAGE_NAME:$CI_COMMIT_SHA .
+    - echo "{\"auths\":{\"$CI_REGISTRY\":{\"auth\":\"$(printf "%s:%s" "$CI_REGISTRY_USER" "$CI_REGISTRY_PASSWORD" | base64 | tr -d '\n')\"}}}" > /kaniko/.docker/config.json
-    - docker build -t $IMAGE_NAME:$CI_COMMIT_REF_NAME .
+    - >-
-    - docker build -t $IMAGE_NAME:latest .
+      /kaniko/executor
-    - docker push $IMAGE_NAME:$CI_COMMIT_SHA
+      --context "$CI_PROJECT_DIR"
-    - docker push $IMAGE_NAME:$CI_COMMIT_REF_NAME
+      --dockerfile "$CI_PROJECT_DIR/Dockerfile"
-    - docker push $IMAGE_NAME:latest
+      --destination "$CONTAINER_NAME:$CI_COMMIT_SHA"
+      --destination "$CONTAINER_NAME:$CI_COMMIT_REF_NAME"
+      --destination "$CONTAINER_NAME:latest"

Dockerfile

@@ -1,21 +1,5 @@
-FROM alpine:3.14 as builder
-
-RUN apk add --no-cache \
-    g++ \
-    make \
-    libmilter-dev \
-    spamassassin-client
-
-RUN mkdir /tmp/spamass-milter
-RUN wget -qO- https://download.savannah.gnu.org/releases/spamass-milt/spamass-milter-0.4.0.tar.gz | tar -xz -C /tmp/spamass-milter --strip 1
-WORKDIR /tmp/spamass-milter
-
-RUN ./configure && make
-
 FROM thallian/confd-env:latest
 
-COPY --from=builder /tmp/spamass-milter/spamass-milter /bin/spamass-milter
-
 RUN apk add --no-cache \
     postfix \
     postfix-pgsql \

README.md

@@ -16,6 +16,10 @@ create table if not exists virtual_aliases (
 	source text not null,
 	destination text not null
 );
+
+create table if not exists virtual_senders (
+	email text not null references virtual_users(email)
+);
 ```
 
 # Volumes

rootfs/bin/aliases

@@ -0,0 +1,4 @@
+#!/bin/sh
+set -e
+
+newaliases

rootfs/etc/cont-init.d/00-aliases

@@ -1,5 +0,0 @@
-#!/usr/bin/with-contenv sh
-set -e
-
-newaliases
-

rootfs/etc/s6-overlay/s6-rc.d/aliases/type

@@ -0,0 +1 @@
+oneshot

rootfs/etc/s6-overlay/s6-rc.d/aliases/up

@@ -0,0 +1 @@
+aliases

rootfs/etc/s6-overlay/s6-rc.d/postfix/dependencies

@@ -0,0 +1,2 @@
+confd
+aliases

rootfs/etc/s6-overlay/s6-rc.d/postfix/run

@@ -1,4 +1,4 @@
-#!/usr/bin/with-contenv sh
+#!/bin/sh
 
 mkdir -p /var/spool/postfix/etc
 cp /etc/resolv.conf /var/spool/postfix/etc/resolv.conf

rootfs/etc/s6-overlay/s6-rc.d/postfix/type

@@ -0,0 +1 @@
+longrun