From f8558d0ce8f6f92a0dfcafe7c2bea5c4fc3f9652 Mon Sep 17 00:00:00 2001 From: Michael Barz Date: Tue, 3 Jan 2023 21:17:24 +0100 Subject: [PATCH] add tika and inbucket to wopi example --- .../ocis_wopi/latest.yml | 1 + deployments/examples/ocis_wopi/.env | 8 ++++ .../examples/ocis_wopi/docker-compose.yml | 37 +++++++++++++++++++ 3 files changed, 46 insertions(+) diff --git a/deployments/continuous-deployment-config/ocis_wopi/latest.yml b/deployments/continuous-deployment-config/ocis_wopi/latest.yml index b957a755b3..2191001762 100644 --- a/deployments/continuous-deployment-config/ocis_wopi/latest.yml +++ b/deployments/continuous-deployment-config/ocis_wopi/latest.yml @@ -37,6 +37,7 @@ WOPISERVER_DOMAIN: wopiserver.ocis-wopi.latest.owncloud.works COLLABORA_DOMAIN: collabora.ocis-wopi.latest.owncloud.works ONLYOFFICE_DOMAIN: onlyoffice.ocis-wopi.latest.owncloud.works + INBUCKET_DOMAIN: mail.ocis-wopi.latest.owncloud.works DEMO_USERS: "true" COMPOSE_FILE: docker-compose.yml:monitoring_tracing/docker-compose-additions.yml - name: monitoring diff --git a/deployments/examples/ocis_wopi/.env b/deployments/examples/ocis_wopi/.env index 4f09465480..acbae2cc81 100644 --- a/deployments/examples/ocis_wopi/.env +++ b/deployments/examples/ocis_wopi/.env @@ -43,6 +43,14 @@ COLLABORA_ADMIN_PASSWORD= # Domain of OnlyOffice, where you can find the frontend. Defaults to "onlyoffice.owncloud.test" ONLYOFFICE_DOMAIN= +### Email / Inbucket settings ### +# Inbucket / Mail domain. Defaults to "mail.owncloud.test" +INBUCKET_DOMAIN= + +### Apache Tika Content analysis toolkit +# Set the desired docker image tag or digest, defaults to "latest" +TIKA_IMAGE= + # If you want to use debugging and tracing with this stack, # you need uncomment following line. Please see documentation at # https://owncloud.dev/ocis/deployment/monitoring-tracing/ diff --git a/deployments/examples/ocis_wopi/docker-compose.yml b/deployments/examples/ocis_wopi/docker-compose.yml index d075d15e18..192de75dc8 100644 --- a/deployments/examples/ocis_wopi/docker-compose.yml +++ b/deployments/examples/ocis_wopi/docker-compose.yml @@ -73,6 +73,14 @@ services: IDM_ADMIN_PASSWORD: "${ADMIN_PASSWORD:-admin}" # this overrides the admin password from the configuration file # demo users IDM_CREATE_DEMO_USERS: "${DEMO_USERS:-false}" + SEARCH_EXTRACTOR_TYPE: tika + SEARCH_EXTRACTOR_TIKA_TIKA_URL: http://tika:9998 + # email server (in this case inbucket acts as mail catcher) + NOTIFICATIONS_SMTP_HOST: inbucket + NOTIFICATIONS_SMTP_PORT: 2500 + NOTIFICATIONS_SMTP_SENDER: oCIS notifications + NOTIFICATIONS_SMTP_USERNAME: notifications@${OCIS_DOMAIN:-ocis.owncloud.test} + NOTIFICATIONS_SMTP_INSECURE: true # the mail catcher uses self signed certificates volumes: - ./config/ocis/app-registry.yaml:/etc/ocis/app-registry.yaml - ocis-config:/etc/ocis @@ -207,6 +215,35 @@ services: driver: "local" restart: always + tika: + image: ${TIKA_IMAGE:-apache/tika:latest-full} + networks: + ocis-net: + restart: always + + inbucket: + image: inbucket/inbucket + 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: "local" + restart: always + volumes: certs: ocis-config: