#8 Added option to delay the verification step (and thereby delay relinquishing control to Spring Boot), so that on slow systems, Postgres has the chance to be ready before Liquibase requires a connection. Set after-verification-wait: [value] to introduce the extra sleep.

Author: robert-bor

pom.xml

@@ -1,7 +1,7 @@
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
     <modelVersion>4.0.0</modelVersion>
     <artifactId>spring-boot-docker-postgres</artifactId>
-    <version>0.3.1</version>
+    <version>0.4.0-SNAPSHOT</version>
     <packaging>jar</packaging>
     <groupId>nl.42</groupId>
 

src/main/java/nl/_42/boot/docker/postgres/DockerPostgresBootSequence.java

@@ -15,7 +15,7 @@ public DockerPostgresBootSequence(DockerPostgresProperties properties) {
         this.properties = properties;
     }
 
-    public DockerPostgresContainer execute() throws IOException {
+    public DockerPostgresContainer execute() throws IOException, InterruptedException {
 
         LOGGER.info("| Docker Postgres Properties");
         LOGGER.info("| * Image name: " + properties.getImageName());
@@ -50,6 +50,7 @@ public DockerPostgresContainer execute() throws IOException {
         DockerPostgresContainer postgresContainer = new DockerPostgresContainer(properties, imageDownloaded);
         postgresContainer.start();
         if (postgresContainer.verify()) {
+            applyAfterVerificationWait(properties.getAfterVerificationWait());
             LOGGER.info("| Postgres container successfully started");
         } else {
             LOGGER.error("| Postgres failed to initialize");
@@ -59,4 +60,11 @@ public DockerPostgresContainer execute() throws IOException {
         return postgresContainer;
     }
 
+    private void applyAfterVerificationWait(Integer afterVerificationWait) throws InterruptedException {
+        if (afterVerificationWait > 0) {
+            LOGGER.info("| Applying after verification wait of " + afterVerificationWait + "ms");
+            Thread.sleep(afterVerificationWait);
+        }
+    }
+
 }

src/main/java/nl/_42/boot/docker/postgres/DockerPostgresProperties.java

@@ -32,6 +32,8 @@ public class DockerPostgresProperties {
 
     private boolean forceClean = false;
 
+    private Integer afterVerificationWait = 0;
+
     private Map<String, String> customVariables = new HashMap<>();
 
     public boolean isEnabled() {
@@ -138,6 +140,14 @@ public void setCustomVariables(Map<String, String> customVariables) {
         this.customVariables = customVariables;
     }
 
+    public Integer getAfterVerificationWait() {
+        return afterVerificationWait;
+    }
+
+    public void setAfterVerificationWait(Integer afterVerificationWait) {
+        this.afterVerificationWait = afterVerificationWait;
+    }
+
     public Map<String, String> getProperties() {
         Map<String,String> properties = new HashMap<>();
         properties.put("stdOutFilename", getStdOutFilename());
@@ -151,6 +161,7 @@ public Map<String, String> getProperties() {
         properties.put("startupVerificationText", getStartupVerificationText());
         properties.put("dockerCommand", getDockerCommand());
         properties.put("forceClean", Boolean.toString(isForceClean()));
+        properties.put("afterVerificationWait", Boolean.toString(isForceClean()));
         properties.putAll(getCustomVariables());
         return properties;
     }