dockerfile-rails 1.0.6 → 1.0.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 9e294d1eb49539e4b311a2f7d8895d71b7349cc09cee142dca45b05aee801eeb
-  data.tar.gz: 84dc33ff8a2802b7aa5cd26054682ba9f2c0b05f2ebf37f68c46bc6c58eed79c
+  metadata.gz: bdeba5d0ed37dcc3153aeacdb439a1b43f24581f0503f64bb6c21ab1efaeb2e6
+  data.tar.gz: ea2818e2996d68abb56c7ccd8edb50647bcdf17a27012b4438014a266f4b98ef
 SHA512:
-  metadata.gz: 95831ef858c0c76aa5a154d90f0db03a83d11542fedf20827e0aec6c15a14034b5fbd1de77103a083f65a8d1d5398e560f56b8d6bda0e6079b84f803e9f64509
-  data.tar.gz: '08d287f97d9f55b8452eba24d3d9cad80a4b7703c505bbaae814de520d4fbea044e3ec7eb9352e8c5f8b455dbd4b392beab946d21b286ee4aaf8b8ca3ece5c63'
+  metadata.gz: bd6911007a0945277da47cc4df5683a55aeb0e6ab834ce37fdbc91bd17a1ec310ae25d00c0167089b70394ccd24e79762136020309105b4894751bfcd05d49dc
+  data.tar.gz: 7ff6b8d79e2992b87c8b8fbec8f11f787bfe56ab32d176157f5d4251b6a3b82e1c7f78f00af85a61770a865fd6e871c6441540b69baa49f216589049f2e338a0

data/lib/generators/dockerfile_generator.rb

@@ -104,7 +104,9 @@ class DockerfileGenerator < Rails::Generators::Base
     template 'Dockerfile.erb', 'Dockerfile'
     template 'dockerignore.erb', '.dockerignore'
 
-    template 'node-version.erb', '.node-version' if using_node?
+    if using_node? and node_version =~ /\A\d+\.\d+\.\d+\z/
+      template 'node-version.erb', '.node-version' 
+    end
 
     template 'docker-entrypoint.erb', 'bin/docker-entrypoint'
     chmod "bin/docker-entrypoint", 0755 & ~File.umask, verbose: false
@@ -386,10 +388,17 @@ private
   end
 
   def node_version
-    if File.exist? '.node_version'
-      IO.read('.node_version')[/\d+\.\d+\.\d+/]
+    if File.exist? '.node-version'
+      IO.read('.node-version')[/\d+\.\d+\.\d+/]
     else
-      `node --version`[/\d+\.\d+\.\d+/]
+      version = nil
+
+      if File.exist? 'package.json'
+        version = JSON.parse(IO.read('package.json')).dig("engines", "node")
+        version = nil unless version =~ /\A(\d+\.)+(\d+|x)\z/
+      end
+
+      version || `node --version`[/\d+\.\d+\.\d+/]
     end
   rescue
     "lts" 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: dockerfile-rails
 version: !ruby/object:Gem::Version
-  version: 1.0.6
+  version: 1.0.7
 platform: ruby
 authors:
 - Sam Ruby