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

fix: use docker healthcheck #8984

Merged
merged 1 commit into from
Apr 29, 2024
Merged

fix: use docker healthcheck #8984

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
19 changes: 0 additions & 19 deletions deployments/examples/ocis_wopi/config/ocis-appprovider-collabora/entrypoint-override.sh
View file
Open in desktop

This file was deleted.

19 changes: 0 additions & 19 deletions deployments/examples/ocis_wopi/config/ocis-appprovider-onlyoffice/entrypoint-override.sh
View file
Open in desktop

This file was deleted.

24 changes: 12 additions & 12 deletions deployments/examples/ocis_wopi/docker-compose.yml
View file
Open in desktop
Expand Up @@ -110,10 +110,6 @@ services:
image: owncloud/ocis:${OCIS_DOCKER_TAG:-latest}
networks:
ocis-net:
user: "0" # needed for apk add in entrypoint script
entrypoint:
- /bin/sh
- /entrypoint-override.sh
command: app-provider server
environment:
# use the internal service name of the gateway
Expand All @@ -133,22 +129,20 @@ services:
# share the registry with the ocis container
MICRO_REGISTRY_ADDRESS: ocis:9233
volumes:
- ./config/ocis-appprovider-collabora/entrypoint-override.sh:/entrypoint-override.sh
- ocis-config:/etc/ocis
logging:
driver: ${LOG_DRIVER:-local}
restart: always
depends_on:
- ocis
ocis:
condition: service_started
collabora:
condition: service_healthy
Comment on lines 136 to +140
Copy link
Contributor

@wkloucek wkloucek Apr 26, 2024 •
edited

Choose a reason for hiding this comment

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

see also #8144 (comment)

This is only part of V2, right? V3 https://docs.docker.com/compose/compose-file/compose-file-v3/#depends_on doesn't mention it.

Copy link
Contributor

Choose a reason for hiding this comment

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

Ahh, actually the GO version of docker-compose seems to have it!??? https://docs.docker.com/compose/compose-file/05-services/#long-syntax-1

Copy link
Member Author

Choose a reason for hiding this comment

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

local tests show this is working .... 🤷

Copy link
Member Author

Choose a reason for hiding this comment

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

running docker 26.1.0


ocis-appprovider-onlyoffice:
image: owncloud/ocis:${OCIS_DOCKER_TAG:-latest}
networks:
ocis-net:
user: "0" # needed for apk add in entrypoint script
entrypoint:
- /bin/sh
- /entrypoint-override.sh
#command: app-provider server
environment:
# use the internal service name of the gateway
Expand All @@ -168,13 +162,15 @@ services:
# share the registry with the ocis container
MICRO_REGISTRY_ADDRESS: ocis:9233
volumes:
- ./config/ocis-appprovider-onlyoffice/entrypoint-override.sh:/entrypoint-override.sh
- ocis-config:/etc/ocis
logging:
driver: ${LOG_DRIVER:-local}
restart: always
depends_on:
- ocis
ocis:
condition: service_started
onlyoffice:
condition: service_healthy

wopiserver:
image: cs3org/wopiserver:${WOPISERVER_DOCKER_TAG:-v10.3.0}
Expand Down Expand Up @@ -224,6 +220,8 @@ services:
logging:
driver: ${LOG_DRIVER:-local}
restart: always
healthcheck:
test: ["CMD", "curl", "-f", "http://localhost:9980/hosting/discovery"]

onlyoffice:
image: onlyoffice/documentserver:7.5.0
Expand Down Expand Up @@ -251,6 +249,8 @@ services:
logging:
driver: ${LOG_DRIVER:-local}
restart: always
healthcheck:
test: ["CMD", "curl", "-f", "http://localhost/hosting/discovery"]

tika:
image: ${TIKA_IMAGE:-apache/tika:latest-full}
Expand Down