start only needed services and set up sharing driver
This commit is contained in:
Vendored
+2
@@ -19,6 +19,8 @@
|
||||
"PROXY_ENABLE_BASIC_AUTH": "true",
|
||||
// set insecure options because we don't have valid certificates in dev environments
|
||||
"OCIS_INSECURE": "true",
|
||||
// OCIS_RUN_EXTENSIONS allows to start a subset of extensions even in the supervised mode
|
||||
//"OCIS_RUN_EXTENSIONS": "settings,storage-metadata,glauth,graph,graph-explorer,idp,ocs,store,thumbnails,web,webdav,storage-frontend,storage-gateway,storage-userprovider,storage-groupprovider,storage-authbasic,storage-authbearer,storage-authmachine,storage-users,storage-shares,storage-public-link,storage-appprovider,storage-sharing,accounts,proxy",
|
||||
}
|
||||
}
|
||||
]
|
||||
|
||||
@@ -1,11 +0,0 @@
|
||||
#!/bin/sh
|
||||
set -e
|
||||
ocis server &
|
||||
sleep 10
|
||||
|
||||
# idp, glauth and accounts are not needed -> replaced by Keycloak and OpenLDAP
|
||||
ocis kill idp
|
||||
ocis kill glauth
|
||||
ocis kill accounts
|
||||
|
||||
wait
|
||||
@@ -45,9 +45,6 @@ services:
|
||||
|
||||
ocis:
|
||||
image: owncloud/ocis:${OCIS_DOCKER_TAG:-latest}
|
||||
entrypoint:
|
||||
- /bin/sh
|
||||
- /entrypoint-override.sh
|
||||
networks:
|
||||
ocis-net:
|
||||
user: "33:33" # equals the user "www-data" for oC10
|
||||
@@ -103,9 +100,19 @@ services:
|
||||
STORAGE_USERS_DRIVER_OWNCLOUDSQL_DBPORT: 3306
|
||||
STORAGE_USERS_DRIVER_OWNCLOUDSQL_DBNAME: owncloud
|
||||
STORAGE_USERS_DRIVER_OWNCLOUDSQL_REDIS_ADDR: redis:6379 # TODO: redis is not yet supported
|
||||
# ownCloud sharing driver
|
||||
STORAGE_SHARING_USER_DRIVER: oc10-sql
|
||||
STORAGE_SHARING_USER_SQL_USERNAME: owncloud
|
||||
STORAGE_SHARING_USER_SQL_PASSWORD: owncloud
|
||||
STORAGE_SHARING_USER_SQL_HOST: oc10-db
|
||||
STORAGE_SHARING_USER_SQL_PORT: 3306
|
||||
STORAGE_SHARING_USER_SQL_NAME: owncloud
|
||||
|
||||
# ownCloud storage readonly
|
||||
OCIS_STORAGE_READ_ONLY: "false" # TODO: conflict with OWNCLOUDSQL -> https://github.com/owncloud/ocis/issues/2303
|
||||
# General oCIS config
|
||||
# OCIS_RUN_EXTENSIONS specifies to start all extensions except glauth, idp and accounts. These are replaced by external services
|
||||
OCIS_RUN_EXTENSIONS: settings,storage-metadata,graph,graph-explorer,ocs,store,thumbnails,web,webdav,storage-frontend,storage-gateway,storage-userprovider,storage-groupprovider,storage-authbasic,storage-authbearer,storage-authmachine,storage-users,storage-shares,storage-public-link,storage-appprovider,storage-sharing,proxy
|
||||
OCIS_LOG_LEVEL: ${OCIS_LOG_LEVEL:-error} # make oCIS less verbose
|
||||
OCIS_URL: https://${CLOUD_DOMAIN:-cloud.owncloud.test}
|
||||
PROXY_TLS: "false" # do not use SSL between Traefik and oCIS
|
||||
@@ -117,7 +124,6 @@ services:
|
||||
# INSECURE: needed if oCIS / Traefik is using self generated certificates
|
||||
OCIS_INSECURE: "${INSECURE:-false}"
|
||||
volumes:
|
||||
- ./config/ocis/entrypoint-override.sh:/entrypoint-override.sh
|
||||
- ./config/ocis/proxy.json:/etc/ocis/proxy.json
|
||||
- ocis-data:/var/lib/ocis
|
||||
# shared volume with oC10
|
||||
|
||||
Reference in New Issue
Block a user