summaryrefslogtreecommitdiffstats
path: root/src/main/java/net/libertacasa/pubsh/web/WebApplication.java
diff options
context:
space:
mode:
authorGeorg Pfuetzenreuter2022-05-08 13:59:55 +0200
committerGeorg Pfuetzenreuter2022-05-08 13:59:55 +0200
commit5bb047c96004d2a017423b093957d2b478c4ce56 (patch)
tree2895d2e8c687b9133743b19e2b3fd4b46d07a88e /src/main/java/net/libertacasa/pubsh/web/WebApplication.java
parent6379976dff4d1da13576b62c335d253e698c872b (diff)
downloadpubsh-web-5bb047c96004d2a017423b093957d2b478c4ce56.tar.gz
pubsh-web-5bb047c96004d2a017423b093957d2b478c4ce56.tar.bz2
pubsh-web-5bb047c96004d2a017423b093957d2b478c4ce56.zip
Shell deletion logic
Signed-off-by: Georg Pfuetzenreuter <mail@georg-pfuetzenreuter.net>
Diffstat (limited to 'src/main/java/net/libertacasa/pubsh/web/WebApplication.java')
-rw-r--r--src/main/java/net/libertacasa/pubsh/web/WebApplication.java5
1 files changed, 3 insertions, 2 deletions
diff --git a/src/main/java/net/libertacasa/pubsh/web/WebApplication.java b/src/main/java/net/libertacasa/pubsh/web/WebApplication.java
index 7c9f870..bd497d9 100644
--- a/src/main/java/net/libertacasa/pubsh/web/WebApplication.java
+++ b/src/main/java/net/libertacasa/pubsh/web/WebApplication.java
@@ -157,7 +157,8 @@ public class WebApplication {
System.out.printf("Deletion triggered for ID %s by %s (%s)\n", id, userid, username);
- Docker.deleteContainer(id);
+ //Docker.deleteContainer(id);
+ Docker.deleteShell(username, id);
return("redirect:/portal");
}
@@ -176,7 +177,7 @@ public class WebApplication {
System.out.printf("Image deletion triggered for ID %s by %s (%s)\n", id, userid, username);
try {
- Docker.deleteImage(username, id);
+ Docker.deleteImage(id);
String returnmessage = "Success - removed image with ID " + id + "!";
redirectAttributes.addFlashAttribute("message", returnmessage);
} catch (com.github.dockerjava.api.exception.ConflictException exception) {