Merge branch 'main' into feat/search

tests/instrumentation/docker-compose.yml

@@ -20,3 +20,10 @@ services:
       - "/dev/log:/dev/log"
     ports:
       - "143:143/tcp"
+
+  courier:
+    build:
+      context: ./docker/courier/
+    image: courier
+    ports:
+      - "144:143/tcp"

tests/instrumentation/docker/courier/Dockerfile

@@ -0,0 +1,10 @@
+FROM debian:sid
+
+RUN apt-get update
+RUN apt-get install -y courier-imap
+RUN useradd -m debian -p '$1$B8Mq5Hki$fg5f4SndVNWsfq.mJiqbI0'
+USER debian
+RUN maildirmake /home/debian/Maildir
+USER root
+COPY ./entrypoint.sh /entrypoint
+ENTRYPOINT ["/entrypoint"]

tests/instrumentation/docker/courier/entrypoint.sh

@@ -0,0 +1,5 @@
+#!/usr/bin/env bash
+
+
+/usr/lib/courier/courier-authlib/authdaemond &
+/usr/sbin/couriertcpd -address=0 -maxprocs=40 -maxperip=20 -access=/etc/courier/imapaccess.dat -nodnslookup -noidentlookup 143 /usr/lib/courier/courier/imaplogin /usr/bin/imapd Maildir

tests/instrumentation/docker/cyrus/Dockerfile

@@ -1,4 +1,4 @@
-FROM debian:buster
+FROM debian:sid
 
 ARG DEBIAN_FRONTEND=noninteractive
 RUN apt update && \
@@ -6,7 +6,7 @@ RUN apt update && \
     echo "admins: cyrus" >> /etc/imapd.conf && \
     touch /var/lib/cyrus/tls_sessions.db && \
     chown cyrus:mail /var/lib/cyrus/tls_sessions.db && \
-    mkdir /run/cyrus && \
+    mkdir -p /run/cyrus && \
     chown -R cyrus:mail /run/cyrus
 
 COPY entrypoint.sh /usr/local/bin/entrypoint.sh

tests/instrumentation/docker/maddy/Dockerfile

@@ -4,7 +4,7 @@ WORKDIR /root
 RUN apt-get update && apt-get install -y openssl && \
     openssl req -nodes -new -x509 -subj "/C=DW/ST=Sto/L=Ankh-Morpork /O=Unseen University/OU=Library/CN=Ook/emailAddress=ook@ook.ook" -keyout privkey.pem -out fullchain.pem
 
-FROM foxcpp/maddy:0.6.2
+FROM foxcpp/maddy:0.7.0
 
 COPY --from=builder /root/privkey.pem /data/tls/privkey.pem
 COPY --from=builder /root/fullchain.pem /data/tls/fullchain.pem

tests/instrumentation/docker/maddy/entrypoint.sh

@@ -3,7 +3,7 @@
 maddy -config /data/maddy.conf run &
 
 sleep 2
-maddyctl creds create --password pass test@example.com
-maddyctl imap-acct create test@example.com
+maddy creds create --password pass test@example.com
+maddy imap-acct create test@example.com
 
 wait

tests/instrumentation/send-to-imap.py

@@ -51,6 +51,14 @@ parameters = {
     "ext": ".cyrus",
     "mb": "INBOX."+base_test_mb,
   },
+  "courier": {
+    "con": IMAP4,
+    "port": 144,
+    "user": "debian",
+    "pw": "debian",
+    "ext": ".courier",
+    "mb": base_test_mb,
+  },
   "stalwart": {
     "con": IMAP4_SSL,
     "port": 1993,