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

fix: use docker healthcheck #8984

Merged
merged 1 commit into from Apr 29, 2024
Merged

fix: use docker healthcheck #8984

merged 1 commit into from Apr 29, 2024

Conversation

DeepDiver1975
Copy link
Member

@DeepDiver1975 DeepDiver1975 commented Apr 26, 2024

Description

Trying to fix #8474 without docker user 0

How Has This Been Tested?

docker compose up -d

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:

Copy link

update-docs bot commented Apr 26, 2024

Thanks for opening this pull request! The maintainers of this repository would appreciate it if you would create a changelog item based on your changes.

@DeepDiver1975 DeepDiver1975 marked this pull request as draft April 26, 2024 10:28
@DeepDiver1975 DeepDiver1975 mentioned this pull request Apr 26, 2024
9 tasks
Copy link

sonarcloud bot commented Apr 26, 2024

Quality Gate Passed Quality Gate passed

Issues
0 New issues
0 Accepted issues

Measures
0 Security Hotspots
No data about Coverage
No data about Duplication

See analysis details on SonarCloud

Comment on lines 136 to +140
depends_on:
- ocis
ocis:
condition: service_started
collabora:
condition: service_healthy
Copy link
Contributor

@wkloucek wkloucek Apr 26, 2024

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

@micbar
Copy link
Contributor

micbar commented Apr 29, 2024

@DeepDiver1975 Let us give it a try.

@micbar micbar merged commit 75e8b45 into master Apr 29, 2024
2 checks passed
@delete-merged-branch delete-merged-branch bot deleted the fix/wopi-example-healthcheck branch April 29, 2024 08:51
ownclouders pushed a commit that referenced this pull request Apr 29, 2024
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.

Collabora is not available
3 participants