From a145ef8d593ea035c5c5ebabeafd2c61ee937242 Mon Sep 17 00:00:00 2001
From: Tomas Mirchev <contact@tomastm.com>
Date: Sun, 8 Sep 2024 11:14:05 +0300
Subject: [PATCH] update

---
 base-debian/Dockerfile             | 12 +++++++-----
 test/Dockerfile                    | 25 -------------------------
 {frontend => web-stack}/Dockerfile |  0
 {frontend => web-stack}/README.md  |  0
 4 files changed, 7 insertions(+), 30 deletions(-)
 delete mode 100644 test/Dockerfile
 rename {frontend => web-stack}/Dockerfile (100%)
 rename {frontend => web-stack}/README.md (100%)

diff --git a/base-debian/Dockerfile b/base-debian/Dockerfile
index e5bf5fe..5435d57 100644
--- a/base-debian/Dockerfile
+++ b/base-debian/Dockerfile
@@ -3,6 +3,7 @@ FROM debian:${VARIANT}
 
 RUN apt-get update && export DEBIAN_FRONTEND=noninteractive \
   && apt-get -y install --no-install-recommends \
+    ca-certificates \
     zsh \
     vim \
     tmux \
@@ -11,13 +12,14 @@ RUN apt-get update && export DEBIAN_FRONTEND=noninteractive \
   && apt-get clean \
   && rm -rf /var/lib/apt/lists/*
 
-RUN useradd -ms /bin/zsh dev
+RUN useradd --system --create-home --shell=/bin/zsh --groups=sudo dev
+RUN mkdir /workspace && chown -R dev:dev /workspace
 USER dev
 
-RUN mkdir /home/dev/_app
+RUN git clone https://gitea.tomastm.com/tomas.mirchev/dotfiles.git ~/.dotfiles
+RUN ~/.dotfiles/install.sh
 
-SHELL ["/bin/zsh", "-c"]
-WORKDIR /home/dev/_app
+WORKDIR /workspace
+ENV w=/workspace
 
 CMD ["zsh"]
-
diff --git a/test/Dockerfile b/test/Dockerfile
deleted file mode 100644
index 5435d57..0000000
--- a/test/Dockerfile
+++ /dev/null
@@ -1,25 +0,0 @@
-ARG VARIANT="bookworm"
-FROM debian:${VARIANT}
-
-RUN apt-get update && export DEBIAN_FRONTEND=noninteractive \
-  && apt-get -y install --no-install-recommends \
-    ca-certificates \
-    zsh \
-    vim \
-    tmux \
-    curl \
-    git \
-  && apt-get clean \
-  && rm -rf /var/lib/apt/lists/*
-
-RUN useradd --system --create-home --shell=/bin/zsh --groups=sudo dev
-RUN mkdir /workspace && chown -R dev:dev /workspace
-USER dev
-
-RUN git clone https://gitea.tomastm.com/tomas.mirchev/dotfiles.git ~/.dotfiles
-RUN ~/.dotfiles/install.sh
-
-WORKDIR /workspace
-ENV w=/workspace
-
-CMD ["zsh"]
diff --git a/frontend/Dockerfile b/web-stack/Dockerfile
similarity index 100%
rename from frontend/Dockerfile
rename to web-stack/Dockerfile
diff --git a/frontend/README.md b/web-stack/README.md
similarity index 100%
rename from frontend/README.md
rename to web-stack/README.md