A lot of small improvements

Author: arthurfiorette

.gitconfig

@@ -6,7 +6,8 @@
 [init]
     defaultBranch = main
 [commit]
-    gpgsign = true
+    # Only set this to true if you have a GPG key configured and want to sign all your commits by default.
+    gpgsign = false
 [push]
     autoSetupRemote = true
 [rerere]

.github/workflows/build.yml

@@ -36,6 +36,12 @@ jobs:
       - name: Checkout
         uses: actions/checkout@v4
 
+      - name: Lint shell scripts
+        run: |
+          sudo apt-get update && sudo apt-get install -y shellcheck
+          shellcheck devwork-versions .profile || true
+          echo "Shell script linting completed"
+
       - name: Set up QEMU
         uses: docker/setup-qemu-action@v3
 
@@ -86,3 +92,19 @@ jobs:
           fi
 
           docker run --rm --platform linux/amd64 $IMAGE_TAG devwork-versions
+
+      - name: Image size report
+        run: |
+          echo "### Image Size Report (Node ${{ matrix.node_version }})" >> $GITHUB_STEP_SUMMARY
+          echo '```' >> $GITHUB_STEP_SUMMARY
+          docker images --format "table {{.Repository}}:{{.Tag}}\t{{.Size}}" | grep "${{ matrix.node_version }}-node" || true
+          echo '```' >> $GITHUB_STEP_SUMMARY
+
+          if [ "${{ github.event_name }}" = "pull_request" ]; then
+            IMAGE_TAG="${{ env.IMAGE_NAME }}:${{ matrix.node_version }}-node"
+          else
+            IMAGE_TAG="${{ env.REGISTRY }}/${{ env.IMAGE_NAME }}:${{ matrix.node_version }}-node"
+          fi
+
+          SIZE=$(docker images --format "{{.Size}}" "$IMAGE_TAG" | head -1)
+          echo "Image size: $SIZE"

.zshrc

@@ -1,7 +1,7 @@
 # ~/.zshrc - Zsh-specific configuration
 
 # History configuration
-export HISTFILE="~/shell-history/.zsh_history"
+export HISTFILE="$HOME/shell-history/.zsh_history"
 export HISTSIZE=10000
 export SAVEHIST=10000
 export ZSH="$HOME/.oh-my-zsh"

Dockerfile

@@ -29,30 +29,20 @@ RUN apt-get update && \
         jq \
         bat \
         eza \
+    && apt-get autoremove -y \
     && apt-get clean \
-    && rm -rf /var/lib/apt/lists/*
+    && rm -rf /var/lib/apt/lists/* /tmp/* /var/tmp/*
 
 # Generate locale
 RUN echo "en_US.UTF-8 UTF-8" >> /etc/locale.gen && \
     locale-gen
 ENV LANG=en_US.UTF-8
 ENV LC_ALL=en_US.UTF-8
 
-# Setup sudo for node user
-RUN echo "node ALL=(ALL) NOPASSWD:ALL" > /etc/sudoers.d/node && \
+# Setup sudo for node user (limited to package management only)
+RUN echo "node ALL=(root) NOPASSWD: /usr/bin/apt-get, /usr/bin/apt, /usr/bin/dpkg" > /etc/sudoers.d/node && \
     chmod 0440 /etc/sudoers.d/node
 
-# Setup NPM global directory with proper permissions
-RUN umask 0002 && \
-    groupadd -r npm && \
-    usermod -a -G npm node && \
-    mkdir -p /usr/local/share/npm-global && \
-    chown :npm /usr/local/share/npm-global && \
-    chmod g+s /usr/local/share/npm-global && \
-    npm config set prefix /usr/local/share/npm-global
-ENV NPM_CONFIG_PREFIX=/usr/local/share/npm-global
-ENV PATH=/usr/local/share/npm-global/bin:$PATH
-
 # Copy Git defaults to system-level config
 COPY .gitconfig /etc/gitconfig
 
@@ -62,7 +52,6 @@ RUN chmod +x /usr/local/bin/devwork-versions
 
 # Enable pnpm (latest - projects specify version via packageManager field)
 ENV PNPM_HOME="/pnpm"
-ENV PATH="$PNPM_HOME:$PATH"
 ENV COREPACK_ENABLE_DOWNLOAD_PROMPT=0
 RUN corepack enable && \
     corepack prepare pnpm@latest --activate
@@ -71,11 +60,13 @@ RUN corepack enable && \
 USER node
 WORKDIR /home/node
 
-# Add user bin directories to PATH
-ENV PATH="/home/node/.cargo/bin:/home/node/.claude/bin:$PATH"
+# Setup all PATH directories and NPM config in one place
+ENV NPM_CONFIG_PREFIX="$HOME/.npm-global"
+ENV PATH="$HOME/.cargo/bin:$HOME/.claude/bin:$HOME/.npm-global/bin:$PNPM_HOME:$PATH"
 
 # Configure NPM global for node user
-RUN npm config set prefix /usr/local/share/npm-global
+RUN npm config set prefix "$HOME/.npm-global" && \
+    mkdir -p "$HOME/.npm-global"
 
 # Install uv/uvx (Python package runner for AI tools)
 RUN curl -LsSf https://astral.sh/uv/install.sh | sh
@@ -87,31 +78,36 @@ RUN curl -fsSL https://claude.ai/install.sh | bash
 RUN sh -c "$(curl -fsSL https://raw.githubusercontent.com/ohmyzsh/ohmyzsh/master/tools/install.sh)" "" --unattended
 
 # Install Oh My Zsh custom plugins
-RUN git clone --depth=1 https://github.com/zsh-users/zsh-autosuggestions.git ${ZSH_CUSTOM:-~/.oh-my-zsh/custom}/plugins/zsh-autosuggestions && \
-    git clone --depth=1 https://github.com/zdharma-continuum/fast-syntax-highlighting.git ${ZSH_CUSTOM:-~/.oh-my-zsh/custom}/plugins/fast-syntax-highlighting && \
-    git clone --depth=1 https://github.com/marlonrichert/zsh-autocomplete.git ${ZSH_CUSTOM:-~/.oh-my-zsh/custom}/plugins/zsh-autocomplete && \
-    git clone --depth=1 https://github.com/TamCore/autoupdate-oh-my-zsh-plugins.git ${ZSH_CUSTOM:-~/.oh-my-zsh/custom}/plugins/autoupdate
+ENV ZSH_CUSTOM="$HOME/.oh-my-zsh/custom"
+RUN git clone --depth=1 https://github.com/zsh-users/zsh-autosuggestions.git ${ZSH_CUSTOM}/plugins/zsh-autosuggestions && \
+    git clone --depth=1 https://github.com/zdharma-continuum/fast-syntax-highlighting.git ${ZSH_CUSTOM}/plugins/fast-syntax-highlighting && \
+    git clone --depth=1 https://github.com/marlonrichert/zsh-autocomplete.git ${ZSH_CUSTOM}/plugins/zsh-autocomplete && \
+    git clone --depth=1 https://github.com/TamCore/autoupdate-oh-my-zsh-plugins.git ${ZSH_CUSTOM}/plugins/autoupdate
 
 # Copy shell configurations
-COPY --chown=node:node .profile /home/node/.profile
-COPY --chown=node:node .zshrc /home/node/.zshrc
+COPY --chown=node:node .profile $HOME/.profile
+COPY --chown=node:node .zshrc $HOME/.zshrc
+
+# Copy Starship configuration
+RUN mkdir -p $HOME/.config
+COPY --chown=node:node starship.toml $HOME/.config/starship.toml
 
 # Append .profile loading to .bashrc (don't overwrite existing)
-RUN echo "" >> ~/.bashrc && \
-    echo "# Load shared profile" >> ~/.bashrc && \
-    echo "if [ -f ~/.profile ]; then" >> ~/.bashrc && \
-    echo "    . ~/.profile" >> ~/.bashrc && \
-    echo "fi" >> ~/.bashrc
+RUN echo "" >> $HOME/.bashrc && \
+    echo "# Load shared profile" >> $HOME/.bashrc && \
+    echo "if [ -f ~/.profile ]; then" >> $HOME/.bashrc && \
+    echo "    . ~/.profile" >> $HOME/.bashrc && \
+    echo "fi" >> $HOME/.bashrc
 
 # Git safe directory for mounted volumes
-RUN git config --global --add safe.directory '*'
+RUN git config --global --add safe.directory /workspace
 
 # Create necessary directories with proper ownership
-RUN mkdir -p ~/shell-history \
-    ~/.local/share/zsh \
-    ~/.local/state/zsh-autocomplete/log \
-    ~/.local/share/pnpm/store \
-    && chown -R node:node ~/.local
+RUN mkdir -p $HOME/shell-history \
+    $HOME/.local/share/zsh \
+    $HOME/.local/state/zsh-autocomplete/log \
+    $HOME/.local/share/pnpm/store \
+    && chown -R node:node $HOME/.local
 
 # Set working directory
 WORKDIR /workspace

README.md

@@ -6,7 +6,7 @@ A production-ready Node.js development container image with zsh, Oh My Zsh, Star
 
 ### Base Environment
 
-- Node.js (Debian Bookworm Slim base)
+- Node.js (Debian Trixie Slim base)
 - pnpm package manager (latest via Corepack)
 - GitHub CLI
 - Python 3, make, g++, build-essential
@@ -47,7 +47,7 @@ See `example.devcontainer.json` for a full configuration example including:
 
 ```json
 {
-  "image": "ghcr.io/arthurfiorette/devwork:24-node",
+  "image": "ghcr.io/arthurfiorette/devwork:lts-node",
   "customizations": {
     "vscode": {
       "settings": {
@@ -63,7 +63,7 @@ See `example.devcontainer.json` for a full configuration example including:
 ```yaml
 services:
   devcontainer:
-    image: ghcr.io/arthurfiorette/devwork:24-node
+    image: ghcr.io/arthurfiorette/devwork:lts-node
     volumes:
       - .:/workspace
     command: sleep infinity
@@ -72,22 +72,22 @@ services:
 ### Direct Docker Run
 
 ```bash
-docker run -it --rm ghcr.io/arthurfiorette/devwork:24-node zsh
+docker run -it --rm ghcr.io/arthurfiorette/devwork:lts-node zsh
 ```
 
 ## Available Tags
 
 The image is published with tags for different Node.js versions:
 
+- `lts-node` - Node.js LTS version
+- `lts-node-abc1234` - Node.js LTS at specific commit
+
 - `24-node` - Node.js 24.x (recommended)
 - `24-node-abc1234` - Node.js 24.x at specific commit
 - `22-node` - Node.js 22.x
 - `22-node-abc1234` - Node.js 22.x at specific commit
 
-- `lts-node` - Node.js LTS version
-- `lts-node-abc1234` - Node.js LTS at specific commit
-
-Use version tags (e.g., `24-node`) for the latest build, or commit-specific tags (e.g., `24-node-abc1234`) to pin to a specific version. Images are rebuilt weekly with security updates.
+Use version tags (e.g., `lts-node`) for the latest build, or commit-specific tags (e.g., `lts-node-abc1234`) to pin to a specific version. Images are rebuilt weekly with security updates.
 
 ## Features
 

devwork-versions

@@ -2,15 +2,29 @@
 # devwork-versions - Display versions of all installed development tools
 # Can be used as healthcheck or verification script
 
-set -e
+# Helper function to safely get version or return NOT FOUND
+get_version() {
+    tool_name="$1"
+    version_cmd="$2"
 
-echo "bat:        $(bat --version 2>&1 | head -1 | awk '{print $2}')"
-echo "Claude:     $(claude --version 2>&1 | head -1 || echo 'not found')"
-echo "eza:        $(eza --version 2>&1 | head -1 | awk '{print $2}')"
-echo "jq:         $(jq --version 2>&1 | head -1 | sed 's/jq-//')"
-echo "Node.js:    $(node --version)"
-echo "pnpm:       $(pnpm --version 2>&1 | head -1)"
-echo "ripgrep:    $(rg --version 2>&1 | head -1 | awk '{print $2}')"
-echo "Starship:   $(starship --version 2>&1 | head -1 | awk '{print $2}')"
-echo "uvx:        $(uvx --version 2>&1 | head -1)"
-echo "zsh:        $(zsh --version 2>&1 | head -1 | awk '{print $2}')"
+    if command -v "$(echo "$version_cmd" | awk '{print $1}')" >/dev/null 2>&1; then
+        version=$(eval "$version_cmd" 2>&1 | head -1 || echo "ERROR")
+    else
+        version="NOT FOUND"
+    fi
+
+    printf "%-12s %s\n" "$tool_name:" "$version"
+}
+
+# Display versions
+get_version "bat" "bat --version | awk '{print \$2}'"
+get_version "Claude" "claude --version"
+get_version "eza" "eza --version | awk '{print \$2}'"
+get_version "jq" "jq --version | sed 's/jq-//'"
+get_version "Node.js" "node --version"
+get_version "npm" "npm --version"
+get_version "pnpm" "pnpm --version"
+get_version "ripgrep" "rg --version | awk '{print \$2}'"
+get_version "Starship" "starship --version | awk '{print \$2}'"
+get_version "uvx" "uvx --version"
+get_version "zsh" "zsh --version | awk '{print \$2}'"

example.devcontainer.json

@@ -1,7 +1,7 @@
 {
   "$schema": "https://raw.githubusercontent.com/devcontainers/spec/main/schemas/devContainer.schema.json",
   "name": "Node.js Project",
-  "image": "ghcr.io/arthurfiorette/devwork:24-node",
+  "image": "ghcr.io/arthurfiorette/devwork:lts-node",
   "workspaceFolder": "/workspace",
   "workspaceMount": "source=${localWorkspaceFolder},target=/workspace,type=bind,consistency=cached",
 

starship.toml

@@ -0,0 +1,5 @@
+# Starship configuration for devwork containers
+# Minimal config - only disable Docker to avoid clutter
+
+[docker_context]
+disabled = true