From 6591692fb0988639dcc7a3fbc19f40b7145449a8 Mon Sep 17 00:00:00 2001 From: bancharf Date: Mon, 14 Oct 2019 15:03:47 +0200 Subject: [PATCH 1/2] Fix Boolean comparison for healthy --- src/main/java/io/fabric8/maven/docker/service/WaitService.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/java/io/fabric8/maven/docker/service/WaitService.java b/src/main/java/io/fabric8/maven/docker/service/WaitService.java index bbef0aeaf..075fd935c 100644 --- a/src/main/java/io/fabric8/maven/docker/service/WaitService.java +++ b/src/main/java/io/fabric8/maven/docker/service/WaitService.java @@ -119,7 +119,7 @@ private List prepareWaitCheckers(ImageConfiguration imageConfig, Pr } } - if (wait.getHealthy() == Boolean.TRUE) { + if (Boolean.TRUE.equals(wait.getHealthy())) { checkers.add(new HealthCheckChecker(dockerAccess, containerId, imageConfig.getDescription(), log)); } From 1bfabe2b5f5d6315646efaf549081891e1caf48d Mon Sep 17 00:00:00 2001 From: bancharf Date: Mon, 14 Oct 2019 15:43:32 +0200 Subject: [PATCH 2/2] Update changelog with healthy option fix #1279 --- doc/changelog.md | 1 + 1 file changed, 1 insertion(+) diff --git a/doc/changelog.md b/doc/changelog.md index bb06d1e05..56fbad891 100644 --- a/doc/changelog.md +++ b/doc/changelog.md @@ -6,6 +6,7 @@ - Allow merging of image configurations using ([#360](https://github.com/fabric8io/docker-maven-plugin/issues/360)) - Treat bridged and default network mode the same #1234 - Fix NPE when cacheFrom is missing from config #1274 + - Fix healthy option regression introduced in 0.25.0 #1279 * **0.31.0** (2019-08-10) - Fix test cases on Windows ([#1220](https://github.com/fabric8io/docker-maven-plugin/issues/1220))