From 238884be707004c863df6a7f2c2bbf2fe14c510d Mon Sep 17 00:00:00 2001
From: j4n <j4n@systemli.org>
Date: Tue, 24 Feb 2026 19:02:30 +0100
Subject: [PATCH] docker: flatten docker/files/ into docker/

Move chatmail-init.sh, chatmail-init.service, and entrypoint.sh up
from docker/files/ to docker/
---
 docker-compose.override.yaml.example     | 4 ++--
 docker/{files => }/chatmail-init.service | 0
 docker/{files => }/chatmail-init.sh      | 0
 docker/chatmail_relay.dockerfile         | 6 +++---
 docker/{files => }/entrypoint.sh         | 0
 5 files changed, 5 insertions(+), 5 deletions(-)
 rename docker/{files => }/chatmail-init.service (100%)
 rename docker/{files => }/chatmail-init.sh (100%)
 rename docker/{files => }/entrypoint.sh (100%)

diff --git a/docker-compose.override.yaml.example b/docker-compose.override.yaml.example
index 81804ca2..96831031 100644
--- a/docker-compose.override.yaml.example
+++ b/docker-compose.override.yaml.example
@@ -23,8 +23,8 @@ services:
       # - ./custom/www:/opt/chatmail-www
 
       ## Debug — mount scripts from the repo for live editing:
-      # - ./docker/files/chatmail-init.sh:/chatmail-init.sh
-      # - ./docker/files/entrypoint.sh:/entrypoint.sh
+      # - ./docker/chatmail-init.sh:/chatmail-init.sh
+      # - ./docker/entrypoint.sh:/entrypoint.sh
 
     # environment:
       ## Mount certs (above) and set TLS_EXTERNAL_CERT_AND_KEY to in-container paths.
diff --git a/docker/files/chatmail-init.service b/docker/chatmail-init.service
similarity index 100%
rename from docker/files/chatmail-init.service
rename to docker/chatmail-init.service
diff --git a/docker/files/chatmail-init.sh b/docker/chatmail-init.sh
similarity index 100%
rename from docker/files/chatmail-init.sh
rename to docker/chatmail-init.sh
diff --git a/docker/chatmail_relay.dockerfile b/docker/chatmail_relay.dockerfile
index d85c39b4..b4a63a5b 100644
--- a/docker/chatmail_relay.dockerfile
+++ b/docker/chatmail_relay.dockerfile
@@ -74,14 +74,14 @@ ENV PATH="/opt/cmdeploy/bin:${PATH}"
 RUN ln -s /etc/chatmail/chatmail.ini /opt/chatmail/chatmail.ini
 
 ARG CHATMAIL_INIT_SERVICE_PATH=/lib/systemd/system/chatmail-init.service
-COPY ./docker/files/chatmail-init.service "$CHATMAIL_INIT_SERVICE_PATH"
+COPY ./docker/chatmail-init.service "$CHATMAIL_INIT_SERVICE_PATH"
 RUN ln -sf "$CHATMAIL_INIT_SERVICE_PATH" "/etc/systemd/system/multi-user.target.wants/chatmail-init.service"
 
 # Remove default nginx site config at build time (not in entrypoint)
 RUN rm -f /etc/nginx/sites-enabled/default
 
-COPY --chmod=555 ./docker/files/chatmail-init.sh /chatmail-init.sh
-COPY --chmod=555 ./docker/files/entrypoint.sh /entrypoint.sh
+COPY --chmod=555 ./docker/chatmail-init.sh /chatmail-init.sh
+COPY --chmod=555 ./docker/entrypoint.sh /entrypoint.sh
 
 HEALTHCHECK --interval=60s --timeout=10s --retries=3 \
   CMD systemctl is-active chatmail-metadata doveauth dovecot filtermail filtermail-incoming nginx postfix unbound || exit 1
diff --git a/docker/files/entrypoint.sh b/docker/entrypoint.sh
similarity index 100%
rename from docker/files/entrypoint.sh
rename to docker/entrypoint.sh