Skip to content

Commit

Permalink
fix: simplify one more time
Browse files Browse the repository at this point in the history
  • Loading branch information
micbar committed Jun 20, 2024
1 parent 14db927 commit 6446f51
Show file tree
Hide file tree
Showing 9 changed files with 28 additions and 32 deletions.
50 changes: 19 additions & 31 deletions deployments/examples/ocis_wopi/.env
Original file line number Diff line number Diff line change
@@ -1,20 +1,5 @@
# DO NOT DELETE OR CHANGE THE FOLLOWING LIST
# except you add or remove a service
# this list prevents the compose warning:
# ..."variable is not set. Defaulting to a blank string."

OCIS=
TIKA=
WOPISERVER=
COLLABORA=
MONITORING=
COMPANION=
ONLYOFFICE=
INBUCKET=


# Define the docker compose log driver used.
# Do not change until you know what you are doing.
# Defaults to local
LOG_DRIVER=

# If you're on an internet facing server. comment out following line.
Expand All @@ -41,9 +26,8 @@ TRAEFIK_BASIC_AUTH_USERS=
# Needs only be changed if this is a public facing server.
TRAEFIK_ACME_MAIL=

# Defaults to "https://acme-v02.api.letsencrypt.org/directory".
# Set to the following for testing to check the certificate process:
# "https://acme-staging-v02.api.letsencrypt.org/directory"
# "https://acme-staging-v02.api.letsencrypt.org/directory"
# With staging configured, there will be an SSL error in the browser.
# When certificates are displayed and are emitted by # "Fake LE Intermediate X1",
# the process went well and the envvar can be reset to empty to get valid certificates.
Expand All @@ -52,12 +36,12 @@ TRAEFIK_ACME_CASERVER=

### Infinite Scale Settings ###

# Beside Traefik, this service must stay enabled.
# Disable only for testing purposes.
OCIS=:ocis/docker-compose-additions.yml
# The oCIS container image.
# Defaults to "owncloud/ocis" which contains the production releases.
OCIS_DOCKER_IMAGE=

# The oCIS container version.
# Defaults to "latest". It is recommended to use a stable version like 5.0.5.
# Defaults to "latest". This will point to the latest stable tag.
OCIS_DOCKER_TAG=

# Domain of oCIS, where you can find the frontend.
Expand Down Expand Up @@ -109,17 +93,19 @@ SMTP_INSECURE=
### Apache Tika Content Analysis Toolkit ###

# Tika (search) is enabled by default, comment if not required.
TIKA=:tika/docker-compose-additions.yml
# the leading colon is required to enable the service
TIKA=:tika.yml
# Set the desired docker image tag or digest.
# Defaults to "latest"
#TIKA_IMAGE=
TIKA_IMAGE=


### Wopi Server Settings ###

# Wopi Server is enabled by default, comment if not required.
# Note that without the wopiserver, office apps will fail to start.
WOPISERVER=:wopi/docker-compose-additions.yml
# the leading colon is required to enable the service
WOPISERVER=:wopiserver.yml

# cs3org WOPI Server Version.
# Defaults to "v10.5.0"
Expand All @@ -137,7 +123,8 @@ WOPI_JWT_SECRET=
### Collabora Settings ###

# Collabora web office is default enabled, comment if not required.
COLLABORA=:collabora/docker-compose-additions.yml
# the leading colon is required to enable the service
COLLABORA=:collabora.yml

# Domain of Collabora, where you can find the frontend.
# Defaults to "collabora.owncloud.test"
Expand Down Expand Up @@ -167,8 +154,8 @@ COLLABORA_ADMIN_PASSWORD=


## Uppy Companion Settings ##

#COMPANION=:companion/docker-compose-additions.yml
# the leading colon is required to enable the service
COMPANION=:companion.yml

COMPANION_IMAGE=

Expand All @@ -183,14 +170,15 @@ COMPANION_ONEDRIVE_SECRET=


## OnlyOffice Settings ##
#ONLYOFFICE=:onlyoffice/docker-compose-additions.yml
# the leading colon is required to enable the service
# ONLYOFFICE=:onlyoffice.yml

# Domain for OnlyOffice. Defaults to "onlyoffice.owncloud.test"
ONLYOFFICE_DOMAIN=


## Inbucket Settings ##
#INBUCKET=:inbucket/docker-compose-additions.yml
# INBUCKET=:inbucket.yml

# email server (in this case inbucket acts as mail catcher)
# Domain for Inbucket. Defaults to "mail.owncloud.test"
Expand All @@ -209,5 +197,5 @@ INBUCKET_DOMAIN=
# This MUST be the last line as it assembles the supplemental compose files to be used.
# ALL supplemental configs must be added here, independent if commented or not.
# Each var must either be empty or contain :path/file.yml
COMPOSE_FILE=docker-compose.yml${OCIS}${TIKA}${WOPISERVER}${COLLABORA}${MONITORING}${COMPANION}${ONLYOFFICE}${INBUCKET}
COMPOSE_FILE=docker-compose.yml:ocis.yml${TIKA:-}${WOPISERVER:-}${COLLABORA:-}${MONITORING:-}${COMPANION:-}${ONLYOFFICE:-}${INBUCKET:-}

Original file line number Diff line number Diff line change
@@ -1,5 +1,13 @@
---
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}
NOTIFICATIONS_SMTP_INSECURE: "true" # the mail catcher uses self signed certificates

inbucket:
image: inbucket/inbucket
networks:
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ services:
- ${OCIS_DOMAIN:-ocis.owncloud.test}

ocis:
image: owncloud/ocis:${OCIS_DOCKER_TAG:-latest}
image: ${OCIS_DOCKER_IMAGE:-owncloud/ocis}:${OCIS_DOCKER_TAG:-latest}
networks:
- ocis-net
entrypoint:
Expand Down
File renamed without changes.

0 comments on commit 6446f51

Please sign in to comment.