feat: add configurable network alias for PostgreSQL container

- Add `embedded.postgresql.networkAlias` property (default: 'postgresql.testcontainer.docker')
- Use configured network alias in Artifactory system.yaml JDBC URL
- Add test to verify network alias configuration in system.yaml
- Update README documentation with new property

Author: admitrov

embedded-artifactory/README.adoc

@@ -31,6 +31,7 @@ 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.networkAlias` `(default is 'postgresql.testcontainer.docker')`
 * `embedded.postgresql.dockerImage` `(default is 'postgres:18-alpine')`
 
 Example override in `bootstrap.properties`:

embedded-artifactory/src/main/java/com/playtika/testcontainer/artifactory/EmbeddedArtifactoryBootstrapConfiguration.java

@@ -22,7 +22,6 @@
 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.wait.strategy.HttpWaitStrategy;
 import org.testcontainers.containers.wait.strategy.WaitStrategy;
 import org.testcontainers.images.builder.Transferable;
@@ -90,7 +89,7 @@ public GenericContainer<?> artifactory(ConfigurableEnvironment environment,
                                            WaitStrategy artifactoryWaitStrategy,
                                            Network network) {
 
-        String systemYaml = getSystemYaml(postgresqlProperties,postgreSQLContainer);
+        String systemYaml = getSystemYaml(postgresqlProperties, postgreSQLContainer);
 
         GenericContainer<?> container =
                 new GenericContainer<>(ContainerUtils.getDockerImageName(properties))
@@ -109,10 +108,10 @@ public GenericContainer<?> artifactory(ConfigurableEnvironment environment,
         return container;
     }
 
-    private static @NonNull String getSystemYaml(PostgreSQLProperties postgresqlProperties,
-                                                 PostgreSQLContainer postgreSQLContainer) {
+    static @NonNull String getSystemYaml(PostgreSQLProperties postgresqlProperties,
+                                         PostgreSQLContainer postgreSQLContainer) {
         String jdbcUrl = "jdbc:postgresql://%s:%d/%s"
-            .formatted(postgreSQLContainer.getNetwork(), POSTGRESQL_PORT, postgresqlProperties.getDatabase());
+            .formatted(postgresqlProperties.getNetworkAlias(), POSTGRESQL_PORT, postgresqlProperties.getDatabase());
 
         return """
             shared:

embedded-artifactory/src/test/java/com/playtika/testcontainer/artifactory/EmbeddedArtifactoryBootstrapConfigurationSystemYamlTest.java

@@ -0,0 +1,31 @@
+package com.playtika.testcontainer.artifactory;
+
+import com.playtika.testcontainer.postgresql.PostgreSQLProperties;
+import org.junit.jupiter.api.Test;
+import org.testcontainers.postgresql.PostgreSQLContainer;
+
+import static org.assertj.core.api.Assertions.assertThat;
+
+class EmbeddedArtifactoryBootstrapConfigurationSystemYamlTest {
+
+    @Test
+    void shouldUseConfiguredPostgresqlNetworkAliasInSystemYaml() {
+        PostgreSQLProperties postgresqlProperties = new PostgreSQLProperties();
+        postgresqlProperties.setDatabase("artifactory");
+        postgresqlProperties.setNetworkAlias("postgresql.internal");
+
+        PostgreSQLContainer postgreSQLContainer = new PostgreSQLContainer("postgres:18-alpine")
+                .withNetworkAliases("postgresql.internal")
+                .withUsername("artifactory")
+                .withPassword("secret");
+
+        String systemYaml = EmbeddedArtifactoryBootstrapConfiguration.getSystemYaml(
+                postgresqlProperties,
+                postgreSQLContainer);
+
+        assertThat(systemYaml)
+                .contains("url: \"jdbc:postgresql://postgresql.internal:5432/artifactory\"")
+                .contains("username: \"artifactory\"")
+                .contains("password: \"secret\"");
+    }
+}

embedded-artifactory/src/test/resources/bootstrap.properties

@@ -0,0 +1,3 @@
+embedded.postgresql.user=artifactory
+embedded.postgresql.password=artifactory
+embedded.postgresql.database=artifactory

embedded-postgresql/README.adoc

@@ -22,6 +22,7 @@
 * `embedded.postgresql.database`
 * `embedded.postgresql.user`
 * `embedded.postgresql.password`
+* `embedded.postgresql.networkAlias` `(default is 'postgresql.testcontainer.docker')`
 * `embedded.postgresql.initScriptPath` `(default is null)`
 * `embedded.postgresql.startupLogCheckRegex` `(default is null)`
 * `embedded.postgresql.mountVolumes` `(default is empty list)`

embedded-postgresql/src/main/java/com/playtika/testcontainer/postgresql/EmbeddedPostgreSQLBootstrapConfiguration.java

@@ -37,8 +37,6 @@
 @EnableConfigurationProperties(PostgreSQLProperties.class)
 public class EmbeddedPostgreSQLBootstrapConfiguration {
 
-    private static final String POSTGRESQL_NETWORK_ALIAS = "postgresql.testcontainer.docker";
-
     @Bean
     @ConditionalOnToxiProxyEnabled(module = "postgresql")
     ToxiproxyClientProxy postgresqlContainerProxy(ToxiproxyClient toxiproxyClient,
@@ -68,7 +66,7 @@ public PostgreSQLContainer postgresql(ConfigurableEnvironment environment,
                         .withPassword(properties.getPassword())
                         .withDatabaseName(properties.getDatabase())
                         .withInitScript(properties.initScriptPath)
-                        .withNetworkAliases(POSTGRESQL_NETWORK_ALIAS);
+                        .withNetworkAliases(properties.getNetworkAlias());
 
         network.ifPresent(postgresql::withNetwork);
 
@@ -96,7 +94,7 @@ private void registerPostgresqlEnvironment(PostgreSQLContainer postgresql,
         map.put("embedded.postgresql.schema", properties.getDatabase());
         map.put("embedded.postgresql.user", properties.getUser());
         map.put("embedded.postgresql.password", properties.getPassword());
-        map.put("embedded.postgresql.networkAlias", POSTGRESQL_NETWORK_ALIAS);
+        map.put("embedded.postgresql.networkAlias", properties.getNetworkAlias());
         map.put("embedded.postgresql.internalPort", PostgreSQLContainer.POSTGRESQL_PORT);
 
         String jdbcURL = "jdbc:postgresql://{}:{}/{}";

embedded-postgresql/src/main/java/com/playtika/testcontainer/postgresql/PostgreSQLProperties.java

@@ -10,10 +10,12 @@
 @ConfigurationProperties("embedded.postgresql")
 public class PostgreSQLProperties extends CommonContainerProperties {
     static final String BEAN_NAME_EMBEDDED_POSTGRESQL = "embeddedPostgreSql";
+    static final String DEFAULT_NETWORK_ALIAS = "postgresql.testcontainer.docker";
 
     String user = "postgresql";
     String password = "letmein";
     String database = "test_db";
+    String networkAlias = DEFAULT_NETWORK_ALIAS;
     String startupLogCheckRegex;
     /**
      * The SQL file path to execute after the container starts to initialize the database.

embedded-postgresql/src/main/resources/META-INF/additional-spring-configuration-metadata.json

@@ -17,6 +17,11 @@
       "type": "java.lang.String",
       "defaultValue": "null",
       "description": "The SQL file path to execute after the container starts to initialize the database."
+    },
+    {
+      "name": "embedded.postgresql.network-alias",
+      "type": "java.lang.String",
+      "defaultValue": "postgresql.testcontainer.docker"
     }
   ],
   "hints": [