From 3e2ebac614f812c88eceaa97533146a1baec611e Mon Sep 17 00:00:00 2001 From: Arthur Wambst Date: Mon, 20 Oct 2025 17:23:06 +0200 Subject: [PATCH] preparations to have random password for containers --- .../la_banquise/backend/services/DockerService.java | 6 +++--- .../la_banquise/backend/services/InstanceService.java | 11 +++++------ 2 files changed, 8 insertions(+), 9 deletions(-) diff --git a/src/main/java/fr/la_banquise/backend/services/DockerService.java b/src/main/java/fr/la_banquise/backend/services/DockerService.java index 82cfe59..6bd008d 100644 --- a/src/main/java/fr/la_banquise/backend/services/DockerService.java +++ b/src/main/java/fr/la_banquise/backend/services/DockerService.java @@ -171,7 +171,7 @@ public class DockerService { /////////////////////////////////////////////////////////////////////////// /// /// First, we create our container and basic functions - public String createContainer(String name, int port) { + public String createContainer(String name, int port, String username, String password) { ExposedPort tcpSsh = ExposedPort.tcp(2222); Ports portBindings = new Ports(); @@ -199,8 +199,8 @@ public class DockerService { .withExposedPorts(tcpSsh) .withHostConfig(hostConfig) .withEnv("SUDO_ACCESS=false", "PASSWORD_ACCESS=true", - "USER_NAME=test", // TODO : User login - "USER_PASSWORD=test" // TODO : Random passwd + "USER_NAME="+username, // TODO : User login + "USER_PASSWORD="+password // TODO : Random passwd ) .exec(); diff --git a/src/main/java/fr/la_banquise/backend/services/InstanceService.java b/src/main/java/fr/la_banquise/backend/services/InstanceService.java index f2396c4..2737a5d 100644 --- a/src/main/java/fr/la_banquise/backend/services/InstanceService.java +++ b/src/main/java/fr/la_banquise/backend/services/InstanceService.java @@ -62,15 +62,15 @@ public class InstanceService { public void createContainer(Long instanceId) { Instance instance = instanceRepository.findById(instanceId); if (instance.containerId.equals("Not created")) - instance.containerId = - dockerService.createContainer(instance.name, instance.port); + instance.containerId = dockerService.createContainer( + instance.name, instance.port, "test", "test"); } public InspectContainerResponse.ContainerState getStatusContainer(Long id) { Instance instance = instanceRepository.findById(id); return dockerService.getStatusContainer(instance.name); } - + /////////////////////////////////////////////////////////////////////////// /// Finally, start/stop the containers @@ -84,7 +84,7 @@ public class InstanceService { Instance instance = instanceRepository.findById(instanceId); dockerService.stop(instance.containerId); } - + /////////////////////////////////////////////////////////////////////////// /// Last but not least, be able do delete every container and instance @@ -95,7 +95,6 @@ public class InstanceService { return dockerService.remove(instance.name); } - @Transactional public void deleteInstance(Long id) { Instance instance = instanceRepository.findById(id); @@ -105,7 +104,7 @@ public class InstanceService { } /////////////////////////////////////////////////////////////////////////// - ///UTILS FOR PORTS NUMBERS HANDLING + /// UTILS FOR PORTS NUMBERS HANDLING public Set getUsedPorts() { Set retour = new HashSet<>(); List allInstances = getAllInstances();