fix: Embedded Git container Network setup

Author: RomanCht

embedded-git/src/main/java/com/playtika/testcontainer/git/EmbeddedGitBootstrapConfiguration.java

@@ -64,14 +64,12 @@ ToxiproxyContainer.ContainerProxy gitContainerProxy(ToxiproxyContainer toxiproxy
     public GenericContainer<?> embeddedGit(ConfigurableEnvironment environment,
                                            GitProperties properties,
                                            Optional<Network> network) {
-        GenericContainer<?> gitContainer = configureCommonsAndStart(createContainer(properties), properties, log)
-                .withNetworkAliases(GIT_NETWORK_ALIAS);
-        network.ifPresent(gitContainer::withNetwork);
+        GenericContainer<?> gitContainer = configureCommonsAndStart(createContainer(properties, network), properties, log);
         registerGitEnvironment(gitContainer, environment, properties);
         return gitContainer;
     }
 
-    private GenericContainer<?> createContainer(GitProperties properties) {
+    private GenericContainer<?> createContainer(GitProperties properties, Optional<Network> network) {
         if (isEmpty(properties.getPathToRepositories())) {
             throw new RuntimeException("embedded.git.path-to-repositories is required");
         }
@@ -81,7 +79,9 @@ private GenericContainer<?> createContainer(GitProperties properties) {
                 .withEnv("GIT_REPOSITORIES_PATH", "/projects")
                 .withEnv("GIT_PASSWORD", properties.getPassword())
                 .withExposedPorts(properties.getPort())
+                .withNetworkAliases(GIT_NETWORK_ALIAS)
                 .waitingFor(new HostPortWaitStrategy());
+        network.ifPresent(container::withNetwork);
         if (isNotEmpty(properties.getPathToAuthorizedKeys())) {
             container.withFileSystemBind(properties.getPathToAuthorizedKeys(), "/home/git/.ssh/authorized_keys");
         }

embedded-git/src/test/java/EmbeddedGitBootstrapConfigurationTest.java

@@ -14,6 +14,7 @@
 import org.springframework.context.annotation.Configuration;
 import org.springframework.core.env.ConfigurableEnvironment;
 import org.springframework.core.io.Resource;
+import org.testcontainers.containers.GenericContainer;
 import util.EncryptionUtils;
 
 import java.io.File;
@@ -38,6 +39,10 @@
         }
 )
 class EmbeddedGitBootstrapConfigurationTest {
+
+    @Autowired
+    GenericContainer embeddedGit;
+
     @Autowired
     ConfigurableListableBeanFactory beanFactory;
 
@@ -61,6 +66,11 @@ public void propertiesAreAvailable() {
         assertThat(environment.getProperty("embedded.git.path-to-repositories")).isEqualTo("src/test/resources/repository");
     }
 
+    @Test
+    public void shouldHaveCorrectNetworkAlias() {
+        assertThat(embeddedGit.getNetworkAliases()).contains("git.testcontainer.docker");
+    }
+
     @Test
     @SneakyThrows
     public void testPushViaSsh() {