Skip to content

Commit c296bc7

Browse files
authored
Merge pull request #11491 from owncloud/fix-depl
fix: Fix debug docker for collabora and onlyoffice in example full deployment
2 parents 663d0aa + dc6eb13 commit c296bc7

File tree

4 files changed

+9
-5
lines changed

4 files changed

+9
-5
lines changed

deployments/examples/ocis_full/debug-collaboration-onlyoffice.yml renamed to deployments/examples/ocis_full/debug/collabora.yml

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,11 @@
11
---
22
services:
33

4-
collaboration-oo:
5-
command: [ "-c", "dlv --listen=:40002 --headless=true --continue --check-go-version=false --api-version=2 --accept-multiclient exec /usr/bin/ocis collaboration server" ]
4+
collaboration:
5+
entrypoint:
6+
- /bin/sh
7+
command: [ "-c", "dlv --listen=:40000 --headless=true --continue --check-go-version=false --api-version=2 --accept-multiclient exec /usr/bin/ocis collaboration server" ]
68
environment:
79
COLLABORATION_LOG_LEVEL: debug
810
ports:
9-
- 40002:40002
11+
- 40002:40000
File renamed without changes.

deployments/examples/ocis_full/debug-collaboration-collabora.yml renamed to deployments/examples/ocis_full/debug/onlyoffice.yml

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,9 @@
11
---
22
services:
33

4-
collaboration:
4+
collaboration-oo:
5+
entrypoint:
6+
- /bin/sh
57
command: [ "-c", "dlv --listen=:40000 --headless=true --continue --check-go-version=false --api-version=2 --accept-multiclient exec /usr/bin/ocis collaboration server" ]
68
environment:
79
COLLABORATION_LOG_LEVEL: debug

deployments/examples/ocis_keycloak/docker-compose.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -56,7 +56,7 @@ services:
5656
# run ocis init to initialize a configuration file with random secrets
5757
# it will fail on subsequent runs, because the config file already exists
5858
# therefore we ignore the error and then start the ocis server
59-
command: ["-c", "ocis init || true; exec ocis server"]
59+
command: [ "-c", "ocis init || true; exec ocis server" ]
6060
environment:
6161
# Keycloak IDP specific configuration
6262
PROXY_AUTOPROVISION_ACCOUNTS: "true"

0 commit comments

Comments
 (0)