Skip to content

Commit feb03bd

Browse files
committed
cleaning docker compose file
1 parent 3578b92 commit feb03bd

File tree

2 files changed

+4
-15
lines changed

2 files changed

+4
-15
lines changed

docs/ocis/development/testing.md

+4-3
Original file line numberDiff line numberDiff line change
@@ -586,9 +586,10 @@ The sample `fontsMap.json` file is located in `tests/config/drone/fontsMap.json`
586586
```
587587

588588

589-
## Running Test Suite With Document servers (Collabora, ONLYOFFICE or Microsoft using the WOPI protocol.)
590-
To run the test related to document servers, go to `tests/acceptance/docker` and run the command
589+
## Running Test Suite With Document Servers (Collabora, ONLYOFFICE or Microsoft using the WOPI protocol.) with dokcer
590+
To run the test related to document Servers, go to `tests/acceptance/docker/documentServer` and run the command
591591
```bash
592592
docker compose up
593593
```
594-
This will start all necessary service along with the latest docker build of owncloud
594+
Latest ocis build is done with local ocis docker image that is build with this docker compose file.
595+
oCIS will start in `https://ocis.owncloud.test/` along with all other service.

tests/acceptance/docker/documentServer/docker-compose.yml

-12
Original file line numberDiff line numberDiff line change
@@ -60,18 +60,12 @@ services:
6060
dockerfile: docker/Dockerfile.linux.amd64
6161
context: ../../../../ocis/
6262
image: owncloud/ocis:dev
63-
# changelog: https://github.com/owncloud/ocis/tree/master/changelog
64-
# release notes: https://doc.owncloud.com/ocis_release_notes.html
6563
networks:
6664
ocis-net:
6765
entrypoint:
6866
- /bin/sh
69-
# run ocis init to initialize a configuration file with random secrets
70-
# it will fail on subsequent runs, because the config file already exists
71-
# therefore we ignore the error and then start the ocis server
7267
command: [ "-c", "ocis init || true; ocis server" ]
7368
environment:
74-
# enable services that are not started automatically
7569
OCIS_URL: https://${OCIS_DOMAIN:-ocis.owncloud.test}
7670
OCIS_LOG_LEVEL: ${LOG_LEVEL:-info}
7771
OCIS_LOG_COLOR: "${LOG_PRETTY:-false}"
@@ -103,12 +97,6 @@ services:
10397
# make collabora the secure view app
10498
FRONTEND_APP_HANDLER_SECURE_VIEW_APP_ADDR: com.owncloud.api.collaboration.CollaboraOnline
10599
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"
106-
107-
# fulltext search ; for tika service
108-
SEARCH_EXTRACTOR_TYPE: tika
109-
SEARCH_EXTRACTOR_TIKA_TIKA_URL: http://tika:9998
110-
FRONTEND_FULL_TEXT_SEARCH_ENABLED: "true"
111-
112100
volumes:
113101
- ./config/app-registry.yaml:/etc/ocis/app-registry.yaml
114102
- ./config/csp.yaml:/etc/ocis/csp.yaml

0 commit comments

Comments
 (0)