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.

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

[docs-only] wait for collabora to start before trying to register app #8144

Closed
wants to merge 4 commits into from

Conversation

individual-it
Copy link
Member

Description

the apps were not always registered in the UI for me, restarting ocis-appprovider-collabora fixes the problem, so I've added a health-check and a depends condition, to make it reliable

Test together with #8143 because there are other issues

Motivation and Context

How Has This Been Tested?

  • test environment:
  • test case 1:
  • test case 2:
  • ...

Screenshots (if appropriate):

Types of changes

  • Bug fix (non-breaking change which fixes an issue)
  • New feature (non-breaking change which adds functionality)
  • Breaking change (fix or feature that would cause existing functionality to change)
  • Technical debt
  • Tests only (no source changes)

Checklist:

  • Code changes
  • Unit tests added
  • Acceptance tests added
  • Documentation ticket raised:

@@ -127,6 +127,9 @@ services:
logging:
driver: "local"
restart: always
depends_on:
collabora:
condition: service_healthy
Copy link
Contributor

Choose a reason for hiding this comment

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

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
Member Author

Choose a reason for hiding this comment

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

That is true, I've deleted the condition and added a check in the command.
Is that the way to achieve the waiting?

command: app-provider server
entrypoint:
- /bin/sh
command: ["-c", "curl -k --fail https://${COLLABORA_DOMAIN:-collabora.owncloud.test} || exit 1 && ocis app-provider server" ]
Copy link
Contributor

Choose a reason for hiding this comment

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

looks quite similar to what we already have inhttps://github.com/owncloud/ocis/blob/master/deployments/examples/ocis_wopi/config/ocis-appprovider-onlyoffice/entrypoint-override.sh

Could that be reused?

Copy link
Member Author

Choose a reason for hiding this comment

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

done

Copy link

sonarcloud bot commented Jan 8, 2024

Quality Gate Passed Quality Gate passed

Kudos, no new issues were introduced!

0 New issues
0 Security Hotspots
No data about Coverage
No data about Duplication

See analysis details on SonarCloud

@wkloucek wkloucek removed their request for review February 13, 2024 08:09
@wkloucek wkloucek mentioned this pull request Feb 20, 2024
9 tasks
@@ -209,6 +214,13 @@ services:
logging:
driver: "local"
restart: always
healthcheck:
Copy link
Contributor

Choose a reason for hiding this comment

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

Does it make sense to use the healthcheck at all? Does depends_on respect healthcheck?
If it works, we also should add it for the onlyoffice.

@wkloucek wkloucek mentioned this pull request Apr 26, 2024
9 tasks
@DeepDiver1975
Copy link
Member

I think this can be closed.

@DeepDiver1975 DeepDiver1975 deleted the waitForCollaboraToStart branch May 6, 2024 14:55
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants