diff --git a/service/postfix/Containerfile b/service/postfix/Containerfile index 0adfda7..c17de2e 100644 --- a/service/postfix/Containerfile +++ b/service/postfix/Containerfile @@ -2,7 +2,8 @@ FROM docker.io/debian:bookworm-slim ARG VERSION=3.7.6 RUN apt-get update -y && apt-get install -y --no-install-recommends \ - postfix=${VERSION}* postfix-mysql=${VERSION}* syslog-ng-core gettext ca-certificates + postfix=${VERSION}* postfix-mysql=${VERSION}* syslog-ng-core gettext ca-certificates \ + netcat-traditional COPY container/config /etc/postfix COPY container/run-postfix /run-postfix diff --git a/service/postfix/quadlet/postfix.container b/service/postfix/quadlet/postfix.container index a622ec6..9d896c0 100644 --- a/service/postfix/quadlet/postfix.container +++ b/service/postfix/quadlet/postfix.container @@ -4,9 +4,12 @@ Wants=container-build@%N.service dovecot.service After=container-build@%N.service dovecot.service [Container] +AutoUpdate=local ContainerName=%N EnvironmentFile=%E/coreos-home-server/%N/%N.env +HealthCmd=sh -c 'printf "EHLO healthcheck\r\n" | nc -q 1 localhost 587 | grep -qE "^220.+ESMTP Postfix"' Image=localhost/%N:latest +PodmanArgs=--sdnotify=healthy PublishPort=25:25 PublishPort=465:465 PublishPort=587:587 diff --git a/service/rclone/Containerfile b/service/rclone/Containerfile index fc3c27f..81a0853 100644 --- a/service/rclone/Containerfile +++ b/service/rclone/Containerfile @@ -1 +1 @@ -FROM docker.io/rclone/rclone:1.61.1 +FROM docker.io/rclone/rclone:1.64.0 diff --git a/service/rclone/systemd/rclone-pull@.service b/service/rclone/systemd/rclone-pull@.service index 349f377..f77e601 100644 --- a/service/rclone/systemd/rclone-pull@.service +++ b/service/rclone/systemd/rclone-pull@.service @@ -9,9 +9,7 @@ Type=oneshot SyslogIdentifier=%N Environment=SOURCE=crypt:%i ExecStartPre=/bin/install --mode 0700 -d /%I -ExecStart=/bin/podman run --rm --env-file %E/coreos-home-server/rclone/rclone.env \ - --volume /%I:/data:z localhost/rclone:latest \ - sync ${SOURCE} /data +ExecStart=/bin/podman run --rm --env-file %E/coreos-home-server/rclone/rclone.env --volume /%I:/data:z localhost/rclone:latest sync ${SOURCE} /data [Install] WantedBy=multi-user.target diff --git a/service/rclone/systemd/rclone-sync@.service b/service/rclone/systemd/rclone-sync@.service index cf19929..445fd12 100644 --- a/service/rclone/systemd/rclone-sync@.service +++ b/service/rclone/systemd/rclone-sync@.service @@ -8,9 +8,7 @@ ConditionDirectoryNotEmpty=/%I Type=oneshot SyslogIdentifier=%N Environment=DESTINATION=crypt:%i -ExecStart=/bin/podman run --rm --env-file %E/coreos-home-server/rclone/rclone.env \ - --volume /%I:/data:z localhost/rclone:latest \ - sync /data ${DESTINATION} +ExecStart=/bin/podman run --rm --env-file %E/coreos-home-server/rclone/rclone.env --volume /%I:/data:z localhost/rclone:latest sync /data ${DESTINATION} [Install] WantedBy=multi-user.target