-
Notifications
You must be signed in to change notification settings - Fork 223
feat: added the onlyoffice ee license to the ocis deployment. #11624
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
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. |
I think we can archive this chmod 644 ./config/onlyoffice/license.lic with adding it to |
Please add: |
.env
docker-compose.yml
|
|
b0c89ff
to
89bbbe2
Compare
|
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.
Pull Request Overview
This PR adds support for OnlyOffice Enterprise Edition (EE) license configuration to the oCIS deployment. It introduces configurable environment variables to support both Community and Enterprise editions, with specific provisions for mounting EE license files.
Key changes:
- Added environment variables for OnlyOffice image selection and configuration
- Implemented license file mounting with proper permissions handling
- Enhanced container configuration with JWT and Redis settings for EE support
Reviewed Changes
Copilot reviewed 4 out of 4 changed files in this pull request and generated 2 comments.
File | Description |
---|---|
deployments/examples/ocis_full/web_extensions/externalsites.yml | Added volume mount for apps configuration |
deployments/examples/ocis_full/onlyoffice.yml | Updated image configuration and added EE license volume mount |
deployments/examples/ocis_full/config/onlyoffice/entrypoint-override.sh | Added license file permissions handling |
deployments/examples/ocis_full/.env | Added OnlyOffice configuration environment variables |
Tip: Customize your code reviews with copilot-instructions.md. Create the file or learn how to get started.
volumes: | ||
# paths are relative to the main compose file | ||
- ./config/onlyoffice/entrypoint-override.sh:/entrypoint-override.sh | ||
- ./config/onlyoffice/local.json:/etc/onlyoffice/documentserver/local.dist.json | ||
# if you want to use oo enterprise edition, you need to add a volume for the license file | ||
# for details see: Registering your Enterprise Edition version --> | ||
# https://helpcenter.onlyoffice.com/installation/docs-enterprise-install-docker.aspx | ||
- ${ONLYOFFICE_LICENSE_LOCAL:-/dev/null}:/var/www/onlyoffice/Data/license.lic:ro |
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.
Using /dev/null
as a default fallback for the license file mount could cause confusion and potential issues. Consider using a more explicit approach like conditional volume mounting or a placeholder comment explaining this behavior.
- ${ONLYOFFICE_LICENSE_LOCAL:-/dev/null}:/var/www/onlyoffice/Data/license.lic:ro | |
# Mount the license file only if using enterprise edition. Uncomment and set ONLYOFFICE_LICENSE_LOCAL to the license file path. | |
# - ${ONLYOFFICE_LICENSE_LOCAL}:/var/www/onlyoffice/Data/license.lic:ro |
Copilot uses AI. Check for mistakes.
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.
It works if a docker mounts it as - ${ONLYOFFICE_LICENSE_LOCAL:-/dev/null}:/var/www/onlyoffice/Data/license.lic:ro
but in case if the ONLYOFFICE_LICENSE_LOCAL
is not set the Oo will not open the document in a trial mode
insted Oo said the license is expired
@dj4oC Let's keep it commented out in a onlyoffice.yml
# Ensure license file has the correct permissions | ||
if [ -f /var/www/onlyoffice/Data/license.lic ]; then | ||
echo "Fixing permissions on license.lic..." | ||
chmod 644 /var/www/onlyoffice/Data/license.lic || true |
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.
The || true
construct silently ignores chmod failures which could mask legitimate permission issues. Consider logging the error or using a more specific error handling approach.
chmod 644 /var/www/onlyoffice/Data/license.lic || true | |
if ! chmod 644 /var/www/onlyoffice/Data/license.lic; then | |
echo "Warning: Failed to set permissions on license.lic" >&2 | |
fi |
Copilot uses AI. Check for mistakes.
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.
Looks good to me but haven't tried it myself
This needs a changelog entry. |
Description
feat: added the onlyoffice ee license to the ocis deployment.
Related Issue
Motivation and Context
How Has This Been Tested?
Screenshots (if appropriate):
Types of changes
Checklist: