Skip to content
Merged
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
29 changes: 27 additions & 2 deletions docker-compose.yml
Comment thread
dschmidt marked this conversation as resolved.
Resolved
Original file line number Diff line number Diff line change
Expand Up @@ -68,6 +68,10 @@ x-opencloud-server: &opencloud-service
PROXY_ENABLE_BASIC_AUTH: '${PROXY_ENABLE_BASIC_AUTH:-true}'
PROXY_TLS: 'false'

# THUMBNAILS
WEBDAV_THUMBNAILS_GENERATOR_URL: 'http://imagor:8000'
OC_THUMBNAILS_ADDITIONAL_SOURCE_TYPES: 'image/heic,image/heif,image/avif,image/heic-sequence,image/heif-sequence'

# TIKA
SEARCH_EXTRACTOR_TYPE: 'tika'
SEARCH_EXTRACTOR_TIKA_TIKA_URL: 'http://host.docker.internal:9998'
Expand Down Expand Up @@ -128,14 +132,15 @@ services:
NOTIFICATIONS_SMTP_SENDER: 'OpenCloud <noreply@example.com>'
labels:
traefik.enable: true
traefik.docker.network: traefik
traefik.docker.network: ${COMPOSE_PROJECT_NAME:-web}_traefik
traefik.http.routers.opencloud.tls: true
traefik.http.routers.opencloud.rule: Host(`host.docker.internal`) && PathPrefix(`/`)
traefik.http.routers.opencloud.entrypoints: opencloud
traefik.http.services.opencloud.loadbalancer.server.port: 9200
traefik.http.routers.opencloud.middlewares: cors
networks:
- traefik
- default
volumes:
- ./dev/docker/traefik/certificates:/certificates:ro
- ./dev/docker/opencloud/csp.yaml:/etc/opencloud/csp.yaml
Expand All @@ -154,6 +159,8 @@ services:
condition: service_healthy
inbucket:
condition: service_started
imagor:
condition: service_started

opencloud-federated:
<<: *opencloud-service
Expand All @@ -165,14 +172,15 @@ services:
OCM_WEBAPP_TEMPLATE: https://oc.opencloud.test:10201/o/{{.Token}}/{relative-path-to-shared-resource}
labels:
traefik.enable: true
traefik.docker.network: traefik
traefik.docker.network: ${COMPOSE_PROJECT_NAME:-web}_traefik
traefik.http.routers.opencloud-federated.tls: true
traefik.http.routers.opencloud-federated.rule: Host(`oc.opencloud.test`) && PathPrefix(`/`)
traefik.http.routers.opencloud-federated.entrypoints: opencloud-federated
traefik.http.services.opencloud-federated.loadbalancer.server.port: 9200
traefik.http.routers.opencloud-federated.middlewares: cors
networks:
- traefik
- default
volumes:
- ./dev/docker/traefik/certificates:/certificates:ro
- ./dev/docker/opencloud/password-policy-banned-passwords.txt:/etc/opencloud/password-policy-banned-passwords.txt
Expand Down Expand Up @@ -220,6 +228,8 @@ services:
condition: service_completed_successfully
traefik:
condition: service_started
imagor:
condition: service_started

# generates the WOPI proof key on first start and keeps it in a named volume
collabora-proof-key:
Expand Down Expand Up @@ -333,6 +343,21 @@ services:
retries: 20
start_period: 5s

imagor:
image: shumc/imagor:1.9.11
container_name: web_imagor
restart: unless-stopped
environment:
IMAGOR_UNSAFE: 'true'
UPLOAD_LOADER_ENABLE: 'true'
HTTP_LOADER_DISABLE: 'true'
VIPS_MAX_WIDTH: '7680'
VIPS_MAX_HEIGHT: '7680'
VIPS_MAX_ANIMATION_FRAMES: '100'
UPLOAD_LOADER_MAX_ALLOWED_SIZE: '50000000'
networks:
- default

inbucket:
image: inbucket/inbucket:3.2.0
container_name: web_inbucket
Expand Down
Loading