Skip to content

Commit 7ba18e0

Browse files
authored
Merge pull request #23 from onshi/issues_22
[proposal] Add node and yarn installation logic to dockerfile, bump ruby to 3.3.6, bump rails to 8.0.0
2 parents 72dca6a + f213640 commit 7ba18e0

File tree

3 files changed

+21
-1
lines changed

3 files changed

+21
-1
lines changed

Dockerfile

+9
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,14 @@
11
ARG RUBY_VERSION=3.4.1
22
FROM ruby:${RUBY_VERSION}
3+
4+
ARG NODE_VERSION=22
5+
ARG YARN_VERSION=1.22.22
6+
7+
RUN curl -sL https://deb.nodesource.com/setup_$NODE_VERSION.x | bash - \
8+
&& apt-get update \
9+
&& apt-get install --yes --no-install-recommends nodejs \
10+
&& npm install -g yarn@$YARN_VERSION
11+
312
ARG RAILS_VERSION
413
# Install Rails based on the version specified but if not specified, install the latest version.
514
RUN if [ -z "$RAILS_VERSION" ] ; then gem install rails ; else gem install rails -v $RAILS_VERSION ; fi

Dockerfile.unix

+11
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,21 @@
11
ARG RUBY_VERSION=3.4.1
22
FROM ruby:${RUBY_VERSION}
3+
34
ARG USER_ID=1000
45
ARG GROUP_ID=1000
56
RUN (getent group $GROUP_ID > /dev/null || groupadd -g $GROUP_ID app) && \
67
(getent passwd $USER_ID > /dev/null || useradd -u $USER_ID -g $GROUP_ID -m app)
8+
9+
ARG NODE_VERSION=22
10+
ARG YARN_VERSION=1.22.22
11+
12+
RUN curl -sL https://deb.nodesource.com/setup_$NODE_VERSION.x | bash - \
13+
&& apt-get update \
14+
&& apt-get install --yes --no-install-recommends nodejs \
15+
&& npm install -g yarn@$YARN_VERSION
16+
717
USER $USER_ID:$GROUP_ID
18+
819
ARG RAILS_VERSION
920
# Install Rails based on the version specified but if not specified, install the latest version.
1021
RUN if [ -z "$RAILS_VERSION" ] ; then gem install rails ; else gem install rails -v $RAILS_VERSION ; fi

src/rails_new.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ pub struct Cli {
1717

1818
#[derive(Subcommand)]
1919
pub enum Commands {
20-
/// Prints `rails new --help`
20+
/// Print `rails new --help`
2121
RailsHelp {},
2222
}
2323

0 commit comments

Comments
 (0)