-
Notifications
You must be signed in to change notification settings - Fork 183
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
[draft] ocm add to the ocis-all #10420
base: master
Are you sure you want to change the base?
Conversation
Thanks for opening this pull request! The maintainers of this repository would appreciate it if you would create a changelog item based on your changes. |
@JammingBen https://github.com/owncloud/web/blob/master/config/config.json.dist |
AFAIK it's json only. |
@@ -223,3 +223,14 @@ INBUCKET_DOMAIN= | |||
# 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:-} | |||
|
|||
### OCM Settings ### | |||
# Note: the OCM configuration is optional and can be used to connect to an OCM instance. https://owncloud.dev/services/ocm/ |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
# Note: the OCM configuration is optional and can be used to connect to an OCM instance. https://owncloud.dev/services/ocm/ | |
# Note: the OCM configuration is optional and can be used to connect to an OCM instance. https://doc.owncloud.com/ocis/next/deployment/services/s-list/ocm.html |
We use the ocis_full
example in the admin docs and should reference therefore to it to avoid confusion.
### OCM Settings ### | ||
# Note: the OCM configuration is optional and can be used to connect to an OCM instance. https://owncloud.dev/services/ocm/ | ||
# There are several setting files that do not allow variables like ocm.providers.json, ocis.web.config.json, ocis.ocm.web.config.json | ||
# This files need to be configured manualy for the real valuse of the OCIS_OCM_DOMAIN and OCIS_DOMAIN |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
# This files need to be configured manualy for the real valuse of the OCIS_OCM_DOMAIN and OCIS_DOMAIN | |
# These files need to be configured manually for the real values set in OCIS_DOMAIN and OCIS_OCM_DOMAIN |
# Note: the OCM configuration is optional and can be used to connect to an OCM instance. https://owncloud.dev/services/ocm/ | ||
# There are several setting files that do not allow variables like ocm.providers.json, ocis.web.config.json, ocis.ocm.web.config.json | ||
# This files need to be configured manualy for the real valuse of the OCIS_OCM_DOMAIN and OCIS_DOMAIN | ||
# Domain of oCIS OCM instace, where you can find the frontend. |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
# Domain of oCIS OCM instace, where you can find the frontend. |
I am confused about oCIS instance serve at |
@amrita-shrestha Good point. The ocm instance should be pointed to its own collaboration service. |
@2403905 |
@amrita-shrestha I added the docker compose for collaboration + collabora for each ocis and ocis-ocm. |
@amrita-shrestha I hurried up to say that works. The ocm documents aren't able to be opened by the office properly. |
networks: | ||
ocis-ocm-net: | ||
depends_on: | ||
ocis: |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
isn't it
ocis: | |
ocis-ocm: |
@2403905 @mmattel What is the purpose of that inside the ocis_full example. My understanding of the scope should be a little bit different:
That brings me to the conclusion, that we should not setup OCM on the same machine. |
Quality Gate passedIssues Measures |
@2403905 Sorry to say that, but I think we should not continue in that direction. What you are doing is: Two ocis instances in one docker compose. That is not what you would do in production. In production, you would use the |
Description
The ocm added to the
ocis_full
Related Issue
#10410
Motivation and Context
How Has This Been Tested?
Screenshots (if appropriate):
Types of changes
Checklist: