.drone.yml

@@ -0,0 +1,53 @@
+---
+kind: pipeline
+name: default
+
+steps:
+  - name: build and publish image
+    image: plugins/docker
+    settings:
+      repo: eumau/dovecot
+      auto_tag: true
+      username:
+        from_secret: dockerhub_username
+      password:
+        from_secret: dockerhub_password
+    when:
+      branch:
+        - master
+
+---
+kind: pipeline
+name: pull_request
+
+steps:
+  - name: build image only
+    image: plugins/docker
+    settings:
+      repo: eumau/dovecot
+      auto_tag: true
+      dry_run: true
+
+trigger:
+  event:
+    - pull_request
+
+---
+kind: pipeline
+name: tags
+
+steps:
+  - name: docker
+    image: plugins/docker
+    settings:
+      repo: eumau/dovecot
+      username:
+        from_secret: dockerhub_username
+      password:
+        from_secret: dockerhub_password
+      tags:
+        - ${DRONE_TAG}
+
+trigger:
+  event:
+    - tag

.gitea/workflows/build.yml

@@ -1,38 +0,0 @@
-name: Build Docker images
-
-on:
-  push:
-    branches:
-      - main
-  workflow_dispatch:
-
-jobs:
-  docker:
-    runs-on: ubuntu-latest
-    strategy:
-      fail-fast: true
-      matrix:
-        repo:
-          - "eumau/dovecot"
-        tag:
-          - "4"
-    steps:
-      -
-        name: Set up QEMU
-        uses: docker/setup-qemu-action@v3
-      -
-        name: Set up Docker Buildx
-        uses: docker/setup-buildx-action@v3
-      -
-        name: Login to Docker Hub
-        uses: docker/login-action@v3
-        with:
-          username: ${{ secrets.DOCKERHUB_USERNAME }}
-          password: ${{ secrets.DOCKERHUB_TOKEN }}
-      -
-        name: Build and push image
-        uses: docker/build-push-action@v5
-        with:
-          push: true
-          tags: ${{ matrix.repo }}:${{ matrix.tag }}
-          platforms: linux/amd64,linux/arm64

Dockerfile

@@ -1,4 +1,4 @@
-FROM eumau/debian:bookworm-slim
+FROM eumau/debian:bullseye-slim
 LABEL maintainer "Mauro Torrez <mauro@mau.ro>"
 ARG DEBIAN_FRONTEND=noninteractive
 ENV LC_ALL C
@@ -60,7 +60,6 @@ ENV \
   SINGLE_USER= \
   ANTISPAM_ENABLE=yes \
   SIEVE_ENABLE=yes \
-  MANAGESIEVE_ENABLE=yes \
   IMAP_URLAUTH_HOST="*" \
   SSL_CLIENT_CA_DIR="/etc/ssl/certs" \
   SSL_CLIENT_CA_FILE= \
@@ -73,5 +72,5 @@ ADD junk-filter.sieve /etc/dovecot/sieve/before/
 ADD sievec /start.d/
 
 VOLUME ["/ssl","/vmail"]
-EXPOSE 110/tcp 143/tcp 587/tcp 993/tcp 995/tcp 4190/tcp
+EXPOSE 110/tcp 143/tcp 587/tcp 993/tcp 995/tcp 2000/tcp
 CMD ["dovecot","-F"]

confd/conf.d/managesieve.toml

@@ -1,6 +0,0 @@
-[template]
-src = "20-managesieve.conf.tmpl"
-dest = "/etc/dovecot/local.d/20-managesieve.conf"
-keys = [
-    "/managesieve/enable",
-]

confd/templates/20-managesieve.conf.tmpl

@@ -1,14 +0,0 @@
-# enable managesieve protocol
-protocols = $protocols {{ if eq (getv "/managesieve/enable") "yes" }}sieve{{ end }}
-
-service managesieve-login {
-  inet_listener sieve {
-    port = 4190
-  }
-}
-
-service managesieve {
-}
-
-protocol sieve {
-}

confd/templates/90-sieve.conf.tmpl

@@ -1,12 +1,10 @@
 plugin {
-  sieve = file:~/sieve;active=~/.dovecot.sieve
+  sieve_plugins = {{ if eq (getv "/sieve/enable") "yes" }}sieve_imapsieve{{ if eq (getv "/antispam/enable") "yes" }} sieve_extprograms{{ end }}{{ end }}
 
   sieve_before = /etc/dovecot/sieve/before
   sieve_after = /etc/dovecot/sieve/after
 
   {{ if eq (getv "/antispam/enable") "yes" }}
-  sieve_plugins = sieve_imapsieve sieve_extprograms
-
   sieve_global_extensions = +vnd.dovecot.pipe +vnd.dovecot.environment
   sieve_pipe_bin_dir = /etc/dovecot/sieve
 

spamtrain.sh

@@ -3,13 +3,11 @@
 # arg 1 - spam or ham
 
 if [ "$1" == "ham" ]; then
-  /usr/bin/bogofilter -d /vmail/bogofilter -p -Sn
+  /usr/bin/bogofilter -d /vmail/bogofilter -e -p -Sn
   exit 0
 fi
 
 if [ "$1" == "spam" ]; then
-  /usr/bin/bogofilter -d /vmail/bogofilter -p -Ns
+  /usr/bin/bogofilter -d /vmail/bogofilter -e -p -Ns
   exit 0
 fi
-
-exit 1