refactor dockerfile

Author: Shakeskeyboarde

Dockerfile

@@ -2,28 +2,16 @@ FROM mcr.microsoft.com/devcontainers/base:ubuntu
 ARG TARGETARCH
 
 SHELL ["/usr/bin/zsh", "-l", "-c"]
-ENTRYPOINT ["/usr/bin/zsh", "-l"]
 
-# Install global packages and tools
-RUN <<EOF
-  set -e
-  install -dm 755 /etc/apt/keyrings
-  wget -qO - https://mise.jdx.dev/gpg-key.pub | \
-    gpg --dearmor | \
-    tee /etc/apt/keyrings/mise-archive-keyring.gpg 1> /dev/null
-  echo "deb [signed-by=/etc/apt/keyrings/mise-archive-keyring.gpg arch=${TARGETARCH}] https://mise.jdx.dev/deb stable main" | \
-    tee /etc/apt/sources.list.d/mise.list
-  sed -i '/path-exclude/s/^/#/' /etc/dpkg/dpkg.cfg.d/excludes
-  apt-get update -y
-  apt-get upgrade -y
-  apt-get install -y git vim mise
-  apt-get --reinstall install man-db manpages manpages-dev manpages-posix manpages-posix-dev -y
-  apt-get clean -y
-  apt-get autoclean -y
-  apt-get autoremove -y
-  mv /usr/bin/man.REAL /usr/bin/man
-  mandb -c
-EOF
+# Run setup scripts
+COPY setupfiles /tmp/setupfiles
+WORKDIR /tmp/setupfiles
+RUN ./0-apt-init.zsh
+RUN ./1-enable-man-pages.zsh
+RUN ./2-install-packages.zsh
+RUN ./99-apt-cleanup.zsh
+WORKDIR /
+RUN rm -rf /tmp/setupfiles
 
 # Initialize system config
 COPY rootfiles/ /
@@ -33,4 +21,6 @@ USER vscode
 WORKDIR /home/vscode
 COPY --chown=vscode:vscode dotfiles/ ./
 RUN sudo chsh -s /usr/bin/zsh vscode
-RUN sudo mkdir -p /workspaces/.config
+
+# Use login shell for the entrypoint (debug only - devcontainers override this)
+ENTRYPOINT ["/usr/bin/zsh", "-l"]

mise.toml

@@ -3,7 +3,7 @@ AWS_PROFILE = "seahax"
 AWS_REGION = "us-west-2"
 
 [tasks.build]
-run = "docker build -t seahax/devcontainer ."
+run = "docker build --progress=plain -t seahax/devcontainer ."
 
 [tasks.buildx]
-run = "docker buildx build --platform linux/arm64,linux/amd64 -t seahax/devcontainer ."
+run = "docker buildx build --progress=plain --platform linux/arm64,linux/amd64 -t seahax/devcontainer ."

setupfiles/0-apt-init.zsh

@@ -0,0 +1,18 @@
+#!/usr/bin/env zsh
+set -e
+
+# Remove path exclusions from dpkg configuration so that packages that were
+# stubbed by minimizing Ubuntu can be reinstalled (re-enabled).
+sed -i '/path-exclude/s/^/#/' /etc/dpkg/dpkg.cfg.d/excludes
+
+# Add mise repository and GPG key.
+install -dm 755 /etc/apt/keyrings
+wget -qO - https://mise.jdx.dev/gpg-key.pub | \
+  gpg --dearmor | \
+  tee /etc/apt/keyrings/mise-archive-keyring.gpg 1> /dev/null
+echo "deb [signed-by=/etc/apt/keyrings/mise-archive-keyring.gpg arch=${TARGETARCH}] https://mise.jdx.dev/deb stable main" | \
+  tee /etc/apt/sources.list.d/mise.list
+
+# Update apt repositories and upgrade existing packages.
+apt-get update -y
+apt-get upgrade -y

setupfiles/1-enable-man-pages.zsh

@@ -0,0 +1,16 @@
+#!/usr/bin/env zsh
+set -e
+
+# Reinstall man pages to enable them (excluded by minimized Ubuntu).
+apt-get install -y --reinstall \
+  man-db manpages \
+  manpages-dev \
+  manpages-posix \
+  manpages-posix-dev \
+  ;
+
+# Restore the real man command binary.
+mv /usr/bin/man.REAL /usr/bin/man
+
+# Rebuild the man database.
+mandb -c

setupfiles/2-install-packages.zsh

@@ -0,0 +1,7 @@
+#!/usr/bin/env zsh
+set -e
+
+apt-get install -y \
+  vim \
+  mise \
+  ;

setupfiles/99-apt-cleanup.zsh

@@ -0,0 +1,6 @@
+#!/usr/bin/env zsh
+set -e
+
+# Cleanup apt cache and remove unnecessary packages.
+apt-get clean -y
+apt-get autoremove -y