dockerfile-rails 1.5.5 → 1.5.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 887b4d62bfcefd69fb9a4d439c0b5ba04b99b56cf907206225a5d9fdabf387bf
-  data.tar.gz: 312fe0d83b1e162dfcc4759740db463c272278f4ac49384550678a8416c652bb
+  metadata.gz: 72398e19c6ec602cb3ee07308355ee88cb742f99b0fc5662f9853577d9821da0
+  data.tar.gz: ffe47ec3fd02742f6616624bbccc44396bd0e0857628dd016d5e702251c59c60
 SHA512:
-  metadata.gz: 4acd6d209416af9d4144ff9acb4c06337f4ca1084c8a739562f2369ade04b9f8402191622733be22cc6f3eac9f3312d814096e0bbdfb77da10669a61e5170262
-  data.tar.gz: e4b2ad3fc68756f2926b919bb461019e1f3568fd7ae4e55ea83c2626b8dc574a42176ab758ae63beb19012ffebe6a004daca8dbfb32dd9ab46e06df3b0c810ad
+  metadata.gz: 14eecd6bd9cb250dc156beb8520c57879d51531b5c5174d9b361d48a3dc2ca6e754062546b15201d8e67b7e851c62e5ef5d1efcd18f535e35acc0e164a87a307
+  data.tar.gz: ea07ff6cfcb76487cd07038e82895dfcf99ed7eec998e378046950a8406456b2de590f265186eb09c7f783f7cc1b60673a15ef4373a1920a1dca6234a1033b9b

data/lib/generators/dockerfile_generator.rb

@@ -378,6 +378,10 @@ private
     options.litefs?
   end
 
+  def using_litestack?
+    @gemfile.include?("litestack")
+  end
+
   def using_node?
     return @using_node if @using_node != nil
     @using_node = File.exist? "package.json"
@@ -508,7 +512,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 +550,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
@@ -701,6 +709,10 @@ private
       env["BUNDLE_DEPLOYMENT"] = "1"
     end
 
+    if using_litestack?
+      env["LITESTACK_DATA_PATH"] = "/data"
+    end
+
     if @@args["base"]
       env.merge! @@args["base"].to_h { |key, value| [key, "$#{key}"] }
     end
@@ -713,7 +725,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 -%>

metadata

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