From 6a5d40cc8eabfb0e2eafc7673333ae022812cffe Mon Sep 17 00:00:00 2001
From: Dave Lang <dave@dave-lang.com>
Date: Mon, 31 Jul 2023 22:04:53 +1000
Subject: [PATCH] Tidy DIND config

---
 README.md                     | 6 +++---
 tools/dind/Dockerfile         | 7 -------
 tools/dind/docker-compose.yml | 9 ++++-----
 3 files changed, 7 insertions(+), 15 deletions(-)
 delete mode 100644 tools/dind/Dockerfile

diff --git a/README.md b/README.md
index 7d13431..9c3cd5c 100644
--- a/README.md
+++ b/README.md
@@ -16,6 +16,6 @@ This environment has webmin and docker already installed, along with a very basi
 
 Use `docker exec -it webmin_master /bin/bash` to get a SSH console.
 
-Docker will not be running by default, use `dockerd` to run it, Ctrl+C to stop.
-
-To setup the test DinD container
+Docker will not be running by default, use `dockerd` to run it, Ctrl+C to stop. Start the internal container via:
+1. `cd dind`
+2. `docker-compose up -d`
diff --git a/tools/dind/Dockerfile b/tools/dind/Dockerfile
deleted file mode 100644
index c46792c..0000000
--- a/tools/dind/Dockerfile
+++ /dev/null
@@ -1,7 +0,0 @@
-FROM ubuntu:18.04
-
-RUN apt-get update && \
-    apt-get -qy full-upgrade && \
-    apt-get install -qy curl && \
-    apt-get install -qy curl && \
-    curl -sSL https://get.docker.com/ | sh
\ No newline at end of file
diff --git a/tools/dind/docker-compose.yml b/tools/dind/docker-compose.yml
index 550f298..bc449e4 100644
--- a/tools/dind/docker-compose.yml
+++ b/tools/dind/docker-compose.yml
@@ -1,8 +1,7 @@
 version: '3.5'
-name: 'webmin'
 services:
   webmin:
-    container_name: internal_test
-    privileged: true
-    build:
-      context: ./
\ No newline at end of file
+    container_name: ubuntu
+    image: ubuntu:18.04
+    restart: on-failure
+    command: ["sleep","infinity"]
\ No newline at end of file