Skip to content

Commit

Permalink
cleaning docker compose file
Browse files Browse the repository at this point in the history
  • Loading branch information
S-Panta committed Jan 7, 2025
1 parent 3578b92 commit feb03bd
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 15 deletions.
7 changes: 4 additions & 3 deletions docs/ocis/development/testing.md
Original file line number Diff line number Diff line change
Expand Up @@ -586,9 +586,10 @@ The sample `fontsMap.json` file is located in `tests/config/drone/fontsMap.json`
```


## Running Test Suite With Document servers (Collabora, ONLYOFFICE or Microsoft using the WOPI protocol.)
To run the test related to document servers, go to `tests/acceptance/docker` and run the command
## Running Test Suite With Document Servers (Collabora, ONLYOFFICE or Microsoft using the WOPI protocol.) with dokcer
To run the test related to document Servers, go to `tests/acceptance/docker/documentServer` and run the command
```bash
docker compose up
```
This will start all necessary service along with the latest docker build of owncloud
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.
12 changes: 0 additions & 12 deletions tests/acceptance/docker/documentServer/docker-compose.yml
Original file line number Diff line number Diff line change
Expand Up @@ -60,18 +60,12 @@ services:
dockerfile: docker/Dockerfile.linux.amd64
context: ../../../../ocis/
image: owncloud/ocis:dev
# changelog: https://github.com/owncloud/ocis/tree/master/changelog
# release notes: https://doc.owncloud.com/ocis_release_notes.html
networks:
ocis-net:
entrypoint:
- /bin/sh
# run ocis init to initialize a configuration file with random secrets
# it will fail on subsequent runs, because the config file already exists
# therefore we ignore the error and then start the ocis server
command: [ "-c", "ocis init || true; ocis server" ]
environment:
# enable services that are not started automatically
OCIS_URL: https://${OCIS_DOMAIN:-ocis.owncloud.test}
OCIS_LOG_LEVEL: ${LOG_LEVEL:-info}
OCIS_LOG_COLOR: "${LOG_PRETTY:-false}"
Expand Down Expand Up @@ -103,12 +97,6 @@ services:
# make collabora the secure view app
FRONTEND_APP_HANDLER_SECURE_VIEW_APP_ADDR: com.owncloud.api.collaboration.CollaboraOnline
GRAPH_AVAILABLE_ROLES: "b1e2218d-eef8-4d4c-b82d-0f1a1b48f3b5,a8d5fe5e-96e3-418d-825b-534dbdf22b99,fb6c3e19-e378-47e5-b277-9732f9de6e21,58c63c02-1d89-4572-916a-870abc5a1b7d,2d00ce52-1fc2-4dbc-8b95-a73b73395f5a,1c996275-f1c9-4e71-abdf-a42f6495e960,312c0871-5ef7-4b3a-85b6-0e4074c64049,aa97fe03-7980-45ac-9e50-b325749fd7e6"

# fulltext search ; for tika service
SEARCH_EXTRACTOR_TYPE: tika
SEARCH_EXTRACTOR_TIKA_TIKA_URL: http://tika:9998
FRONTEND_FULL_TEXT_SEARCH_ENABLED: "true"

volumes:
- ./config/app-registry.yaml:/etc/ocis/app-registry.yaml
- ./config/csp.yaml:/etc/ocis/csp.yaml
Expand Down

0 comments on commit feb03bd

Please sign in to comment.