dockerfile-rails 1.5.4 → 1.5.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: fb14492c49c1cf3daf989207c2188413c0311a317a95727330fcec570f79632c
-  data.tar.gz: c18d7c536626010b3befe71e23ef8c99b53095680e7050dfbcfecd59960cba91
+  metadata.gz: 105efccdb33c4cb74b21af428db4eac3c584edbd33cbc24b9a11db86e43f6ef1
+  data.tar.gz: 00df523cb0297543c13a88b880b82079b76211397ae49e4cdc20cb74f998d9bd
 SHA512:
-  metadata.gz: 50725e7ac313645b93fddb4742a2e711b08e01ba1c593bd0126a70135d04f7467b9d2caa476eb2642903392fc805e2a38ff811aede86c4a2c23843aa30be0189
-  data.tar.gz: 85c0608fc27c115b95d42ddeef4b86b2e5c6be63f652338d01d4b24886686036e2572bab94356f41b3f6e18123d07370b2982f4b224eba34997ef0707381f557
+  metadata.gz: 1a6f44878a174409bb7fc6b3f1d05f63f51d35978328d7a379fa45ee1381d904a5d9dee89154c5ceb953e58c8397cbe65b30a7051984d6e151df39af821cb865
+  data.tar.gz: 4fd03449405ce1a306c3d8d7a6812955748b6809b7fae554ea958c6e9fc71b7d0e20abc813ed4d24b4c472523a60da9c5fccb6387131f360fd800bfd5d4824ff

data/lib/generators/dockerfile_generator.rb

@@ -508,7 +508,11 @@ private
     packages += @@packages["base"] if @@packages["base"]
 
     if using_execjs?
-      packages += %w(curl)
+      if node_version == "lts"
+        packages += %w(nodejs npm)
+      else
+        packages += %w(curl)
+      end
     end
 
     if using_puppeteer?
@@ -542,7 +546,7 @@ private
     # start with the essentials
     packages = %w(build-essential)
     packages += @@packages["build"] if @@packages["build"]
-    packages += %w(nodejs npm) if node_version == "lts"
+    packages += %w(nodejs npm) if (node_version == "lts") && (not using_execjs?)
 
     # add databases: sqlite3, postgres, mysql
     packages << "pkg-config" if options.sqlite3? || @sqlite3
@@ -713,7 +717,7 @@ private
   def build_env
     env = {}
 
-    if using_execjs?
+    if using_execjs? && (node_version != "lts")
       env["PATH"] = "/usr/local/node/bin:$PATH"
     end
 

data/lib/generators/templates/Dockerfile.erb

@@ -39,7 +39,7 @@ RUN gem update --system --no-document && \
 <%= render partial: 'apt_install', locals: {packages: base_packages, clean: true, repos: base_repos} %>
 
 <% end -%>
-<% if using_execjs? -%>
+<% if using_execjs? and node_version != 'lts' -%>
 <%= render partial: 'install_node', locals: {yarn_version: nil} %>
 
 <% end -%>

data/lib/generators/templates/dockerignore.erb

@@ -24,7 +24,6 @@
 
 # Ignore pidfiles, but keep the directory.
 /tmp/pids/*
-!/tmp/pids/
 <% if keeps? -%>
 !/tmp/pids/.keep
 <% end -%>
@@ -34,7 +33,6 @@
 <% if keeps? -%>
 !/storage/.keep
 /tmp/storage/*
-!/tmp/storage/
 !/tmp/storage/.keep
 <% end -%>
 <% unless options.api? -%>

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: dockerfile-rails
 version: !ruby/object:Gem::Version
-  version: 1.5.4
+  version: 1.5.6
 platform: ruby
 authors:
 - Sam Ruby
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2023-09-03 00:00:00.000000000 Z
+date: 2023-09-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails