aboutsummaryrefslogtreecommitdiff
path: root/tests/instrumentation/docker
diff options
context:
space:
mode:
authorQuentin Dufour <quentin@deuxfleurs.fr>2024-01-07 21:53:28 +0100
committerQuentin Dufour <quentin@deuxfleurs.fr>2024-01-07 21:53:28 +0100
commit1531600fd0a28654e588f5ce599ef86f58decea1 (patch)
tree7a538d1e86656a62fc9aec61d26f9cf9860d6cec /tests/instrumentation/docker
parent44ca458c5cf666246e472dea9be70b745a130e8c (diff)
downloadaerogramme-1531600fd0a28654e588f5ce599ef86f58decea1.tar.gz
aerogramme-1531600fd0a28654e588f5ce599ef86f58decea1.zip
update maddy and cyrus
Diffstat (limited to 'tests/instrumentation/docker')
-rw-r--r--tests/instrumentation/docker/cyrus/Dockerfile4
-rw-r--r--tests/instrumentation/docker/maddy/Dockerfile2
-rwxr-xr-xtests/instrumentation/docker/maddy/entrypoint.sh4
3 files changed, 5 insertions, 5 deletions
diff --git a/tests/instrumentation/docker/cyrus/Dockerfile b/tests/instrumentation/docker/cyrus/Dockerfile
index 67b4e11..54c18a1 100644
--- a/tests/instrumentation/docker/cyrus/Dockerfile
+++ b/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
diff --git a/tests/instrumentation/docker/maddy/Dockerfile b/tests/instrumentation/docker/maddy/Dockerfile
index 341e398..a110e16 100644
--- a/tests/instrumentation/docker/maddy/Dockerfile
+++ b/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
diff --git a/tests/instrumentation/docker/maddy/entrypoint.sh b/tests/instrumentation/docker/maddy/entrypoint.sh
index f875624..e42a34a 100755
--- a/tests/instrumentation/docker/maddy/entrypoint.sh
+++ b/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