From 97474acbae2e66aa68ba37f4dfbc56351165f277 Mon Sep 17 00:00:00 2001
From: Jan Makara <jan.makara@hotmail.com>
Date: Thu, 15 Aug 2024 19:34:55 +0200
Subject: [PATCH] add node:22.6.0 and yarn:1.22.22 to dockerfiles

---
 Dockerfile       | 13 +++++++++++++
 Dockerfile.unix  | 15 +++++++++++++++
 src/rails_new.rs |  2 +-
 3 files changed, 29 insertions(+), 1 deletion(-)

diff --git a/Dockerfile b/Dockerfile
index 2e36541..25c11f8 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,5 +1,18 @@
 ARG RUBY_VERSION=3.3.4
 FROM ruby:${RUBY_VERSION}
+
+ARG NODE_VERSION=v22.6.0
+ARG YARN_VERSION=1.22.22
+
+RUN curl -fsSL https://nodejs.org/dist/$NODE_VERSION/node-$NODE_VERSION-linux-x64.tar.gz \
+      -o /tmp/node-$NODE_VERSION-linux-x64.tar.gz \
+  && tar -xzvf /tmp/node-$NODE_VERSION-linux-x64.tar.gz -C /usr/local \
+  && rm -rf /tmp/node-$NODE_VERSION-linux-x64.tar.gz
+
+ENV PATH=/usr/local/node-$NODE_VERSION-linux-x64/bin:$PATH
+
+RUN npm install -g yarn@$YARN_VERSION
+
 ARG RAILS_VERSION
 # Install Rails based on the version specified but if not specified, install the latest version.
 RUN if [ -z "$RAILS_VERSION" ] ; then gem install rails ; else gem install rails -v $RAILS_VERSION ; fi
diff --git a/Dockerfile.unix b/Dockerfile.unix
index 8a66687..36335ba 100644
--- a/Dockerfile.unix
+++ b/Dockerfile.unix
@@ -1,9 +1,24 @@
 ARG RUBY_VERSION=3.3.4
 FROM ruby:${RUBY_VERSION}
+
 ARG USER_ID=1000
 ARG GROUP_ID=1000
 RUN groupadd -g $GROUP_ID app && useradd -u $USER_ID -g app -m app
+
+ARG NODE_VERSION=v22.6.0
+ARG YARN_VERSION=1.22.22
+
+RUN curl -fsSL https://nodejs.org/dist/$NODE_VERSION/node-$NODE_VERSION-linux-x64.tar.gz \
+      -o /tmp/node-$NODE_VERSION-linux-x64.tar.gz \
+  && tar -xzvf /tmp/node-$NODE_VERSION-linux-x64.tar.gz -C /usr/local \
+  && rm -rf /tmp/node-$NODE_VERSION-linux-x64.tar.gz
+
+ENV PATH=/usr/local/node-$NODE_VERSION-linux-x64/bin:$PATH
+
+RUN npm install -g yarn@$YARN_VERSION
+
 USER app
+
 ARG RAILS_VERSION
 # Install Rails based on the version specified but if not specified, install the latest version.
 RUN if [ -z "$RAILS_VERSION" ] ; then gem install rails ; else gem install rails -v $RAILS_VERSION ; fi
diff --git a/src/rails_new.rs b/src/rails_new.rs
index 19d3fa0..e61b4ad 100644
--- a/src/rails_new.rs
+++ b/src/rails_new.rs
@@ -17,7 +17,7 @@ pub struct Cli {
 
 #[derive(Subcommand)]
 pub enum Commands {
-    /// Prints `rails new --help`
+    /// Print `rails new --help`
     RailsHelp {},
 }