From d12f9b60e9cac02c41bd5c74cd405cce99381675 Mon Sep 17 00:00:00 2001
From: alixthegreat <hiscockalix@gmail.com>
Date: Fri, 19 Dec 2025 14:04:35 +0000
Subject: [PATCH] updated from debian 9 to 12 and enabled proxy so docker
 images install

---
 .../utilities/unix/container/docker/docker.pp  | 18 +++++++++---------
 scenarios/ctf/container_escape.xml             |  6 +++---
 2 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/modules/utilities/unix/container/docker/docker.pp b/modules/utilities/unix/container/docker/docker.pp
index 96e9c3ae0..6aded076e 100644
--- a/modules/utilities/unix/container/docker/docker.pp
+++ b/modules/utilities/unix/container/docker/docker.pp
@@ -2,12 +2,12 @@
 $images = $secgen_params['images']
 
 # install
-include 'docker'
+# include 'docker'
 
 # TODO: configure proxy via secgen argument?
-#class { 'docker':
-#  proxy => "http://172.22.0.51:3128",
-#}
+class { 'docker':
+  proxy => "http://172.22.0.51:3128",
+}
 
 
 # remove proxy config (it's in the template, and this overrides)
@@ -47,11 +47,11 @@
 # }
 
 # remove proxy config (it's in the template, and this overrides)
-exec { 'remove_docker_proxy_conf':
-  command => 'sudo rm /etc/systemd/system/docker.service.d/*proxy.conf',
-  path    => ['/bin', '/usr/bin', '/sbin', '/usr/sbin'],
-  onlyif  => 'test -d /etc/systemd/system/docker.service.d && ls /etc/systemd/system/docker.service.d/*proxy.conf',
-}
+# exec { 'remove_docker_proxy_conf':
+#   command => 'sudo rm /etc/systemd/system/docker.service.d/*proxy.conf',
+#   path    => ['/bin', '/usr/bin', '/sbin', '/usr/sbin'],
+#   onlyif  => 'test -d /etc/systemd/system/docker.service.d && ls /etc/systemd/system/docker.service.d/*proxy.conf',
+# }
 
 # download (pull) a set of images
 $images.each |$image| {
diff --git a/scenarios/ctf/container_escape.xml b/scenarios/ctf/container_escape.xml
index 571539671..ddeaefda8 100644
--- a/scenarios/ctf/container_escape.xml
+++ b/scenarios/ctf/container_escape.xml
@@ -44,7 +44,7 @@
 
   <system>
     <system_name>desktop</system_name>
-    <base distro="Debian 9" type="desktop" name="KDE"/>
+    <base distro="Debian 12" type="desktop" name="KDE"/>
 
     <input into_datastore="IP_addresses">
       <value>172.16.0.2</value>
@@ -151,7 +151,7 @@
     <utility module_path=".*/docker">
       <input into="images">
         <value>ubuntu:xenial</value>
-        <value>debian:stretch</value>
+        <value>debian:bookworm</value>
         <value>busybox</value>
       </input>
     </utility>
@@ -188,7 +188,7 @@
 
   <system>
     <system_name>chroot_esc_server</system_name>
-    <base distro="Debian 9" type="desktop" name="KDE"/>
+    <base distro="Debian 12" type="desktop" name="KDE"/>
 
     <utility module_path=".*/handy_cli_tools"/>
     <utility module_path=".*/nmap"/>