dockerfile-rails 0.4.3 → 0.4.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 68a853a1d2a0a40c1912a99dd77fe1664abe12bf1678eb4dc07a17873259bc39
-  data.tar.gz: 90bcd80ae9f8a6c8c27cc806235bdec6b9bf308ca3a3ebf10712304f7a52a10e
+  metadata.gz: a64e87599931293e6cc232a0808acf1c30e93274db4fd3b7ce69b1adf505fae4
+  data.tar.gz: ac7188e27e291fdeb814d5fe87b7331f092db6fd8d9ddd742a4b325334c3f516
 SHA512:
-  metadata.gz: 693b078d6d664fdd7366c036dbbb9f95732c79b0f058a2bfe7300c886c479885b33ba075d9d598a1266b2a030bf6bfc588aee6c9074a570e6bd9720749765d28
-  data.tar.gz: a74d6fe97db12495762f5b6dfcd5ff3cf9c32f2807f9402f9e159f485a5e5c8562347811d12fbdf7601ce6755592c7413ebb6402b2c8c606a90c7c0d5e43148e
+  metadata.gz: 0e2a65afdb4224b38b76fbabd6260e0ad81e6d2f375207ae25123bfc9610d1703e13ea15637ba591f078fbaf0200aca95b20e19c510c637c05bc07d096b921d2
+  data.tar.gz: b4de5328f761669136d22a0f1763c177663a4f683b83069be87f61794da61462cfdf480aadd6125affd54bfdebebafc95907e9e36241f9e3beda2873c314f3c6

data/lib/dockerfile-rails/scanner.rb

@@ -26,9 +26,13 @@ module DockerfileRails
       end
       
       if File.exist? 'Gemfile'
-        gemfile_definition = Bundler::Definition.build('Gemfile', nil, [])
-        @gemfile += gemfile_definition.dependencies.map(&:name)
-        @git = !gemfile_definition.spec_git_paths.empty?
+        begin
+          gemfile_definition = Bundler::Definition.build('Gemfile', nil, [])
+          @gemfile += gemfile_definition.dependencies.map(&:name)
+          @git = !gemfile_definition.spec_git_paths.empty?
+        rescue => error
+          STDERR.puts error.message
+        end
       end
 
       @sidekiq = @gemfile.include? 'sidekiq'
@@ -67,4 +71,4 @@ module DockerfileRails
       @redis = @redis_cable || @redis_cache || @sidekiq
     end
   end
-end
+end

data/lib/generators/dockerfile_generator.rb

@@ -242,10 +242,16 @@ private
     Rails.application.config.api_only
   end
 
+  # scan for node clients.  Do a wide scan if api_only?, otherwise look
+  # for specific directories.
   def api_client_dir
-    return unless api_only?
+    if api_only?
+      scan = '*/package.json'
+    else
+      scan = '{client,frontend}/package.json'
+    end
 
-    file = Dir['*/package.json'].find do |file|
+    file = Dir[scan].find do |file|
       JSON.load_file(file).dig('scripts', 'build')
     end
 

data/lib/generators/templates/Dockerfile.erb

@@ -63,7 +63,7 @@ RUN --mount=type=cache,id=bld-gem-cache,sharing=locked,target=/srv/vendor \
     bundle config set app_config .bundle && \
     bundle config set path /srv/vendor && \
     bundle _${BUNDLER_VERSION}_ install && \
-<% if depend_on_bootsnap? -%> && \
+<% if depend_on_bootsnap? -%>
     bundle exec bootsnap precompile --gemfile && \
 <% end -%>
     bundle clean && \
@@ -95,7 +95,7 @@ RUN bundle exec bootsnap precompile app/ lib/
 <%= "RUN " + binfile_fixups.join(" && \\\n    ") %>
 
 <% end -%>
-<% unless api_only? -%>
+<% if Dir.exist?('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
 

metadata

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