From fffa8c7cdf49a47f92edf3de02bb275c45fdeac0 Mon Sep 17 00:00:00 2001
From: Max Richter <max.richter@dynabase.de>
Date: Tue, 20 Jan 2026 19:12:56 +0100
Subject: [PATCH] feat: cleanup Dockerfiles and use prepared image for
 deployments

---
 Dockerfile     |  6 ------
 app/Dockerfile | 13 +------------
 2 files changed, 1 insertion(+), 18 deletions(-)

diff --git a/Dockerfile b/Dockerfile
index 7c0b97b..0be17d5 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -2,10 +2,6 @@ FROM node:24-alpine
 
 RUN apk add --no-cache --update curl rclone g++
 
-RUN RUSTUP_URL="https://sh.rustup.rs" \
-  && curl --silent --show-error --location --fail --retry 3 --proto '=https' --tlsv1.2 --output /tmp/rustup-linux-install.sh $RUSTUP_URL \
-  && sh /tmp/rustup-linux-install.sh -y
-
 ENV RUSTUP_HOME=/usr/local/rustup \
   CARGO_HOME=/usr/local/cargo \
   PATH=/usr/local/cargo/bin:$PATH
@@ -15,7 +11,5 @@ RUN curl --silent --show-error --location --fail --retry 3 \
   --output /tmp/rustup-init.sh https://sh.rustup.rs \
   && sh /tmp/rustup-init.sh -y --no-modify-path --profile minimal \
   && rm /tmp/rustup-init.sh \
-  && rustup default stable \
   && rustup target add wasm32-unknown-unknown \
-  && cargo install wasm-pack \
   && npm i -g pnpm
diff --git a/app/Dockerfile b/app/Dockerfile
index 756b976..a059a66 100644
--- a/app/Dockerfile
+++ b/app/Dockerfile
@@ -1,14 +1,4 @@
-FROM node:24-alpine AS builder
-
-# Install system dependencies
-RUN apk add --no-cache curl g++ gcc make libc-dev
-
-ENV RUSTUP_HOME=/usr/local/rustup \
-  CARGO_HOME=/usr/local/cargo \
-  PATH=/usr/local/cargo/bin:$PATH
-
-RUN curl --proto '=https' --tlsv1.2 -sSf https://sh.rustup.rs | sh -s -- -y --no-modify-path --profile minimal \
-  && rustup target add wasm32-unknown-unknown
+FROM jimfx/nodes:latest AS builder
 
 WORKDIR /app
 
@@ -21,7 +11,6 @@ COPY app/package.json ./app/
 RUN --mount=type=cache,id=pnpm-store,target=/root/.local/share/pnpm/store \
   --mount=type=cache,target=/usr/local/cargo/registry \
   --mount=type=cache,target=/app/target \
-  npm install -g pnpm@latest && \
   pnpm install --frozen-lockfile
 
 COPY . .