From e6f751851be0fc36cf7e44054a78d0a1dc237a87 Mon Sep 17 00:00:00 2001
From: Luke Else <mail@luke-else.co.uk>
Date: Thu, 11 Sep 2025 00:15:01 +0100
Subject: [PATCH] feat: Updated lab and rust images

---
 lab/Dockerfile  | 18 ++++++++----------
 rust/Dockerfile |  4 +---
 2 files changed, 9 insertions(+), 13 deletions(-)

diff --git a/lab/Dockerfile b/lab/Dockerfile
index 21898b9..ffd79ae 100644
--- a/lab/Dockerfile
+++ b/lab/Dockerfile
@@ -1,16 +1,12 @@
-FROM alpine:latest
+FROM git.luke-else.co.uk/luke-else/base:latest
 
 # Install core utilities and development tools
 RUN apk add --no-cache \
-    bash \
     curl \
     git \
     jq \
-    helix \
     openssh \
     sudo \
-    shadow \
-    zsh \
     ca-certificates \
     busybox-extras \
     net-tools \
@@ -26,10 +22,12 @@ RUN apk add --no-cache \
 RUN adduser -D dev && echo "dev ALL=(ALL) NOPASSWD:ALL" >> /etc/sudoers
 RUN usermod -aG wheel dev
 
-RUN chsh -s /bin/zsh dev
-# Set working directory
-WORKDIR /home/dev
 # Switch to non-root user
 USER dev
-# Default command
-CMD ["/bin/zsh"]
\ No newline at end of file
+
+# Set working directory
+WORKDIR /home/dev
+
+RUN sh -c "$(wget -O- https://github.com/deluan/zsh-in-docker/releases/download/v1.2.1/zsh-in-docker.sh)"
+
+CMD [ "/bin/zsh" ]
diff --git a/rust/Dockerfile b/rust/Dockerfile
index c317970..25b180c 100644
--- a/rust/Dockerfile
+++ b/rust/Dockerfile
@@ -1,5 +1,3 @@
 FROM git.luke-else.co.uk/luke-else/base:latest
 
-RUN apk add --no-cache rust
-
-RUN apk add --no-cache cargo
+RUN apk add --no-cache cargo
\ No newline at end of file