dockerfile-rails 1.5.5 → 1.5.6

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 CHANGED
@@ -1,7 +1,7 @@
1
1
  ---
2
2
  SHA256:
3
- metadata.gz: 887b4d62bfcefd69fb9a4d439c0b5ba04b99b56cf907206225a5d9fdabf387bf
4
- data.tar.gz: 312fe0d83b1e162dfcc4759740db463c272278f4ac49384550678a8416c652bb
3
+ metadata.gz: 105efccdb33c4cb74b21af428db4eac3c584edbd33cbc24b9a11db86e43f6ef1
4
+ data.tar.gz: 00df523cb0297543c13a88b880b82079b76211397ae49e4cdc20cb74f998d9bd
5
5
  SHA512:
6
- metadata.gz: 4acd6d209416af9d4144ff9acb4c06337f4ca1084c8a739562f2369ade04b9f8402191622733be22cc6f3eac9f3312d814096e0bbdfb77da10669a61e5170262
7
- data.tar.gz: e4b2ad3fc68756f2926b919bb461019e1f3568fd7ae4e55ea83c2626b8dc574a42176ab758ae63beb19012ffebe6a004daca8dbfb32dd9ab46e06df3b0c810ad
6
+ metadata.gz: 1a6f44878a174409bb7fc6b3f1d05f63f51d35978328d7a379fa45ee1381d904a5d9dee89154c5ceb953e58c8397cbe65b30a7051984d6e151df39af821cb865
7
+ data.tar.gz: 4fd03449405ce1a306c3d8d7a6812955748b6809b7fae554ea958c6e9fc71b7d0e20abc813ed4d24b4c472523a60da9c5fccb6387131f360fd800bfd5d4824ff
@@ -508,7 +508,11 @@ private
508
508
  packages += @@packages["base"] if @@packages["base"]
509
509
 
510
510
  if using_execjs?
511
- packages += %w(curl)
511
+ if node_version == "lts"
512
+ packages += %w(nodejs npm)
513
+ else
514
+ packages += %w(curl)
515
+ end
512
516
  end
513
517
 
514
518
  if using_puppeteer?
@@ -542,7 +546,7 @@ private
542
546
  # start with the essentials
543
547
  packages = %w(build-essential)
544
548
  packages += @@packages["build"] if @@packages["build"]
545
- packages += %w(nodejs npm) if node_version == "lts"
549
+ packages += %w(nodejs npm) if (node_version == "lts") && (not using_execjs?)
546
550
 
547
551
  # add databases: sqlite3, postgres, mysql
548
552
  packages << "pkg-config" if options.sqlite3? || @sqlite3
@@ -713,7 +717,7 @@ private
713
717
  def build_env
714
718
  env = {}
715
719
 
716
- if using_execjs?
720
+ if using_execjs? && (node_version != "lts")
717
721
  env["PATH"] = "/usr/local/node/bin:$PATH"
718
722
  end
719
723
 
@@ -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.5
4
+ version: 1.5.6
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-09 00:00:00.000000000 Z
11
+ date: 2023-09-11 00:00:00.000000000 Z
12
12
  dependencies:
13
13
  - !ruby/object:Gem::Dependency
14
14
  name: rails