dockerfile-rails 1.0.6 → 1.0.7
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- checksums.yaml +4 -4
- data/lib/generators/dockerfile_generator.rb +13 -4
- metadata +1 -1
checksums.yaml
CHANGED
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
---
|
|
2
2
|
SHA256:
|
|
3
|
-
metadata.gz:
|
|
4
|
-
data.tar.gz:
|
|
3
|
+
metadata.gz: bdeba5d0ed37dcc3153aeacdb439a1b43f24581f0503f64bb6c21ab1efaeb2e6
|
|
4
|
+
data.tar.gz: ea2818e2996d68abb56c7ccd8edb50647bcdf17a27012b4438014a266f4b98ef
|
|
5
5
|
SHA512:
|
|
6
|
-
metadata.gz:
|
|
7
|
-
data.tar.gz:
|
|
6
|
+
metadata.gz: bd6911007a0945277da47cc4df5683a55aeb0e6ab834ce37fdbc91bd17a1ec310ae25d00c0167089b70394ccd24e79762136020309105b4894751bfcd05d49dc
|
|
7
|
+
data.tar.gz: 7ff6b8d79e2992b87c8b8fbec8f11f787bfe56ab32d176157f5d4251b6a3b82e1c7f78f00af85a61770a865fd6e871c6441540b69baa49f216589049f2e338a0
|
|
@@ -104,7 +104,9 @@ class DockerfileGenerator < Rails::Generators::Base
|
|
|
104
104
|
template 'Dockerfile.erb', 'Dockerfile'
|
|
105
105
|
template 'dockerignore.erb', '.dockerignore'
|
|
106
106
|
|
|
107
|
-
|
|
107
|
+
if using_node? and node_version =~ /\A\d+\.\d+\.\d+\z/
|
|
108
|
+
template 'node-version.erb', '.node-version'
|
|
109
|
+
end
|
|
108
110
|
|
|
109
111
|
template 'docker-entrypoint.erb', 'bin/docker-entrypoint'
|
|
110
112
|
chmod "bin/docker-entrypoint", 0755 & ~File.umask, verbose: false
|
|
@@ -386,10 +388,17 @@ private
|
|
|
386
388
|
end
|
|
387
389
|
|
|
388
390
|
def node_version
|
|
389
|
-
if File.exist? '.
|
|
390
|
-
IO.read('.
|
|
391
|
+
if File.exist? '.node-version'
|
|
392
|
+
IO.read('.node-version')[/\d+\.\d+\.\d+/]
|
|
391
393
|
else
|
|
392
|
-
|
|
394
|
+
version = nil
|
|
395
|
+
|
|
396
|
+
if File.exist? 'package.json'
|
|
397
|
+
version = JSON.parse(IO.read('package.json')).dig("engines", "node")
|
|
398
|
+
version = nil unless version =~ /\A(\d+\.)+(\d+|x)\z/
|
|
399
|
+
end
|
|
400
|
+
|
|
401
|
+
version || `node --version`[/\d+\.\d+\.\d+/]
|
|
393
402
|
end
|
|
394
403
|
rescue
|
|
395
404
|
"lts"
|