Skip to content
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

Open
wants to merge 3 commits into
base: master
Choose a base branch
from
Open

Conversation

2403905
Copy link
Contributor

@2403905 2403905 commented Oct 25, 2024

Description

The ocm added to the ocis_full

Related Issue

#10410

Motivation and Context

How Has This Been Tested?

  • test environment:
  • test case 1:
  • test case 2:
  • ...

Screenshots (if appropriate):

Types of changes

  • Bug fix (non-breaking change which fixes an issue)
  • New feature (non-breaking change which adds functionality)
  • Breaking change (fix or feature that would cause existing functionality to change)
  • Technical debt
  • Tests only (no source changes)

Checklist:

  • Code changes
  • Unit tests added
  • Acceptance tests added
  • Documentation ticket raised:

Copy link

update-docs bot commented Oct 25, 2024

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.

@2403905
Copy link
Contributor Author

2403905 commented Oct 28, 2024

@JammingBen https://github.com/owncloud/web/blob/master/config/config.json.dist
Can WEB_UI_CONFIG_FILE be in yaml format or json only?

@JammingBen
Copy link
Contributor

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/
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Suggested change
# 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
Copy link
Contributor

@mmattel mmattel Oct 28, 2024

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Suggested change
# 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.
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Suggested change
# Domain of oCIS OCM instace, where you can find the frontend.

@amrita-shrestha
Copy link
Contributor

amrita-shrestha commented Oct 29, 2024

I am confused about oCIS instance serve at ocis.ocm.owncloud.test don't we need to change
--o:net.frame_ancestors=${OCIS_DOMAIN:-ocis.owncloud.test} code at collabora service
and MICRO_REGISTRY_ADDRESS: "ocis:9233" code at collaboration service

@2403905
Copy link
Contributor Author

2403905 commented Oct 29, 2024

I am confused about oCIS instance serve at ocis.ocm.owncloud.test don't we need to change --o:net.frame_ancestors=${OCIS_DOMAIN:-ocis.owncloud.test} code at collabora service and MICRO_REGISTRY_ADDRESS: "ocis:9233" code at collaboration service

@amrita-shrestha Good point. The ocm instance should be pointed to its own collaboration service.
This example should be improved

@mmattel
Copy link
Contributor

mmattel commented Oct 30, 2024

@2403905
We should consider making image: collabora/code:24.04.5.1.1 using a .env variable for the version. Same as we do for ocis (OCIS_DOCKER_TAG). We now have two places where collabora is used and I think that would ease maintenance and avoids possible causes of errors.

@2403905
Copy link
Contributor Author

2403905 commented Oct 30, 2024

@amrita-shrestha I added the docker compose for collaboration + collabora for each ocis and ocis-ocm.
Now the osic-ocm, collaboration-ocm and collabora-ocm are running using a separate network and don't conflict with the main osic instance.

@2403905 2403905 changed the title ocm add to the ocis-all [draft] ocm add to the ocis-all Oct 31, 2024
@2403905
Copy link
Contributor Author

2403905 commented Oct 31, 2024

@amrita-shrestha I hurried up to say that works. The ocm documents aren't able to be opened by the office properly.
I set the level draft.

Copy link

sonarcloud bot commented Oct 31, 2024

networks:
ocis-ocm-net:
depends_on:
ocis:
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

isn't it

Suggested change
ocis:
ocis-ocm:

@micbar
Copy link
Contributor

micbar commented Nov 6, 2024

@2403905 @mmattel What is the purpose of that inside the ocis_full example.

My understanding of the scope should be a little bit different:

  1. Ocis_full is meant to setup ocis remotely, mainly for production
  2. If you want federation, you will use ocis on two remote servers

That brings me to the conclusion, that we should not setup OCM on the same machine.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

5 participants