dockerfile-rails 0.4.6 → 0.4.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: a58947d6c45936ce561ae3ddfdd3799773d17c5145fb15ae8013c9b293b53ce1
-  data.tar.gz: 0a9aff0df9a5e4688d47fa40fe151f6aabe4cdc8f5010c0e5e5514bd0d013fc8
+  metadata.gz: e9b601d4f4e8ba2476ebdc5a721aa605f605b54b36cd2ebda0d8959035ed6621
+  data.tar.gz: 8f87d53ade0657596d6b0915c1523b477d213684019dfb66fd48949a86568186
 SHA512:
-  metadata.gz: 44675c3dbac8f26938a990209e821a2974bd330c4ee1ab7a1cf59316ae2a622ed0cfb03ccf0bf6dfe5f776d200dff31ce789c0840c407fcd6fa64c96e88c4d89
-  data.tar.gz: 9f37b005a98f99c06d724c25afd61a50cb0d1e3c63391fd252b8a7179493b78624b1dd2ae70df45fedd5b92405f99a44bfc6b980369f194e8caa15d66d79bdaf
+  metadata.gz: cfe3dc014ee68c023c65c8dfe1716ba9d05ac6266bf0b1ef478f73968c974be78303d9b108ef91e475cf81fd9398185d46ee4b13ebb9435ca15357db31a71c8a
+  data.tar.gz: 25124c64efc2e59bdd00e608c72758ea6996655051f15cf85242b99311c0d04f700d98c13d936d5e752516eaf58f777964c5e113b0203606a7f0a535e6082ccf

data/lib/generators/dockerfile_generator.rb

@@ -235,18 +235,22 @@ private
 
   def yarn_version
     package = JSON.parse(IO.read('package.json'))
-    if package['packageManager'].to_s.start_with? "yarn@"
+
+    if ENV['RAILS_ENV'] == 'test'
+      # yarn install instructions changed in v2
+      version = '1.22.19'
+    elsif package['packageManager'].to_s.start_with? "yarn@"
       version = package['packageManager'].sub('yarn@', '')
     else
-      version = `yarn --version`[/\d+\.\d+\.\d+/]
+      version = `yarn --version`[/\d+\.\d+\.\d+/] || '1.22.19'
       system "yarn set version #{version}"
-
-      # apparently not all versions of yarn will update package.json
       package = JSON.parse(IO.read('package.json'))
-      unless package['packageManager']
-        package['packageManager'] = "yarn@#{version}"
-        IO.write('package.json', JSON.pretty_generate(package))
-      end
+      # apparently not all versions of yarn will update package.json...
+    end
+
+    unless package['packageManager']
+      package['packageManager'] = "yarn@#{version}"
+      IO.write('package.json', JSON.pretty_generate(package))
     end
 
     version

data/lib/generators/templates/Dockerfile.erb

@@ -70,14 +70,16 @@ RUN --mount=type=cache,id=bld-gem-cache,sharing=locked,target=/srv/vendor \
     mkdir -p vendor && \
     bundle config set path vendor && \
     cp -ar /srv/vendor .
+
 <% else -%>
 RUN bundle _${BUNDLER_VERSION}_ install<% if depend_on_bootsnap? -%> && \
-    bundle exec bootsnap precompile --gemfile
-<% end -%>
-<% end -%>
+    bundle exec bootsnap precompile --gemfile<% end %>
 
+<% end -%>
 <% if parallel? -%>
-asdf
+# Copy node modules
+COPY --from=node /rails/node_modules /rails/node_modules
+
 <% elsif using_node? -%>
 <%= render partial: 'npm_install', locals: {sources: %w(package.json yarn.lock)} %>
 
@@ -95,7 +97,7 @@ RUN bundle exec bootsnap precompile app/ lib/
 <%= "RUN " + binfile_fixups.join(" && \\\n    ") %>
 
 <% end -%>
-<% if Dir.exist?('assets') and !api_only? -%>
+<% if Dir.exist?('app/assets') and !api_only? -%>
 # Precompiling assets for production without requiring secret RAILS_MASTER_KEY
 RUN SECRET_KEY_BASE<%= Rails::VERSION::MAJOR<7 || Rails::VERSION::STRING.start_with?('7.0') ? '=DUMMY' : '_DUMMY=1' %> ./bin/rails assets:precompile
 

data/lib/generators/templates/_install_node.erb

@@ -17,5 +17,14 @@ RUN curl -fsSL https://fnm.vercel.app/install | bash && \
 ENV PATH=/root/.local/share/fnm/aliases/default/bin/:$PATH
 <% end -%>
 <% if yarn_version -%>
+<% if yarn_version < '2' -%>
 RUN npm install -g yarn@$YARN_VERSION
+<% else -%>
+<% if (node_version.split('.').map(&:to_i) <=> [16,10,0]) < 0 -%>
+RUN npm i -g corepack && \
+<% else -%>
+RUN corepack enable && \
+<% end -%>
+    corepack prepare yarn@$YARN_VERSION --activate
+<% end -%>
 <% end -%>

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: dockerfile-rails
 version: !ruby/object:Gem::Version
-  version: 0.4.6
+  version: 0.4.8
 platform: ruby
 authors:
 - Sam Ruby
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2023-01-21 00:00:00.000000000 Z
+date: 2023-01-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails