add dbInitScriptPath

Author: ibodrov

testcontainers-concord-core/src/main/java/ca/ibodrov/concord/testcontainers/Concord.java

@@ -36,6 +36,7 @@ public class Concord<T extends Concord<T>> implements AutoCloseable {
 
     private boolean startAgent = true;
     private boolean streamAgentLogs;
+    private boolean streamDbLogs;
     private boolean streamServerLogs;
 
     private boolean useMavenCentral = true;
@@ -317,6 +318,18 @@ public T extraMavenRepositories(List<Map<String, Object>> extraMavenRepositories
         return (T) this;
     }
 
+    public boolean streamDbLogs() {
+        return streamDbLogs;
+    }
+
+    /**
+     * Stream the database logs to the console.
+     */
+    public T streamDbLogs(boolean streamDbLogs) {
+        this.streamDbLogs = streamDbLogs;
+        return (T) this;
+    }
+
     public boolean streamServerLogs() {
         return streamServerLogs;
     }

testcontainers-concord-core/src/main/java/ca/ibodrov/concord/testcontainers/DatabaseInit.java

@@ -0,0 +1,26 @@
+package ca.ibodrov.concord.testcontainers;
+
+import org.testcontainers.containers.GenericContainer;
+import org.testcontainers.images.builder.Transferable;
+
+import java.io.IOException;
+import java.io.InputStream;
+
+public final class DatabaseInit {
+
+    public static void addInitScriptFromClassPath(GenericContainer<?> db, String dbInitScriptPath, String containerName) {
+        try (InputStream in = DatabaseInit.class.getResourceAsStream(dbInitScriptPath)) {
+            if (in == null) {
+                throw new IllegalArgumentException("Can't find the DB init script: " + dbInitScriptPath);
+            }
+
+            byte[] ab = in.readAllBytes();
+            db.withCopyToContainer(Transferable.of(ab), "/docker-entrypoint-initdb.d/" + containerName);
+        } catch (IOException e) {
+            throw new RuntimeException("Error while reading the DB init script: " + e.getMessage(), e);
+        }
+    }
+
+    private DatabaseInit() {
+    }
+}

testcontainers-concord-core/src/main/java/ca/ibodrov/concord/testcontainers/DockerConcordEnvironment.java

@@ -35,12 +35,10 @@
 import org.testcontainers.containers.wait.strategy.Wait;
 import org.testcontainers.images.ImagePullPolicy;
 import org.testcontainers.images.PullPolicy;
-import org.testcontainers.images.builder.Transferable;
 import org.testcontainers.lifecycle.Startable;
 import org.testcontainers.utility.MountableFile;
 
 import java.io.IOException;
-import java.io.InputStream;
 import java.nio.file.Files;
 import java.nio.file.Path;
 import java.nio.file.StandardOpenOption;
@@ -82,16 +80,12 @@ public DockerConcordEnvironment(Concord<?> opts) {
 
         String dbInitScriptPath = opts.dbInitScriptPath();
         if (dbInitScriptPath != null) {
-            try(InputStream in = getClass().getResourceAsStream(dbInitScriptPath)) {
-                if (in == null) {
-                    throw new IllegalArgumentException("Can't find the DB init script: " + dbInitScriptPath);
-                }
+            DatabaseInit.addInitScriptFromClassPath(db, dbInitScriptPath, "init.sql");
+        }
 
-                byte[] ab = in.readAllBytes();
-                this.db.withCopyToContainer(Transferable.of())
-            } catch (IOException e) {
-                throw new RuntimeException("Error while reading the DB init script: " + e.getMessage(), e);
-            }
+        if (opts.streamDbLogs()) {
+            Slf4jLogConsumer dbLogConsumer = new Slf4jLogConsumer(log);
+            db.withLogConsumer(dbLogConsumer);
         }
 
         this.server = new GenericContainer<>(opts.serverImage())

testcontainers-concord-core/src/main/java/ca/ibodrov/concord/testcontainers/LocalConcordEnvironment.java

@@ -28,15 +28,13 @@
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.testcontainers.containers.GenericContainer;
+import org.testcontainers.containers.output.Slf4jLogConsumer;
 import org.testcontainers.lifecycle.Startable;
 
 import java.io.IOException;
 import java.net.ConnectException;
 import java.net.HttpURLConnection;
-import java.net.URI;
 import java.net.URL;
-import java.net.http.HttpClient;
-import java.net.http.HttpRequest;
 import java.nio.file.Files;
 import java.nio.file.Path;
 import java.nio.file.Paths;
@@ -70,6 +68,16 @@ public LocalConcordEnvironment(Concord<?> opts) {
                 .withNetworkAliases("db")
                 .withExposedPorts(5432);
 
+        String dbInitScriptPath = opts.dbInitScriptPath();
+        if (dbInitScriptPath != null) {
+            DatabaseInit.addInitScriptFromClassPath(db, dbInitScriptPath, "init.sql");
+        }
+
+        if (opts.streamDbLogs()) {
+            Slf4jLogConsumer dbLogConsumer = new Slf4jLogConsumer(log);
+            db.withLogConsumer(dbLogConsumer);
+        }
+
         // in the LOCAL mode there's only one container - the DB
         // so it's the only thing that can "depend on" anything
         List<Startable> dependsOn = opts.dependsOn();