Move services into core and optional

2025-01-26 03:52:50 +02:00 · 2019-10-13 21:57:21 +03:00 · 2019-10-13 21:57:21 +03:00 · 4e4b071fb0
commit 4e4b071fb0
parent e736abbe6f
22 changed files with 4 additions and 3 deletions
--- a/services/rspamd/Dockerfile
+++ b/services/rspamd/Dockerfile
--- a/services/rspamd/conf/antivirus.conf
+++ b/services/rspamd/conf/antivirus.conf
--- a/services/rspamd/conf/arc.conf
+++ b/services/rspamd/conf/arc.conf
--- a/services/rspamd/conf/dkim_signing.conf
+++ b/services/rspamd/conf/dkim_signing.conf
--- a/services/rspamd/conf/fuzzy_check.conf
+++ b/services/rspamd/conf/fuzzy_check.conf
--- a/services/rspamd/conf/history_redis.conf
+++ b/services/rspamd/conf/history_redis.conf
--- a/services/rspamd/conf/logging.inc
+++ b/services/rspamd/conf/logging.inc
--- a/services/rspamd/conf/metrics.conf
+++ b/services/rspamd/conf/metrics.conf
--- a/services/rspamd/conf/milter_headers.conf
+++ b/services/rspamd/conf/milter_headers.conf
--- a/services/rspamd/conf/redis.conf
+++ b/services/rspamd/conf/redis.conf
--- a/services/rspamd/conf/worker-controller.inc
+++ b/services/rspamd/conf/worker-controller.inc
--- a/services/rspamd/conf/worker-fuzzy.inc
+++ b/services/rspamd/conf/worker-fuzzy.inc
--- a/services/rspamd/conf/worker-normal.inc
+++ b/services/rspamd/conf/worker-normal.inc
--- a/services/rspamd/conf/worker-proxy.inc
+++ b/services/rspamd/conf/worker-proxy.inc
--- a/services/rspamd/start.py
+++ b/services/rspamd/start.py
--- a/optional/fetchmail/Dockerfile
+++ b/optional/fetchmail/Dockerfile
--- a/optional/fetchmail/fetchmail.py
+++ b/optional/fetchmail/fetchmail.py
--- a/optional/unbound/Dockerfile
+++ b/optional/unbound/Dockerfile
--- a/optional/unbound/start.py
+++ b/optional/unbound/start.py
--- a/optional/unbound/unbound.conf
+++ b/optional/unbound/unbound.conf
--- a/tests/build.yml
+++ b/tests/build.yml
@ -8,7 +8,7 @@ services:

  resolver:
    image: ${DOCKER_ORG:-mailu}/${DOCKER_PREFIX:-}unbound:${MAILU_VERSION:-local}
-    build: ../services/unbound
+    build: ../optional/unbound

  imap:
    image: ${DOCKER_ORG:-mailu}/${DOCKER_PREFIX:-}dovecot:${MAILU_VERSION:-local}
@ -20,7 +20,7 @@ services:

  antispam:
    image: ${DOCKER_ORG:-mailu}/${DOCKER_PREFIX:-}rspamd:${MAILU_VERSION:-local}
-    build: ../services/rspamd
+    build: ../core/rspamd

  antivirus:
    image: ${DOCKER_ORG:-mailu}/${DOCKER_PREFIX:-}clamav:${MAILU_VERSION:-local}
@ -52,7 +52,7 @@ services:

  fetchmail:
    image: ${DOCKER_ORG:-mailu}/${DOCKER_PREFIX:-}fetchmail:${MAILU_VERSION:-local}
-    build: ../services/fetchmail
+    build: ../optional/fetchmail

  none:
    image: ${DOCKER_ORG:-mailu}/${DOCKER_PREFIX:-}none:${MAILU_VERSION:-local}
--- a/towncrier/newsfragments/1214.misc
+++ b/towncrier/newsfragments/1214.misc
@ -0,0 +1 @@
+Move rspamd, fetchmail and unbound services into core and optional
				`@ -0,0 +1 @@`
				`Move rspamd, fetchmail and unbound services into core and optional`