Skip to content

Commit

Permalink
fix: add feedback from code review
Browse files Browse the repository at this point in the history
  • Loading branch information
micbar committed Jun 28, 2024
1 parent 55ee8ca commit 08061f5
Show file tree
Hide file tree
Showing 5 changed files with 7 additions and 7 deletions.
2 changes: 1 addition & 1 deletion deployments/examples/ocis_full/collabora.yml
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ services:
FRONTEND_APP_HANDLER_SECURE_VIEW_APP_ADDR: com.owncloud.api.collaboration

collaboration:
image: owncloud/ocis-rolling:${OCIS_DOCKER_TAG:-latest}
image: ${OCIS_DOCKER_IMAGE:-owncloud/ocis}:${OCIS_DOCKER_TAG:-latest}
networks:
ocis-net:
depends_on:
Expand Down
2 changes: 1 addition & 1 deletion deployments/examples/ocis_full/ocis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ services:
aliases:
- ${OCIS_DOMAIN:-ocis.owncloud.test}
ocis:
image: owncloud/ocis-rolling:${OCIS_DOCKER_TAG:-latest}
image: ${OCIS_DOCKER_IMAGE:-owncloud/ocis}:${OCIS_DOCKER_TAG:-latest}
networks:
ocis-net:
entrypoint:
Expand Down
2 changes: 1 addition & 1 deletion deployments/examples/ocis_full/onlyoffice.yml
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ services:
- ${WOPISERVER_ONLYOFFICE_DOMAIN:-wopiserver-oo.owncloud.test}

collaboration-oo:
image: owncloud/ocis-rolling:${OCIS_DOCKER_TAG:-latest}
image: ${OCIS_DOCKER_IMAGE:-owncloud/ocis}:${OCIS_DOCKER_TAG:-latest}
networks:
ocis-net:
depends_on:
Expand Down
4 changes: 2 additions & 2 deletions docs/ocis/deployment/ocis_full.md
Original file line number Diff line number Diff line change
Expand Up @@ -272,7 +272,7 @@ Open https://ocis.owncloud.test in your browser and accept the invalid certifica

### Clamav Virusscanner

You can add a Clamav Virusscanner to the stack. The service is disabled by default. To enable it, uncomment the `CLAMAV` line in the `docker-compose.yml` file.
You can add a Clamav Virusscanner to the stack. The service is disabled by default. To enable it, uncomment the `CLAMAV` line in the `.env` file.

```shell {linenos=table,hl_lines=[3]}
## Clamav Settings ##
Expand Down Expand Up @@ -353,7 +353,7 @@ S3NG_BUCKET=

#### Use a local minio S3 storage backend

For testing purposes, you can use a local minio S3 storage backend. To enable it, uncomment the `S3NG_MINIO` line in the `docker-compose.yml` file.
For testing purposes, you can use a local minio S3 storage backend. To enable it, uncomment the `S3NG_MINIO` line in the `.env` file.

The frontend for the minio server is available at `http://minio.owncloud.test` and the access key is `ocis` and the secret key is `ocis-secret`.

Expand Down
4 changes: 2 additions & 2 deletions docs/ocis/development/debugging.md
Original file line number Diff line number Diff line change
Expand Up @@ -148,10 +148,10 @@ make debug-docker
export OCIS_DOCKER_TAG=debug
```
3. Change the docker-compose `ocis` or `collaboration` depends on what do you want to debug:
For example `deployments/examples/ocis_full/docker-compose.yml`
For example `deployments/examples/ocis_full/ocis.yml`
```yaml
ocis:
image: owncloud/ocis:${OCIS_DOCKER_TAG:-latest}
image: ${OCIS_DOCKER_IMAGE:-owncloud/ocis}:${OCIS_DOCKER_TAG:-latest}
networks:
ocis-net:
entrypoint:
Expand Down

0 comments on commit 08061f5

Please sign in to comment.