test: remove and replace trace of inbucket with mailpit

2025-04-18 23:44:07 +03:00 · 2025-04-01 14:54:01 +05:45 · 2025-04-01 14:54:01 +05:45 · bf4f12ec52
commit bf4f12ec52
parent 30b0bb1d5b
12 changed files with 30 additions and 68 deletions
--- a/deployments/continuous-deployment-config/ocis_full/master.yml
+++ b/deployments/continuous-deployment-config/ocis_full/master.yml
@ -37,9 +37,9 @@
          COMPANION_IMAGE: owncloud/uppy-companion:3.12.13-owncloud
          WOPISERVER_DOMAIN: wopiserver.ocis.master.owncloud.works
          COLLABORA_DOMAIN: collabora.ocis.master.owncloud.works
-          INBUCKET_DOMAIN: mail.ocis.master.owncloud.works
+          MAIL_SERVER_DOMAIN: mail.ocis.master.owncloud.works
          DEMO_USERS: "true"
-          COMPOSE_FILE: docker-compose.yml:ocis.yml:tika.yml:collabora.yml:web_extensions/extensions.yml:web_extensions/unzip.yml:web_extensions/importer.yml:inbucket.yml:monitoring_tracing/monitoring.yml
+          COMPOSE_FILE: docker-compose.yml:ocis.yml:tika.yml:collabora.yml:web_extensions/extensions.yml:web_extensions/unzip.yml:web_extensions/importer.yml:mailserver.yml:monitoring_tracing/monitoring.yml
      - name: monitoring
        git_url: https://github.com/owncloud-devops/monitoring-tracing-client.git
        ref: master
--- a/deployments/continuous-deployment-config/ocis_full/onlyoffice-master.yml
+++ b/deployments/continuous-deployment-config/ocis_full/onlyoffice-master.yml
@ -37,9 +37,9 @@
          COMPANION_IMAGE: owncloud/uppy-companion:3.12.13-owncloud
          WOPISERVER_ONLYOFFICE_DOMAIN: wopiserver-oo.ocis-onlyoffice.master.owncloud.works
          ONLYOFFICE_DOMAIN: onlyoffice.ocis-onlyoffice.master.owncloud.works
-          INBUCKET_DOMAIN: mail.ocis-onlyoffice.master.owncloud.works
+          MAIL_SERVER_DOMAIN: mail.ocis-onlyoffice.master.owncloud.works
          DEMO_USERS: "true"
-          COMPOSE_FILE: docker-compose.yml:ocis.yml:tika.yml:onlyoffice.yml:web_extensions/extensions.yml:web_extensions/unzip.yml:web_extensions/importer.yml:inbucket.yml:monitoring_tracing/monitoring-oo.yml
+          COMPOSE_FILE: docker-compose.yml:ocis.yml:tika.yml:onlyoffice.yml:web_extensions/extensions.yml:web_extensions/unzip.yml:web_extensions/importer.yml:mailserver.yml:monitoring_tracing/monitoring-oo.yml
      - name: monitoring
        git_url: https://github.com/owncloud-devops/monitoring-tracing-client.git
        ref: master
--- a/deployments/continuous-deployment-config/ocis_full/onlyoffice-rolling.yml
+++ b/deployments/continuous-deployment-config/ocis_full/onlyoffice-rolling.yml
@ -37,9 +37,9 @@
          COMPANION_IMAGE: owncloud/uppy-companion:3.12.13-owncloud
          WOPISERVER_ONLYOFFICE_DOMAIN: wopiserver-oo.ocis-onlyoffice.rolling.owncloud.works
          ONLYOFFICE_DOMAIN: onlyoffice.ocis-onlyoffice.rolling.owncloud.works
-          INBUCKET_DOMAIN: mail.ocis-onlyoffice.rolling.owncloud.works
+          MAIL_SERVER_DOMAIN: mail.ocis-onlyoffice.rolling.owncloud.works
          DEMO_USERS: "true"
-          COMPOSE_FILE: docker-compose.yml:ocis.yml:tika.yml:onlyoffice.yml:web_extensions/extensions.yml:web_extensions/unzip.yml:web_extensions/importer.yml:inbucket.yml:monitoring_tracing/monitoring-oo.yml
+          COMPOSE_FILE: docker-compose.yml:ocis.yml:tika.yml:onlyoffice.yml:web_extensions/extensions.yml:web_extensions/unzip.yml:web_extensions/importer.yml:mailserver.yml:monitoring_tracing/monitoring-oo.yml
      - name: monitoring
        git_url: https://github.com/owncloud-devops/monitoring-tracing-client.git
        ref: master
--- a/deployments/continuous-deployment-config/ocis_full/production.yml
+++ b/deployments/continuous-deployment-config/ocis_full/production.yml
@ -36,9 +36,9 @@
          COMPANION_IMAGE: owncloud/uppy-companion:3.12.13-owncloud
          WOPISERVER_DOMAIN: wopiserver.ocis.production.owncloud.works
          COLLABORA_DOMAIN: collabora.ocis.production.owncloud.works
-          INBUCKET_DOMAIN: mail.ocis.production.owncloud.works
+          MAIL_SERVER_DOMAIN: mail.ocis.production.owncloud.works
          DEMO_USERS: "true"
-          COMPOSE_FILE: docker-compose.yml:ocis.yml:tika.yml:collabora.yml:web_extensions/extensions.yml:web_extensions/unzip.yml:web_extensions/importer.yml:inbucket.yml:monitoring_tracing/monitoring.yml
+          COMPOSE_FILE: docker-compose.yml:ocis.yml:tika.yml:collabora.yml:web_extensions/extensions.yml:web_extensions/unzip.yml:web_extensions/importer.yml:mailserver.yml:monitoring_tracing/monitoring.yml
      - name: monitoring
        git_url: https://github.com/owncloud-devops/monitoring-tracing-client.git
        ref: master
--- a/deployments/continuous-deployment-config/ocis_full/rolling.yml
+++ b/deployments/continuous-deployment-config/ocis_full/rolling.yml
@ -37,9 +37,9 @@
          COMPANION_IMAGE: owncloud/uppy-companion:3.12.13-owncloud
          WOPISERVER_DOMAIN: wopiserver.ocis.rolling.owncloud.works
          COLLABORA_DOMAIN: collabora.ocis.rolling.owncloud.works
-          INBUCKET_DOMAIN: mail.ocis.rolling.owncloud.works
+          MAIL_SERVER_DOMAIN: mail.ocis.rolling.owncloud.works
          DEMO_USERS: "true"
-          COMPOSE_FILE: docker-compose.yml:ocis.yml:tika.yml:collabora.yml:web_extensions/extensions.yml:web_extensions/unzip.yml:web_extensions/importer.yml:inbucket.yml:monitoring_tracing/monitoring.yml
+          COMPOSE_FILE: docker-compose.yml:ocis.yml:tika.yml:collabora.yml:web_extensions/extensions.yml:web_extensions/unzip.yml:web_extensions/importer.yml:mailserver.yml:monitoring_tracing/monitoring.yml
      - name: monitoring
        git_url: https://github.com/owncloud-devops/monitoring-tracing-client.git
        ref: master
--- a/deployments/continuous-deployment-config/ocis_full/s3-rolling.yml
+++ b/deployments/continuous-deployment-config/ocis_full/s3-rolling.yml
@ -37,10 +37,10 @@
          COMPANION_IMAGE: owncloud/uppy-companion:3.12.13-owncloud
          WOPISERVER_DOMAIN: wopiserver.ocis-s3.rolling.owncloud.works
          COLLABORA_DOMAIN: collabora.ocis-s3.rolling.owncloud.works
-          INBUCKET_DOMAIN: mail.ocis-s3.rolling.owncloud.works
+          MAIL_SERVER_DOMAIN: mail.ocis-s3.rolling.owncloud.works
          MINIO_DOMAIN: minio.ocis-s3.rolling.owncloud.works
          DEMO_USERS: "true"
-          COMPOSE_FILE: docker-compose.yml:ocis.yml:s3ng.yml:minio.yml:tika.yml:collabora.yml:web_extensions/extensions.yml:web_extensions/unzip.yml:web_extensions/importer.yml:inbucket.yml:monitoring_tracing/monitoring.yml
+          COMPOSE_FILE: docker-compose.yml:ocis.yml:s3ng.yml:minio.yml:tika.yml:collabora.yml:web_extensions/extensions.yml:web_extensions/unzip.yml:web_extensions/importer.yml:mailserver.yml:monitoring_tracing/monitoring.yml
      - name: monitoring
        git_url: https://github.com/owncloud-devops/monitoring-tracing-client.git
        ref: master
--- a/deployments/examples/ocis_full/.env
+++ b/deployments/examples/ocis_full/.env
@ -97,7 +97,7 @@ MINIO_DOMAIN=
 # Define SMPT settings if you would like to send Infinite Scale email notifications.
 # For more details see:
 # https://doc.owncloud.com/ocis/latest/deployment/services/s-list/notifications.html
-# NOTE: when configuring Inbucket, these settings have no effect, see inbucket.yml for details.
+# NOTE: when configuring mail server (i.e., Mailpit), these settings have no effect, see mailserver.yml for details.
 # SMTP host to connect to.
 SMTP_HOST=
 # Port of the SMTP host to connect to.
@ -223,20 +223,16 @@ ONLYOFFICE_DOMAIN=
 WOPISERVER_ONLYOFFICE_DOMAIN=


-### Inbucket Settings ###
-# Inbucket is a mail catcher tool for testing purposes.
+### Mail Server Settings ###
+# Mailpit serves as both an email server and a catcher tool for testing purposes.
 # DO NOT use in Production.
 # Note: the leading colon is required to enable the service.
-# INBUCKET=:inbucket.yml
-# email server (in this case inbucket acts as mail catcher).
-# Domain for Inbucket. Defaults to "mail.owncloud.test".
-# INBUCKET_DOMAIN=
-
-MAILPIT=:mailpit.yml
-MAILPIT_DOMAIN=
+# MAIL_SERVER=:mailserver.yml
+# Domain for mail server. Defaults to "mail.owncloud.test".
+MAIL_SERVER_DOMAIN=

 ## IMPORTANT ##
 # This MUST be the last line as it assembles the supplemental compose files to be used.
 # ALL supplemental configs must be added here, whether commented or not.
 # Each var must either be empty or contain :path/file.yml
-COMPOSE_FILE=docker-compose.yml${OCIS:-}${TIKA:-}${S3NG:-}${S3NG_MINIO:-}${COLLABORA:-}${MONITORING:-}${IMPORTER:-}${CLAMAV:-}${ONLYOFFICE:-}${INBUCKET:-}${EXTENSIONS:-}${UNZIP:-}${DRAWIO:-}${JSONVIEWER:-}${PROGRESSBARS:-}${EXTERNALSITES:-}${MAILPIT:-}
+COMPOSE_FILE=docker-compose.yml${OCIS:-}${TIKA:-}${S3NG:-}${S3NG_MINIO:-}${COLLABORA:-}${MONITORING:-}${IMPORTER:-}${CLAMAV:-}${ONLYOFFICE:-}${EXTENSIONS:-}${UNZIP:-}${DRAWIO:-}${JSONVIEWER:-}${PROGRESSBARS:-}${EXTERNALSITES:-}${MAIL_SERVER:-}
--- a/deployments/examples/ocis_full/inbucket.yml
+++ b/deployments/examples/ocis_full/inbucket.yml
@ -1,34 +0,0 @@
---
-services:
-  ocis:
-    environment:
-      NOTIFICATIONS_SMTP_HOST: inbucket
-      NOTIFICATIONS_SMTP_PORT: 2500
-      NOTIFICATIONS_SMTP_SENDER: oCIS notifications <notifications@${OCIS_DOMAIN:-ocis.owncloud.test}>
-      NOTIFICATIONS_SMTP_USERNAME: notifications@${OCIS_DOMAIN:-ocis.owncloud.test}
-      # the mail catcher uses self signed certificates
-      NOTIFICATIONS_SMTP_INSECURE: "true"
-
-  inbucket:
-    image: inbucket/inbucket
-    # changelog: https://github.com/inbucket/inbucket/blob/main/CHANGELOG.md
-    networks:
-      - ocis-net
-    entrypoint:
-      - /bin/sh
-    command: [ "-c", "apk add openssl; openssl req -subj '/CN=inbucket.test' -x509 -sha256 -nodes -days 365 -newkey rsa:2048 -keyout /tmp/server.key -out /tmp/server.crt; /start-inbucket.sh" ]
-    environment:
-      INBUCKET_SMTP_TLSENABLED: "true"
-      INBUCKET_SMTP_TLSPRIVKEY: /tmp/server.key
-      INBUCKET_SMTP_TLSCERT: /tmp/server.crt
-      INBUCKET_STORAGE_MAILBOXMSGCAP: 1000
-    labels:
-      - "traefik.enable=true"
-      - "traefik.http.routers.inbucket.entrypoints=https"
-      - "traefik.http.routers.inbucket.rule=Host(`${INBUCKET_DOMAIN:-mail.owncloud.test}`)"
-      - "traefik.http.routers.inbucket.tls.certresolver=http"
-      - "traefik.http.routers.inbucket.service=inbucket"
-      - "traefik.http.services.inbucket.loadbalancer.server.port=9000"
-    logging:
-      driver: ${LOG_DRIVER:-local}
-    restart: always
--- a/deployments/examples/ocis_full/mailserver.yml
+++ b/deployments/examples/ocis_full/mailserver.yml
@ -1,13 +1,13 @@
 services:
  ocis:
    environment:
-      NOTIFICATIONS_SMTP_HOST: mailpit
+      NOTIFICATIONS_SMTP_HOST: mailserver
      NOTIFICATIONS_SMTP_PORT: 1025
      NOTIFICATIONS_SMTP_SENDER: oCIS notifications <notifications@${OCIS_DOMAIN:-ocis.owncloud.test}>
      NOTIFICATIONS_SMTP_USERNAME: notifications@${OCIS_DOMAIN:-ocis.owncloud.test}
      NOTIFICATIONS_SMTP_INSECURE: "true"

-  mailpit:
+  mailserver:
    image: axllent/mailpit:v1.22.3
    networks:
      - ocis-net
@ -16,11 +16,11 @@ services:
      - "1025:1025" # SMTP
    labels:
      - "traefik.enable=true"
-      - "traefik.http.routers.mailpit.entrypoints=https"
-      - "traefik.http.routers.mailpit.rule=Host(`${MAILPIT_DOMAIN:-mail.owncloud.test}`)"
-      - "traefik.http.routers.mailpit.tls.certresolver=http"
-      - "traefik.http.routers.mailpit.service=mailpit"
-      - "traefik.http.services.mailpit.loadbalancer.server.port=8025"
+      - "traefik.http.routers.mailserver.entrypoints=https"
+      - "traefik.http.routers.mailserver.rule=Host(`${MAIL_SERVER_DOMAIN:-mail.owncloud.test}`)"
+      - "traefik.http.routers.mailserver.tls.certresolver=http"
+      - "traefik.http.routers.mailserver.service=mailserver"
+      - "traefik.http.services.mailserver.loadbalancer.server.port=8025"
    logging:
      driver: ${LOG_DRIVER:-local}
    restart: always
--- a/docs/ocis/deployment/continuous_deployment.md
+++ b/docs/ocis/deployment/continuous_deployment.md
@ -19,7 +19,7 @@ The configuration for the continuous deployment can be found in the [oCIS reposi

 # oCIS with Web Office

-This deployment is based on our modular [ocis_full Example](ocis_full.md) and uses the default configuration with Collabora Online as the office suite, traefik reverse proxy, cloudimporter and the inbucket mail catching server to showcase the full feature set of oCIS.
+This deployment is based on our modular [ocis_full Example](ocis_full.md) and uses the default configuration with Collabora Online as the office suite, traefik reverse proxy, cloudimporter and the mailpit mail catching server to showcase the full feature set of oCIS.

 Credentials:

--- a/docs/ocis/deployment/ocis_full.md
+++ b/docs/ocis/deployment/ocis_full.md
@ -178,7 +178,7 @@ See also [example server setup]({{< ref "preparing_server" >}})
  # Define SMPT settings if you would like to send Infinite Scale email notifications.
  # For more details see:
  # https://doc.owncloud.com/ocis/latest/deployment/services/s-list/notifications.html
-  # NOTE: when configuring Inbucket, these settings have no effect, see inbucket.yml for details.
+  # NOTE: when configuring mail server, these settings have no effect, see mailserver.yml for details.
  # SMTP host to connect to.
  SMTP_HOST=
  # Port of the SMTP host to connect to.
--- a/services/invitations/md-sources/example-realm.json
+++ b/services/invitations/md-sources/example-realm.json
@ -1420,8 +1420,8 @@
        "replyToDisplayName": "",
        "starttls": "false",
        "auth": "",
-        "port": "2500",
-        "host": "inbucket",
+        "port": "1025",
+        "host": "mailserver",
        "replyTo": "",
        "from": "admin@owncloud.test",
        "fromDisplayName": "AdminTest",