diff options
Diffstat (limited to 'src/main/java/net/libertacasa/pubsh/web/Docker.java')
-rw-r--r-- | src/main/java/net/libertacasa/pubsh/web/Docker.java | 18 |
1 files changed, 5 insertions, 13 deletions
diff --git a/src/main/java/net/libertacasa/pubsh/web/Docker.java b/src/main/java/net/libertacasa/pubsh/web/Docker.java index 6912d1b..ccac8bf 100644 --- a/src/main/java/net/libertacasa/pubsh/web/Docker.java +++ b/src/main/java/net/libertacasa/pubsh/web/Docker.java @@ -1,24 +1,16 @@ package net.libertacasa.pubsh.web; import java.io.File; -import java.nio.file.Path; import java.time.Duration; -import java.util.ArrayList; import java.util.Arrays; import java.util.Collection; import java.util.HashSet; import java.util.List; import java.util.Set; import java.util.stream.Collectors; - -import org.springframework.core.io.ClassPathResource; - import com.github.dockerjava.api.DockerClient; import com.github.dockerjava.api.command.BuildImageResultCallback; import com.github.dockerjava.api.command.CreateContainerResponse; -import com.github.dockerjava.api.command.InspectExecResponse.Container; -import com.github.dockerjava.api.command.ListContainersCmd; -import com.github.dockerjava.api.command.ListImagesCmd; import com.github.dockerjava.api.command.WaitContainerResultCallback; import com.github.dockerjava.api.model.Image; import com.github.dockerjava.core.DefaultDockerClientConfig; @@ -93,7 +85,7 @@ public class Docker { String dockerfile = "/home/georg/tmp/docker/Dockerfile_" + osChoice; String tag = targetUser + ":sh" + count; if (! new File(dockerfile).exists()) { - System.out.printf("\nInvalid Dockerfile: %s\n", dockerfile); + System.out.printf("Invalid Dockerfile: %s\n", dockerfile); } Set<String> tags = new HashSet<String>(); tags.add(tag); @@ -102,7 +94,7 @@ public class Docker { .withPull(false).withNoCache(false).withTags(tags) .exec(new BuildImageResultCallback()).awaitImageId(); - System.out.printf("\nBuilt image with ID %s", imgid); + System.out.printf("Built image with ID %s\n", imgid); return(imgid); } @@ -110,11 +102,11 @@ public class Docker { List<Image> imagequery = Docker.getImages(); if (imagequery.toString().contains(id)) { - System.out.printf("\nFound image ID %s, deleting ...", id); + System.out.printf("Found image ID %s, deleting ...\n", id); dockerClient.removeImageCmd(id).withImageId(id).exec(); } if (! imagequery.toString().contains(id)) { - System.out.printf("\nImage ID %s not found.", id); + System.out.printf("Image ID %s not found.\n", id); } } @@ -133,7 +125,7 @@ public class Docker { String containerid = createContainerResponse.getId(); //System.out.println(dockerClient.infoCmd().exec()); - System.out.printf("\nCreated container with ID %s from image ID %s", containerid, imgid); + System.out.printf("Created container with ID %s from image ID %s\n", containerid, imgid); return(containerid); } |