From ca65b517f68c20bd41e88cff194fddce06ff4268 Mon Sep 17 00:00:00 2001
From: 0x46616c6b <0x46616c6b@users.noreply.github.com>
Date: Thu, 12 Dec 2024 19:53:50 +0100
Subject: [PATCH 1/2] =?UTF-8?q?=F0=9F=90=B3Use=20FQDN=20for=20Docker=20Ima?=
 =?UTF-8?q?ges=20(#689)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Dockerfile         | 6 +++---
 docker-compose.yml | 2 +-
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/Dockerfile b/Dockerfile
index 1f3a6bea..5e409c0b 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,7 +1,7 @@
-FROM composer:2.8.3 AS composer
+FROM docker.io/composer:2.8.3 AS composer
 
 
-FROM php:8.2-cli AS builder
+FROM docker.io/php:8.2-cli AS builder
 
 RUN apt-get update && \
     apt-get install -y libzip-dev nodejs npm zip
@@ -19,7 +19,7 @@ RUN composer install --no-scripts && \
     bin/console assets:install
 
 
-FROM php:8.2-apache-bookworm
+FROM docker.io/php:8.2-apache-bookworm
 
 RUN apt-get update && \
     apt-get install -y libpng-dev libsodium-dev libsqlite3-dev libzip-dev zlib1g-dev zip
diff --git a/docker-compose.yml b/docker-compose.yml
index 63d5bd2a..37bd6eb1 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -10,7 +10,7 @@ services:
       - userli
 
   mariadb:
-    image: mariadb:10.11
+    image: docker.io/mariadb:10.11
     environment:
       MYSQL_USER: mail
       MYSQL_PASSWORD: password

From 333da636f576942426e96486763646a5f0dc346d Mon Sep 17 00:00:00 2001
From: 0x46616c6b <0x46616c6b@users.noreply.github.com>
Date: Thu, 12 Dec 2024 19:54:04 +0100
Subject: [PATCH 2/2] =?UTF-8?q?=F0=9F=9A=9A=20Move=20lua=20script=20to=20d?=
 =?UTF-8?q?ovecot=20directory=20(#690)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 contrib/{checkpasswd.lua => dovecot/userli.lua} | 0
 1 file changed, 0 insertions(+), 0 deletions(-)
 rename contrib/{checkpasswd.lua => dovecot/userli.lua} (100%)

diff --git a/contrib/checkpasswd.lua b/contrib/dovecot/userli.lua
similarity index 100%
rename from contrib/checkpasswd.lua
rename to contrib/dovecot/userli.lua