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,19 @@
 variables:
-    IMAGE_NAME: thallian/dovecot-ldap
+  CONTAINER_NAME: thallian/dovecot
 
 build:
-    stage: build
+  stage: build
-    script:
+  image:
-        - docker login -u $DOCKER_USER -p $DOCKER_PASSWORD $DOCKER_REGISTRY
+    name: gcr.io/kaniko-project/executor:debug
-        - docker build -t $IMAGE_NAME:$CI_COMMIT_SHA .
+    entrypoint: [""]
-        - docker build -t $IMAGE_NAME:$CI_COMMIT_REF_NAME .
+  script:
-        - docker build -t $IMAGE_NAME:latest .
+    - mkdir -p /kaniko/.docker
-        - docker push $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 push $IMAGE_NAME:$CI_COMMIT_REF_NAME
+    - >-
-        - docker push $IMAGE_NAME:latest
+      /kaniko/executor
+      --cache=false
+      --context "$CI_PROJECT_DIR"
+      --dockerfile "$CI_PROJECT_DIR/Dockerfile"
+      --destination "$CONTAINER_NAME:$CI_COMMIT_SHA"
+      --destination "$CONTAINER_NAME:$CI_COMMIT_REF_NAME"
+      --destination "$CONTAINER_NAME:latest"

Dockerfile

@@ -16,15 +16,15 @@ RUN apk --no-cache add \
     icu-dev \
     inotify-tools-dev
 
-ENV SHA256_SUM_DOVECOT=1c67ccccdc81a75007c01dedc02ad608c4d856c60a6b89b9cd246e79f72aa2b8
+ENV SHA256_SUM_DOVECOT=06e73f668c6c093c45bdeeeb7c20398ab8dc49317234f4b5781ac5e2cc5d6c33
-ENV DOVECOT_FILENAME=dovecot-2.3.17.1.tar.gz
+ENV DOVECOT_FILENAME=dovecot-2.3.18.tar.gz
 RUN wget https://www.dovecot.org/releases/2.3/$DOVECOT_FILENAME
 RUN echo "$SHA256_SUM_DOVECOT  $DOVECOT_FILENAME" | sha256sum -c - || exit 1
 RUN mkdir /tmp/dovecot
 RUN tar xzf $DOVECOT_FILENAME -C /tmp/dovecot --strip 1
 
-ENV SHA256_SUM_PIGEONHOLE=3cc4a3de6d7e27bd99ac59b99faa161287f78167272699a22591798ffcf84512
+ENV SHA256_SUM_PIGEONHOLE=a6d828f8d6f2decba5105343ece5c7a65245bd94e46a8ae4432a6d97543108a5
-ENV PIGEONHOLE_FILENAME=dovecot-2.3-pigeonhole-0.5.17.1.tar.gz
+ENV PIGEONHOLE_FILENAME=dovecot-2.3-pigeonhole-0.5.18.tar.gz
 RUN wget https://pigeonhole.dovecot.org/releases/2.3/$PIGEONHOLE_FILENAME
 RUN echo "$SHA256_SUM_PIGEONHOLE  $PIGEONHOLE_FILENAME" | sha256sum -c - || exit 1
 RUN mkdir /tmp/pigeonhole

rootfs/bin/sieve-rules

@@ -1,3 +1,3 @@
-#!/usr/bin/with-contenv sh
+#!/bin/sh
 
 s6-setuidgid vmail sievec /var/lib/vmail/sieve-after/spam.sieve

rootfs/etc/fix-attrs.d/00-mails

@@ -1 +0,0 @@
-/var/lib/vmail/mail true vmail 0640 0750

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

@@ -0,0 +1,2 @@
+confd
+sieve-rules

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

@@ -0,0 +1,3 @@
+#!/bin/sh
+
+exec dovecot -F

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

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

rootfs/etc/s6-overlay/s6-rc.d/sieve-rules/type

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

rootfs/etc/s6-overlay/s6-rc.d/sieve-rules/up

@@ -0,0 +1 @@
+sieve-rules

rootfs/etc/services.d/dovecot/run

@@ -1,3 +0,0 @@
-#!/usr/bin/with-contenv sh
-
-exec dovecot -F