From 80a2841e6b894d0c5d212bf535fe76b8a4eb5f49 Mon Sep 17 00:00:00 2001
From: Tomas Mirchev <contact@tomastm.com>
Date: Tue, 25 Feb 2025 08:06:20 +0100
Subject: [PATCH] update node image

---
 build-image.sh                                |  1 -
 node/Dockerfile                               | 78 +------------------
 .../{install-tools.sh => install-packages.sh} |  5 +-
 3 files changed, 5 insertions(+), 79 deletions(-)
 rename node/{install-tools.sh => install-packages.sh} (83%)

diff --git a/build-image.sh b/build-image.sh
index 44525ee..97d3865 100755
--- a/build-image.sh
+++ b/build-image.sh
@@ -29,7 +29,6 @@ IMAGE_COMMIT="${REPO}/${IMAGE_NAME}:${COMMIT_ID}"
 
 docker build \
   -t ${IMAGE_COMMIT} \
-  --no-cache \
   --build-arg UID=${UID} \
   --build-arg GID=${GID} \
   ${BUILD_DIR}
diff --git a/node/Dockerfile b/node/Dockerfile
index 7306e43..0bbc90b 100644
--- a/node/Dockerfile
+++ b/node/Dockerfile
@@ -1,75 +1,5 @@
-ARG VARIANT="bookworm"
-FROM debian:${VARIANT}
+ARG VERSION="latest"
+FROM registry.tomastm.com/base-debian:${VERSION}
 
-RUN apt-get update && export DEBIAN_FRONTEND=noninteractive \
-  && apt-get -y install --no-install-recommends \
-    ca-certificates \
-    zsh \
-    vim \
-    tmux \
-    curl \
-    wget \
-    unzip \
-    git \
-    python3 \
-    build-essential \
-    libssl-dev \
-    openssh-client \
-    sudo \
-    luarocks \
-    fd-find \
-    ripgrep \
-    locales \
-    tree \
-    htop \
-    jq \
-    man \
-  && apt-get autoremove -y \
-  && apt-get clean -y \
-  && rm -rf /var/lib/apt/lists/*
-
-# Install Neovim
-ENV TREE_SITTER_VERSION="0.23.1"
-ENV TREE_SITTER_URL="https://github.com/tree-sitter/tree-sitter/releases/download/v${TREE_SITTER_VERSION}/tree-sitter-linux-arm64.gz"
-ENV NVIM_VERSION="0.10.0"
-ENV NVIM_URL="https://gitea.tomastm.com/tomas.mirchev/neovim/releases/download/v${NVIM_VERSION}/nvim-linux-arm64.deb"
-
-RUN set -ex \
-    && mkdir -p /tmp/downloads \
-    && cd /tmp/downloads \
-    # Install tree-sitter
-    && wget -O tree-sitter.gz ${TREE_SITTER_URL} \
-    && gzip -d tree-sitter.gz \
-    && chmod +x tree-sitter \
-    && mv tree-sitter /usr/local/bin/ \
-    # Install Neovim
-    && wget -O nvim.deb ${NVIM_URL} \
-    && apt-get install -y ./nvim.deb \
-    # Clean up
-    && rm -rf /tmp/downloads
-
-ENV LANG=en_US.UTF-8
-ENV LC_ALL=en_US.UTF-8
-ENV LC_CTYPE=en_US.UTF-8
-
-RUN sed -i '/en_US.UTF-8/s/^# //g' /etc/locale.gen \
-  && locale-gen
-
-ARG UID=1000
-ARG GID=1000
-
-RUN groupadd -g ${GID} dev
-RUN useradd -u ${UID} -g dev -m -s /bin/zsh dev
-RUN echo "dev ALL=(ALL) NOPASSWD: ALL" >> /etc/sudoers
-
-RUN mkdir /workspace && chown dev:dev /workspace
-WORKDIR /workspace
-
-COPY install-tools.sh /usr/local/bin/install-tools.sh
-RUN chmod +x /usr/local/bin/install-tools.sh
-
-USER dev
-ENV TERM=xterm-256color
-RUN /usr/local/bin/install-tools.sh
-
-CMD ["zsh"]
+COPY install-packages.sh /tmp/install-packages.sh
+RUN sudo chmod +x /tmp/install-packages.sh && /tmp/install-packages.sh && sudo rm /tmp/install-packages.sh
diff --git a/node/install-tools.sh b/node/install-packages.sh
similarity index 83%
rename from node/install-tools.sh
rename to node/install-packages.sh
index a5eb3f8..9750745 100644
--- a/node/install-tools.sh
+++ b/node/install-packages.sh
@@ -1,9 +1,6 @@
 #!/bin/sh
-set -e
 
-# Install dotfiles
-git clone https://gitea.tomastm.com/tomas.mirchev/dotfiles.git $HOME/.dotfiles
-python3 $HOME/.dotfiles/install.py -e linux-dev
+set -e
 
 # Install NVM
 export NVM_DIR="$HOME/.nvm"