dockerfile-rails 1.5.5 → 1.5.7
Sign up to get free protection for your applications and to get access to all the features.
- checksums.yaml +4 -4
- data/lib/generators/dockerfile_generator.rb +15 -3
- data/lib/generators/templates/Dockerfile.erb +1 -1
- metadata +2 -2
checksums.yaml
CHANGED
@@ -1,7 +1,7 @@
|
|
1
1
|
---
|
2
2
|
SHA256:
|
3
|
-
metadata.gz:
|
4
|
-
data.tar.gz:
|
3
|
+
metadata.gz: 72398e19c6ec602cb3ee07308355ee88cb742f99b0fc5662f9853577d9821da0
|
4
|
+
data.tar.gz: ffe47ec3fd02742f6616624bbccc44396bd0e0857628dd016d5e702251c59c60
|
5
5
|
SHA512:
|
6
|
-
metadata.gz:
|
7
|
-
data.tar.gz:
|
6
|
+
metadata.gz: 14eecd6bd9cb250dc156beb8520c57879d51531b5c5174d9b361d48a3dc2ca6e754062546b15201d8e67b7e851c62e5ef5d1efcd18f535e35acc0e164a87a307
|
7
|
+
data.tar.gz: ea07ff6cfcb76487cd07038e82895dfcf99ed7eec998e378046950a8406456b2de590f265186eb09c7f783f7cc1b60673a15ef4373a1920a1dca6234a1033b9b
|
@@ -378,6 +378,10 @@ private
|
|
378
378
|
options.litefs?
|
379
379
|
end
|
380
380
|
|
381
|
+
def using_litestack?
|
382
|
+
@gemfile.include?("litestack")
|
383
|
+
end
|
384
|
+
|
381
385
|
def using_node?
|
382
386
|
return @using_node if @using_node != nil
|
383
387
|
@using_node = File.exist? "package.json"
|
@@ -508,7 +512,11 @@ private
|
|
508
512
|
packages += @@packages["base"] if @@packages["base"]
|
509
513
|
|
510
514
|
if using_execjs?
|
511
|
-
|
515
|
+
if node_version == "lts"
|
516
|
+
packages += %w(nodejs npm)
|
517
|
+
else
|
518
|
+
packages += %w(curl)
|
519
|
+
end
|
512
520
|
end
|
513
521
|
|
514
522
|
if using_puppeteer?
|
@@ -542,7 +550,7 @@ private
|
|
542
550
|
# start with the essentials
|
543
551
|
packages = %w(build-essential)
|
544
552
|
packages += @@packages["build"] if @@packages["build"]
|
545
|
-
packages += %w(nodejs npm) if node_version == "lts"
|
553
|
+
packages += %w(nodejs npm) if (node_version == "lts") && (not using_execjs?)
|
546
554
|
|
547
555
|
# add databases: sqlite3, postgres, mysql
|
548
556
|
packages << "pkg-config" if options.sqlite3? || @sqlite3
|
@@ -701,6 +709,10 @@ private
|
|
701
709
|
env["BUNDLE_DEPLOYMENT"] = "1"
|
702
710
|
end
|
703
711
|
|
712
|
+
if using_litestack?
|
713
|
+
env["LITESTACK_DATA_PATH"] = "/data"
|
714
|
+
end
|
715
|
+
|
704
716
|
if @@args["base"]
|
705
717
|
env.merge! @@args["base"].to_h { |key, value| [key, "$#{key}"] }
|
706
718
|
end
|
@@ -713,7 +725,7 @@ private
|
|
713
725
|
def build_env
|
714
726
|
env = {}
|
715
727
|
|
716
|
-
if using_execjs?
|
728
|
+
if using_execjs? && (node_version != "lts")
|
717
729
|
env["PATH"] = "/usr/local/node/bin:$PATH"
|
718
730
|
end
|
719
731
|
|
@@ -39,7 +39,7 @@ RUN gem update --system --no-document && \
|
|
39
39
|
<%= render partial: 'apt_install', locals: {packages: base_packages, clean: true, repos: base_repos} %>
|
40
40
|
|
41
41
|
<% end -%>
|
42
|
-
<% if using_execjs? -%>
|
42
|
+
<% if using_execjs? and node_version != 'lts' -%>
|
43
43
|
<%= render partial: 'install_node', locals: {yarn_version: nil} %>
|
44
44
|
|
45
45
|
<% end -%>
|
metadata
CHANGED
@@ -1,14 +1,14 @@
|
|
1
1
|
--- !ruby/object:Gem::Specification
|
2
2
|
name: dockerfile-rails
|
3
3
|
version: !ruby/object:Gem::Version
|
4
|
-
version: 1.5.
|
4
|
+
version: 1.5.7
|
5
5
|
platform: ruby
|
6
6
|
authors:
|
7
7
|
- Sam Ruby
|
8
8
|
autorequire:
|
9
9
|
bindir: bin
|
10
10
|
cert_chain: []
|
11
|
-
date: 2023-09-
|
11
|
+
date: 2023-09-11 00:00:00.000000000 Z
|
12
12
|
dependencies:
|
13
13
|
- !ruby/object:Gem::Dependency
|
14
14
|
name: rails
|