chore: migrate embedded-artifactory to use embedded-postgresql module

admitrov · admitrov · commit d968891aeffa · 2026-05-07T22:13:30.000+01:00
- Replace direct PostgreSQL container with embedded-postgresql dependency
- Remove PostgreSQLProperties class in favor of shared module
- Add system.yaml configuration for database connection
- Increase default wait timeout from 120 to 300 seconds
- Update README with PostgreSQL configuration options
diff --git a/embedded-artifactory/README.adoc b/embedded-artifactory/README.adoc
@@ -23,6 +23,24 @@
 * `embedded.artifactory.password` `(default is 'password')`
 * `embedded.toxiproxy.proxies.artifactory.enabled` Enables both creation of the container with ToxiProxy TCP proxy and a proxy to the `embedded-artifactory` container.
 
+==== PostgreSQL backing store
+
+Artifactory uses PostgreSQL as its backing database, provided by the `embedded-postgresql` module.
+Configure the database via `embedded.postgresql.*` properties:
+
+* `embedded.postgresql.user` `(default is 'postgresql')`
+* `embedded.postgresql.password` `(default is 'letmein')`
+* `embedded.postgresql.database` `(default is 'test_db')`
+* `embedded.postgresql.dockerImage` `(default is 'postgres:18-alpine')`
+
+Example override in `bootstrap.properties`:
+[source,properties]
+----
+embedded.postgresql.user=artifactory
+embedded.postgresql.password=artifactory
+embedded.postgresql.database=artifactory
+----
+
 ==== Produces
 
 * `embedded.artifactory.host`
diff --git a/embedded-artifactory/pom.xml b/embedded-artifactory/pom.xml
@@ -24,8 +24,8 @@
             <artifactId>embedded-toxiproxy</artifactId>
         </dependency>
         <dependency>
-            <groupId>org.testcontainers</groupId>
-            <artifactId>postgresql</artifactId>
+            <groupId>com.playtika.testcontainers</groupId>
+            <artifactId>embedded-postgresql</artifactId>
         </dependency>
 
         <dependency>
diff --git a/embedded-artifactory/src/main/java/com/playtika/testcontainer/artifactory/ArtifactoryProperties.java b/embedded-artifactory/src/main/java/com/playtika/testcontainer/artifactory/ArtifactoryProperties.java
@@ -20,7 +20,7 @@ public class ArtifactoryProperties extends CommonContainerProperties {
     int generalPort = 8082;
 
     public ArtifactoryProperties() {
-        setWaitTimeoutInSeconds(120);
+        setWaitTimeoutInSeconds(300);
     }
 
     @Override
diff --git a/embedded-artifactory/src/main/java/com/playtika/testcontainer/artifactory/EmbeddedArtifactoryBootstrapConfiguration.java b/embedded-artifactory/src/main/java/com/playtika/testcontainer/artifactory/EmbeddedArtifactoryBootstrapConfiguration.java
@@ -2,11 +2,14 @@
 
 import com.playtika.testcontainer.common.spring.DockerPresenceBootstrapConfiguration;
 import com.playtika.testcontainer.common.utils.ContainerUtils;
+import com.playtika.testcontainer.postgresql.EmbeddedPostgreSQLBootstrapConfiguration;
+import com.playtika.testcontainer.postgresql.PostgreSQLProperties;
 import com.playtika.testcontainer.toxiproxy.ToxiproxyClientProxy;
 import com.playtika.testcontainer.toxiproxy.ToxiproxyHelper;
 import com.playtika.testcontainer.toxiproxy.condition.ConditionalOnToxiProxyEnabled;
 import eu.rekawek.toxiproxy.ToxiproxyClient;
 import lombok.extern.slf4j.Slf4j;
+import org.jspecify.annotations.NonNull;
 import org.springframework.beans.factory.annotation.Qualifier;
 import org.springframework.boot.autoconfigure.AutoConfigureAfter;
 import org.springframework.boot.autoconfigure.condition.ConditionalOnExpression;
@@ -19,28 +22,37 @@
 import org.springframework.core.env.MapPropertySource;
 import org.testcontainers.containers.GenericContainer;
 import org.testcontainers.containers.Network;
-import org.testcontainers.containers.PostgreSQLContainer;
-import org.testcontainers.containers.ToxiproxyContainer;
 import org.testcontainers.containers.wait.strategy.HttpWaitStrategy;
 import org.testcontainers.containers.wait.strategy.WaitStrategy;
+import org.testcontainers.images.builder.Transferable;
+import org.testcontainers.postgresql.PostgreSQLContainer;
 import org.testcontainers.toxiproxy.ToxiproxyContainer;
 
+import java.nio.charset.StandardCharsets;
 import java.util.LinkedHashMap;
-import java.util.Optional;
 
 import static com.playtika.testcontainer.artifactory.ArtifactoryProperties.ARTIFACTORY_BEAN_NAME;
 import static com.playtika.testcontainer.common.utils.ContainerUtils.configureCommonsAndStart;
+import static org.testcontainers.postgresql.PostgreSQLContainer.POSTGRESQL_PORT;
 
 @Slf4j
 @Configuration
 @ConditionalOnExpression("${embedded.containers.enabled:true}")
-@AutoConfigureAfter(DockerPresenceBootstrapConfiguration.class)
+@AutoConfigureAfter({DockerPresenceBootstrapConfiguration.class, EmbeddedPostgreSQLBootstrapConfiguration.class})
 @ConditionalOnProperty(name = "embedded.artifactory.enabled", matchIfMissing = true)
-@EnableConfigurationProperties({ArtifactoryProperties.class, PostgreSQLProperties.class})
+@EnableConfigurationProperties(ArtifactoryProperties.class)
 public class EmbeddedArtifactoryBootstrapConfiguration {
 
     private static final String ARTIFACTORY_NETWORK_ALIAS = "artifactory.testcontainer.docker";
 
+    @Bean
+    @ConditionalOnMissingBean(Network.class)
+    Network artifactoryNetwork() {
+        Network network = Network.newNetwork();
+        log.info("Created docker Network with id={}", network.getId());
+        return network;
+    }
+
     @Bean
     @ConditionalOnMissingBean(name = "artifactoryWaitStrategy")
     public WaitStrategy artifactoryWaitStrategy(ArtifactoryProperties properties) {
@@ -72,43 +84,46 @@ ToxiproxyClientProxy artifactoryContainerProxy(ToxiproxyClient toxiproxyClient,
     @Bean(name = ARTIFACTORY_BEAN_NAME, destroyMethod = "stop")
     public GenericContainer<?> artifactory(ConfigurableEnvironment environment,
                                            ArtifactoryProperties properties,
+                                           PostgreSQLContainer postgreSQLContainer,
                                            PostgreSQLProperties postgresqlProperties,
                                            WaitStrategy artifactoryWaitStrategy,
-                                           Optional<Network> network) {
+                                           Network network) {
 
-        PostgreSQLContainer postgresql =
-            new PostgreSQLContainer<>(ContainerUtils.getDockerImageName(postgresqlProperties))
-                .withNetwork(Network.SHARED)
-                .withUsername(postgresqlProperties.getUser())
-                .withPassword(postgresqlProperties.getPassword())
-                .withDatabaseName(postgresqlProperties.getDatabase())
-                .withInitScript(postgresqlProperties.initScriptPath)
-                .withNetworkAliases(properties.getNetworkAlias(), ARTIFACTORY_NETWORK_ALIAS)
-                .withNetworkAliases(ARTIFACTORY_NETWORK_ALIAS);
-
-        network.ifPresent(postgresql::withNetwork);
-        configureCommonsAndStart(postgresql, postgresqlProperties, log);
+        String systemYaml = getSystemYaml(postgresqlProperties,postgreSQLContainer);
 
         GenericContainer<?> container =
                 new GenericContainer<>(ContainerUtils.getDockerImageName(properties))
                         .withExposedPorts(properties.getRestApiPort(), properties.getGeneralPort())
-                        .withNetwork(Network.SHARED)
+                        .withNetwork(network)
                         .withNetworkAliases(properties.getNetworkAlias(), ARTIFACTORY_NETWORK_ALIAS)
-                        .withEnv("username", postgresqlProperties.user)
-                        .withEnv("password", postgresqlProperties.password)
-                        .withEnv("url", "jdbc:postgresql://localhost:5432/" + postgresqlProperties.database)
-                        .withEnv("type", "postgresql")
-                        .withEnv("driver", "org.postgresql.Driver")
+                        .withCopyToContainer(
+                                Transferable.of(systemYaml.getBytes(StandardCharsets.UTF_8), 0666),
+                                "/opt/jfrog/artifactory/var/etc/system.yaml")
                         .waitingFor(artifactoryWaitStrategy);
 
-        network.ifPresent(container::withNetwork);
         configureCommonsAndStart(container, properties, log);
 
         registerEnvironment(container, environment, properties);
 
         return container;
     }
 
+    private static @NonNull String getSystemYaml(PostgreSQLProperties postgresqlProperties,
+                                                 PostgreSQLContainer postgreSQLContainer) {
+        String jdbcUrl = "jdbc:postgresql://%s:%d/%s"
+            .formatted(postgreSQLContainer.getNetwork(), POSTGRESQL_PORT, postgresqlProperties.getDatabase());
+
+        return """
+            shared:
+              database:
+                type: "postgresql"
+                driver: "org.postgresql.Driver"
+                url: "%s"
+                username: "%s"
+                password: "%s"
+            """.formatted(jdbcUrl, postgreSQLContainer.getUsername(), postgreSQLContainer.getPassword());
+    }
+
     private void registerEnvironment(GenericContainer<?> artifactory,
                                      ConfigurableEnvironment environment,
                                      ArtifactoryProperties properties) {
diff --git a/embedded-artifactory/src/main/java/com/playtika/testcontainer/artifactory/PostgreSQLProperties.java b/embedded-artifactory/src/main/java/com/playtika/testcontainer/artifactory/PostgreSQLProperties.java
diff --git a/embedded-postgresql/src/main/java/com/playtika/testcontainer/postgresql/EmbeddedPostgreSQLBootstrapConfiguration.java b/embedded-postgresql/src/main/java/com/playtika/testcontainer/postgresql/EmbeddedPostgreSQLBootstrapConfiguration.java
@@ -18,9 +18,9 @@
 import org.springframework.core.env.MapPropertySource;
 import org.springframework.util.StringUtils;
 import org.testcontainers.containers.Network;
-import org.testcontainers.containers.PostgreSQLContainer;
 import org.testcontainers.containers.wait.strategy.LogMessageWaitStrategy;
 import org.testcontainers.containers.wait.strategy.WaitStrategy;
+import org.testcontainers.postgresql.PostgreSQLContainer;
 import org.testcontainers.toxiproxy.ToxiproxyContainer;
 
 import java.util.LinkedHashMap;
@@ -63,7 +63,7 @@ public PostgreSQLContainer postgresql(ConfigurableEnvironment environment,
                                           Optional<Network> network) {
 
         PostgreSQLContainer postgresql =
-                new PostgreSQLContainer<>(ContainerUtils.getDockerImageName(properties))
+                new PostgreSQLContainer(ContainerUtils.getDockerImageName(properties))
                         .withUsername(properties.getUser())
                         .withPassword(properties.getPassword())
                         .withDatabaseName(properties.getDatabase())
diff --git a/testcontainers-spring-boot-parent/pom.xml b/testcontainers-spring-boot-parent/pom.xml
@@ -80,6 +80,11 @@
                 <artifactId>embedded-toxiproxy</artifactId>
                 <version>${project.version}</version>
             </dependency>
+            <dependency>
+                <groupId>com.playtika.testcontainers</groupId>
+                <artifactId>embedded-postgresql</artifactId>
+                <version>${project.version}</version>
+            </dependency>
             <dependency>
                 <groupId>com.playtika.testcontainers</groupId>
                 <artifactId>embedded-aerospike</artifactId>

Original file line number	Diff line number	Diff line change
`@@ -20,7 +20,7 @@ public class ArtifactoryProperties extends CommonContainerProperties {`
`20`	`20`	`int generalPort = 8082;`
`21`	`21`
`22`	`22`	`public ArtifactoryProperties() {`
`23`		`- setWaitTimeoutInSeconds(120);`
	`23`	`+ setWaitTimeoutInSeconds(300);`
`24`	`24`	`}`
`25`	`25`
`26`	`26`	`@Override`