Merge pull request rails#53174 from BarnabeD/fix-yarn-dockerfile

[Dockerfile] Fix yarn installation method for yarn > 1.x.x

Author: rafaelfranca

railties/lib/rails/generators/app_base.rb

@@ -540,6 +540,11 @@ def dockerfile_yarn_version
         "latest"
       end
 
+      def yarn_through_corepack?
+        true if dockerfile_yarn_version == "latest"
+        dockerfile_yarn_version >= "2"
+      end
+
       def dockerfile_bun_version
         using_bun? and `bun --version`[/\d+\.\d+\.\d+/]
       rescue

railties/lib/rails/generators/rails/app/templates/Dockerfile.tt

@@ -38,10 +38,17 @@ RUN apt-get update -qq && \
 ARG NODE_VERSION=<%= node_version %>
 ARG YARN_VERSION=<%= dockerfile_yarn_version %>
 ENV PATH=/usr/local/node/bin:$PATH
+<% if yarn_through_corepack? -%>
+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 && \
+    rm -rf /tmp/node-build-master
+RUN corepack enable && yarn set version $YARN_VERSION
+<% else -%>
 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
+<% end -%>
 
 <% end -%>
 <% if using_bun? -%>
@@ -61,7 +68,7 @@ RUN bundle install && \
 <% if using_node? -%>
 # Install node modules
 COPY package.json yarn.lock ./
-RUN yarn install --frozen-lockfile
+RUN yarn install --immutable
 
 <% end -%>
 <% if using_bun? -%>