From 275191ba804be027d507e8a50bc100514a6de1e8 Mon Sep 17 00:00:00 2001
From: Ryan W <rwilliamz@gmail.com>
Date: Sun, 4 Feb 2024 10:50:45 -0800
Subject: [PATCH] ruby 3.2.2

---
 bin/docker-entrypoint-development |  2 +-
 development.Dockerfile            | 21 ++++++++++++++++-----
 2 files changed, 17 insertions(+), 6 deletions(-)

diff --git a/bin/docker-entrypoint-development b/bin/docker-entrypoint-development
index 329394d3..c0900800 100755
--- a/bin/docker-entrypoint-development
+++ b/bin/docker-entrypoint-development
@@ -5,7 +5,7 @@ set -e
 rm -f /usr/src/app/tmp/pids/server.pid
 
 echo "bundle install..."
-bundle check || bundle install --jobs 4
+bundle check || bundle install --jobs $(nproc)
 
 # Then exec the container's main process (what's set as CMD in the Dockerfile).
 exec "$@"
diff --git a/development.Dockerfile b/development.Dockerfile
index 1b73f867..7bb8deae 100644
--- a/development.Dockerfile
+++ b/development.Dockerfile
@@ -1,7 +1,7 @@
 # syntax=docker/dockerfile:1
 
 # Make sure RUBY_VERSION matches the Ruby version in .ruby-version and Gemfile
-ARG RUBY_VERSION=3.3.0
+ARG RUBY_VERSION=3.2.2
 FROM registry.docker.com/library/ruby:$RUBY_VERSION-slim as base
 
 # OS Level Dependencies
@@ -13,13 +13,24 @@ RUN --mount=type=cache,target=/var/cache/apt \
   apt-get update -qq \
   && apt-get install -yq --no-install-recommends \
     build-essential \
-    gnupg2 \
-    less \
+    curl \
     git \
     libpq-dev \
-    postgresql-client \
     libvips \
-    curl
+    node-gyp \
+    pkg-config \
+    postgresql-client \
+    python-is-python3
+
+# Install JavaScript dependencies
+ARG NODE_VERSION=20.11.0
+ARG YARN_VERSION=1.22.21
+ENV PATH=/usr/local/node/bin:$PATH
+RUN curl -sL https://github.com/nodenv/node-build/archive/master.tar.gz | tar xz -C /tmp/ && \
+    /tmp/node-build-master/bin/node-build "${NODE_VERSION}" /usr/local/node && \
+    npm install -g yarn@$YARN_VERSION && \
+    rm -rf /tmp/node-build-master
+
 
 ENV LANG=C.UTF-8 \
   BUNDLE_JOBS=4 \