Merge pull request #67 from whitem4rk/bugfix/#66

[Bugfix/#66] Connect container with network
Team-Goraebab · Nov 6, 2024 · 463c2ed · 463c2ed
2 parents 9f1a2cb + 8adc65e
commit 463c2ed
Showing 1 changed file with 12 additions and 2 deletions.
diff --git a/src/main/java/api/goraebab/domain/blueprint/service/DockerSyncServiceImpl.java b/src/main/java/api/goraebab/domain/blueprint/service/DockerSyncServiceImpl.java
@@ -111,7 +111,7 @@ private void customNetworkValidationCheck(List<CustomNetwork> customNetworkList)
         for (CustomNetwork customNetwork : customNetworkList) {
             for (CustomConfig config : customNetwork.getCustomIpam().getCustomConfig()) {
                 if (customNetwork.getName().equals(DEFAULT_BRIDGE_NETWORK_NAME)
-                    && config.getSubnet().equals(DEFAULT_BRIDGE_NETWORK_SUBNET)) {
+                    && !config.getSubnet().equals(DEFAULT_BRIDGE_NETWORK_SUBNET)) {
                     throw new CustomException(ErrorCode.NETWORK_CREATION_FAILED);
                 }
             }
@@ -222,15 +222,25 @@ private List<Map<String, Object>> syncContainers(DockerClient dockerClient, List
                             .withBinds(binds)
                             .withMounts(mounts);
 
+                    ContainerNetwork containerNetwork = new ContainerNetwork()
+                        .withIpamConfig(new ContainerNetwork.Ipam())
+                        .withIpv4Address(customContainer.getCustomNetworkSettings().getIpAddress()); // IP 주소 설정
+
                     // 컨테이너 생성
                     CreateContainerResponse containerResponse = dockerClient.createContainerCmd(imageName)
                             .withName(containerName)
                             .withHostConfig(hostConfig)
                             .withEnv(customContainer.getCustomEnv())
                             .withCmd(customContainer.getCustomCmd())
-                            .withNetworkMode(customNetwork.getName())
                             .exec();
 
+
+                    dockerClient.connectToNetworkCmd()
+                        .withContainerId(containerResponse.getId())
+                        .withNetworkId(customNetwork.getName())
+                        .withContainerNetwork(containerNetwork)
+                        .exec();
+
                     dockerClient.startContainerCmd(containerResponse.getId()).exec();
 
                     containerResult.put(CONTAINER_RESULT_STATUS_KEY, CONTAINER_STATUS_SUCCESS);