diff --git a/Dockerfile b/Dockerfile index d2f2e86..8af73ff 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,5 +1,14 @@ ARG RUBY_VERSION=3.4.1 FROM ruby:${RUBY_VERSION} + +ARG NODE_VERSION=22 +ARG YARN_VERSION=1.22.22 + +RUN curl -sL https://deb.nodesource.com/setup_$NODE_VERSION.x | bash - \ + && apt-get update \ + && apt-get install --yes --no-install-recommends nodejs \ + && 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 2bd8ebb..e8df6a9 100644 --- a/Dockerfile.unix +++ b/Dockerfile.unix @@ -1,10 +1,21 @@ ARG RUBY_VERSION=3.4.1 FROM ruby:${RUBY_VERSION} + ARG USER_ID=1000 ARG GROUP_ID=1000 RUN (getent group $GROUP_ID > /dev/null || groupadd -g $GROUP_ID app) && \ (getent passwd $USER_ID > /dev/null || useradd -u $USER_ID -g $GROUP_ID -m app) + +ARG NODE_VERSION=22 +ARG YARN_VERSION=1.22.22 + +RUN curl -sL https://deb.nodesource.com/setup_$NODE_VERSION.x | bash - \ + && apt-get update \ + && apt-get install --yes --no-install-recommends nodejs \ + && npm install -g yarn@$YARN_VERSION + USER $USER_ID:$GROUP_ID + 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 14c44be..bc7a27e 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 {}, }