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.

Sign up for GitHub

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

Jump to bottom

added config for document server setup #10826

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

added config for document server setup #10826

wants to merge 2 commits into from

Conversation

S-Panta
Copy link
Contributor

@S-Panta S-Panta commented Jan 2, 2025 •
edited
Loading

Description

A single file docker-compose inside directory tests/acceptance/docker/documentServer can be used to start the necessary service for app provider test along with the latest ocis local build.
Make sure to add all the hosts in /etc/hosts folder before running the docker compose file

Related Issue

Motivation and Context

How Has This Been Tested?

  • test environment:
  • locally

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:

@update-docs Update Docs
Copy link

update-docs bot commented Jan 2, 2025

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.

@S-Panta S-Panta self-assigned this Jan 2, 2025
@S-Panta S-Panta added the QA:team label Jan 2, 2025
@mmattel
Copy link
Contributor

mmattel commented Jan 2, 2025

@S-Panta Q: did you derive from ocis-full? If yes we should add a note+link. This eases finding changes in the source that can be trasnported to this compose definition. Just my 2c

@S-Panta
Copy link
Contributor Author

S-Panta commented Jan 3, 2025

@S-Panta Q: did you derive from ocis-full? If yes we should add a note+link. This eases finding changes in the source that can be trasnported to this compose definition. Just my 2c

The environment variable were matched both from ocis_full and config inside docker-compose` of web

@S-Panta S-Panta force-pushed the setup-app-provider-for-test branch from 9edf71a to feb03bd Compare January 7, 2025 09:23
@sonarqubecloud SonarQubeCloud
Copy link

sonarqubecloud bot commented Jan 7, 2025

Quality Gate Passed Quality Gate passed

Issues
0 New issues
0 Accepted issues

Measures
0 Security Hotspots
0.0% Coverage on New Code
0.0% Duplication on New Code

See analysis details on SonarQube Cloud

@S-Panta S-Panta marked this pull request as ready for review January 7, 2025 10:28
SagarGi
SagarGi reviewed Jan 8, 2025
View reviewed changes
docs/ocis/development/testing.md
docker compose up
```
Latest ocis build is done with local ocis docker image that is build with this docker compose file.
oCIS will start in `https://ocis.owncloud.test/` along with all other service.
Copy link
Member

Choose a reason for hiding this comment

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

May be you can also add Make sure to add all the hosts in /etc/hosts folder before running the docker compose file your PR description comments in the testing readme as some pre-steps to be followed

SagarGi
SagarGi reviewed Jan 8, 2025
View reviewed changes
Copy link
Member

@SagarGi SagarGi left a comment •
edited
Loading

Choose a reason for hiding this comment

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

Also make a separate env file for tags such as TIKA_IMAGE, LOG_DRIVER , ..... or other possible things to flexibility?

SagarGi
SagarGi reviewed Jan 8, 2025
View reviewed changes
tests/acceptance/docker/documentServer/config/onlyoffice/entrypoint-override.sh
Comment on lines +1 to +7
#!/bin/sh
set -e

# we can't mount it directly because the run-document-server.sh script wants to move it
cp /etc/onlyoffice/documentserver/local.dist.json /etc/onlyoffice/documentserver/local.json

/app/ds/run-document-server.sh
Copy link
Member

@SagarGi SagarGi Jan 8, 2025 •
edited
Loading

Choose a reason for hiding this comment

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

instead of an separate file may be add directly this to the onlyoffice service? possible?

amrita-shrestha
amrita-shrestha requested changes Jan 20, 2025
View reviewed changes
Copy link
Contributor

@amrita-shrestha amrita-shrestha left a comment •
edited
Loading

Choose a reason for hiding this comment

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

why added different folder documentServer?
we have make file inside tests/acceptance/docker which help us to run different service

docs/ocis/development/testing.md
@@ -584,3 +584,12 @@ The sample `fontsMap.json` file is located in `tests/config/drone/fontsMap.json`
"defaultFont": "/path/to/ocis/tests/config/drone/NotoSans.ttf"
}
```


## Running Test Suite With Document Servers (Collabora, ONLYOFFICE or Microsoft using the WOPI protocol.) with dokcer
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
## Running Test Suite With Document Servers (Collabora, ONLYOFFICE or Microsoft using the WOPI protocol.) with dokcer
## Running Test Suite With Document Servers (Collabora, ONLYOFFICE or Microsoft using the WOPI protocol.) with dokcer

nabim777
nabim777 reviewed Jan 22, 2025
View reviewed changes
docs/ocis/development/testing.md
Comment on lines +594 to +595
Latest ocis build is done with local ocis docker image that is build with this docker compose file.
oCIS will start in `https://ocis.owncloud.test/` along with all other service.
Copy link
Member

Choose a reason for hiding this comment

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

Suggested change
Latest ocis build is done with local ocis docker image that is build with this docker compose file.
oCIS will start in `https://ocis.owncloud.test/` along with all other service.
Latest oCIS build is done with local oCIS docker image that is build with this docker compose file.
oCIS will start in `https://ocis.owncloud.test/` along with all other service.

may be need to use only one oCIS or ocis consistently

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@nabim777 nabim777 nabim777 left review comments

@SagarGi SagarGi SagarGi left review comments

@mmattel mmattel mmattel left review comments

@amrita-shrestha amrita-shrestha amrita-shrestha requested changes

@saw-jan saw-jan Awaiting requested review from saw-jan

@PrajwolAmatya PrajwolAmatya Awaiting requested review from PrajwolAmatya

@nirajacharya2 nirajacharya2 Awaiting requested review from nirajacharya2

Requested changes must be addressed to merge this pull request.

Assignees

@S-Panta S-Panta

Labels
QA:team
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

Set Up Required Services for Testing in a Centralized Location
5 participants
@S-Panta @mmattel @SagarGi @amrita-shrestha @nabim777