cqrenet/relay
4
0
Fork 0
mirror of https://github.com/chatmail/relay.git synced 2026-05-20 12:58:04 +00:00
Code Issues Packages Projects Releases Wiki Activity

docker: flatten docker/files/ into docker/

Browse Source 
Move chatmail-init.sh, chatmail-init.service, and entrypoint.sh up
from docker/files/ to docker/
This commit is contained in:
j4n
2026-02-24 19:02:30 +01:00
parent ee6573efec
commit 238884be70
5 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
docker-compose.override.yaml.example
View File

@@ -23,8 +23,8 @@ services:
# - ./custom/www:/opt/chatmail-www # - ./custom/www:/opt/chatmail-www
## Debug — mount scripts from the repo for live editing: ## Debug — mount scripts from the repo for live editing:
# - ./docker/files/chatmail-init.sh:/chatmail-init.sh # - ./docker/chatmail-init.sh:/chatmail-init.sh
# - ./docker/files/entrypoint.sh:/entrypoint.sh # - ./docker/entrypoint.sh:/entrypoint.sh
# environment: # environment:
## Mount certs (above) and set TLS_EXTERNAL_CERT_AND_KEY to in-container paths. ## Mount certs (above) and set TLS_EXTERNAL_CERT_AND_KEY to in-container paths.

0
docker/files/chatmail-init.service → docker/chatmail-init.service
View File

0
docker/files/chatmail-init.sh → docker/chatmail-init.sh
View File

6
docker/chatmail_relay.dockerfile
View File

@@ -74,14 +74,14 @@ ENV PATH="/opt/cmdeploy/bin:${PATH}"
RUN ln -s /etc/chatmail/chatmail.ini /opt/chatmail/chatmail.ini RUN ln -s /etc/chatmail/chatmail.ini /opt/chatmail/chatmail.ini
ARG CHATMAIL_INIT_SERVICE_PATH=/lib/systemd/system/chatmail-init.service 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" 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) # Remove default nginx site config at build time (not in entrypoint)
RUN rm -f /etc/nginx/sites-enabled/default RUN rm -f /etc/nginx/sites-enabled/default
COPY --chmod=555 ./docker/files/chatmail-init.sh /chatmail-init.sh COPY --chmod=555 ./docker/chatmail-init.sh /chatmail-init.sh
COPY --chmod=555 ./docker/files/entrypoint.sh /entrypoint.sh COPY --chmod=555 ./docker/entrypoint.sh /entrypoint.sh
HEALTHCHECK --interval=60s --timeout=10s --retries=3 \ HEALTHCHECK --interval=60s --timeout=10s --retries=3 \
CMD systemctl is-active chatmail-metadata doveauth dovecot filtermail filtermail-incoming nginx postfix unbound || exit 1 CMD systemctl is-active chatmail-metadata doveauth dovecot filtermail filtermail-incoming nginx postfix unbound || exit 1

0
docker/files/entrypoint.sh → docker/entrypoint.sh
View File