ExternalVendorCode/balena-supervisor
1
0
Fork 0
mirror of https://github.com/balena-os/balena-supervisor.git synced 2025-02-01 00:45:23 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

fix: overlay compose fields on image for healthcheck

Browse Source 
This commit changes a bug where the compose healthcheck would always
overwrite the healthcheck set by the image - even if no compose
healthcheck exists.

Change-type: patch
Signed-off-by: Cameron Diver <cameron@resin.io>
This commit is contained in:
Cameron Diver 2018-10-16 08:49:58 +01:00
parent 11e97702cf
commit b1434e44ae
No known key found for this signature in database
GPG Key ID: 69264F9C923F55C1
1 changed files with 9 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/compose/utils.ts
View File

@ -190,8 +190,13 @@ function getNanoseconds(timeStr: string): number {
export function composeHealthcheckToServiceHealthcheck(
healthcheck: ComposeHealthcheck | null | undefined,
): ServiceHealthcheck {
if (healthcheck == null || healthcheck.disable) {
): ServiceHealthcheck | { } {
if (healthcheck == null) {
return { };
}
if (healthcheck.disable) {
return { test: [ 'NONE' ] };
}
@ -230,7 +235,8 @@ export function getHealthcheck(
composeHealthcheck,
);
return _.defaults(composeServiceHealthcheck, imageServiceHealthcheck);
// Overlay any compose healthcheck fields on the image healthchecks
return _.assign({ test: [ 'NONE' ] }, imageServiceHealthcheck, composeServiceHealthcheck);
}
export function serviceHealthcheckToDockerHealthcheck(