dockerfile-rails 1.5.6 → 1.5.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 105efccdb33c4cb74b21af428db4eac3c584edbd33cbc24b9a11db86e43f6ef1
-  data.tar.gz: 00df523cb0297543c13a88b880b82079b76211397ae49e4cdc20cb74f998d9bd
+  metadata.gz: c5e9c1e8d960ae456906f2936d6153ded39849a02208fa11a05ca4b8bc0d543e
+  data.tar.gz: 950ef36696d78e571d9a762235194009fedbf98f3f1809aa3a6740d7fb8aa507
 SHA512:
-  metadata.gz: 1a6f44878a174409bb7fc6b3f1d05f63f51d35978328d7a379fa45ee1381d904a5d9dee89154c5ceb953e58c8397cbe65b30a7051984d6e151df39af821cb865
-  data.tar.gz: 4fd03449405ce1a306c3d8d7a6812955748b6809b7fae554ea958c6e9fc71b7d0e20abc813ed4d24b4c472523a60da9c5fccb6387131f360fd800bfd5d4824ff
+  metadata.gz: 66806af153d826188e9e3d7e582f683f66b4cae76b8d0307db0dbc1e9d3d839aa6037ccf578d8a9aa894d2dd18dd42549d23adcacde544e0000a09f58ef3cd22
+  data.tar.gz: 8589fe07b31ca9064c8b6b9d9a839efb78f36f512a00dc3e589bf1a18cbd5605b63e15933d1eb844168501a4283624c160b45f2dea068f06283317fdef731b11

data/lib/generators/dockerfile_generator.rb

@@ -378,11 +378,20 @@ 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"
   end
 
+  def using_bun?
+    return @using_bun if @using_bun != nil
+    @using_bun = File.exist?("bun.config.js") || File.exist?("bun.lockb")
+  end
+
   def using_redis?
     # Note: If you have redis installed on your computer, 'rails new` will
     # automatically add redis to your Gemfile, so having it in your Gemfile is
@@ -497,7 +506,7 @@ private
     if options.ci? && options.lock? && @gemfile.include?("debug")
       # https://github.com/rails/rails/pull/47515
       # https://github.com/rubygems/rubygems/issues/6082#issuecomment-1329756343
-      gems += %w(irb reline) - @gemfile unless Gem.ruby_version >= "3.2.2"
+      gems += %w(irb reline) - @gemfile unless Gem.ruby_version >= Gem::Version.new("3.2.2")
     end
 
     gems.sort
@@ -705,6 +714,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
@@ -946,6 +959,14 @@ private
     "latest"
   end
 
+
+  def bun_version
+    version = `bun --version`[/\d+\.\d+\.\d+/]
+    version ||= `npm show bun version`[/\d+\.\d+\.\d+/]
+
+    version
+  end
+
   def depend_on_bootsnap?
     @gemfile.include? "bootsnap"
   end
@@ -974,7 +995,7 @@ private
     client = api_client_dir
     return unless client
 
-    Dir["#{client}/{package.json,package-lock.json,yarn.lock}"]
+    Dir["#{client}/{package.json,package-lock.json,yarn.lock,bun.lockb}"]
   end
 
   def dbprep_command

data/lib/generators/templates/Dockerfile.erb

@@ -128,7 +128,7 @@ COPY --from=node /usr/local/node /usr/local/node
 ENV PATH=/usr/local/node/bin:$PATH
 
 <% elsif using_node? -%>
-<%= render partial: 'npm_install', locals: {sources: Dir[*%w(.npmrc .yarnrc package.json package-lock.json yarn.lock)]} %>
+<%= render partial: 'npm_install', locals: {sources: Dir[*%w(.npmrc .yarnrc package.json package-lock.json yarn.lock bun.lockb)]} %>
 
 <% end -%>
 # Copy application code

data/lib/generators/templates/_install_node.erb

@@ -8,14 +8,23 @@
 <% if node_version && node_version != 'lts' -%>
 ARG NODE_VERSION=<%= node_version %>
 <% end -%>
+<% if using_bun? -%>
+<% if bun_version -%>
+ARG BUN_VERSION=<%= bun_version %>
+<% end -%>
+<% else -%>
 <% if yarn_version -%>
 ARG YARN_VERSION=<%= yarn_version %>
 <% end -%>
+<% end -%>
 <% if node_version && node_version != 'lts' -%>
 ENV PATH=/usr/local/node/bin:$PATH
 RUN curl -sL https://github.com/nodenv/node-build/archive/master.tar.gz | tar xz -C /tmp/ && \
     /tmp/node-build-master/bin/node-build "${NODE_VERSION}" /usr/local/node && \
 <% end -%>
+<% if using_bun? -%>
+    npm install -g bun<% if bun_version %>@$BUN_VERSION<% end %> && \
+<% else -%>
 <% if yarn_version -%>
 <% if yarn_version < '2' -%>
 <% if node_version -%>   <% else %>RUN<% end %> npm install -g yarn@$YARN_VERSION<% if node_version -%> && \<% end %>
@@ -28,6 +37,7 @@ RUN curl -sL https://github.com/nodenv/node-build/archive/master.tar.gz | tar xz
     corepack prepare yarn@$YARN_VERSION --activate<% if node_version -%> && \<% end %>
 <% end -%>
 <% end -%>
+<% end -%>
 <% if node_version -%>
     rm -rf /tmp/node-build-master
 <% end -%>

data/lib/generators/templates/_npm_install.erb

@@ -5,7 +5,7 @@ COPY<% if options.link? %> --link<% end %> .yarn/releases/* .yarn/releases/
 <% end -%>
 <% if sources.join.include? 'yarn' -%>
 RUN <% if options.cache? -%>--mount=type=cache,id=bld-yarn-cache,target=/root/.yarn \
-    YARN_CACHE_FOLDER=/root/.yarn <% end -%>yarn install<% if options.lock? %> --frozen-lockfile<% end %>
+    YARN_CACHE_FOLDER=/root/.yarn <% end -%><% if using_bun? %>bun<% else %>yarn<% end %> install<% if options.lock? %> --frozen-lockfile<% end %>
 <% else -%>
 <% if options.cache? -%>
 RUN --mount=type=cache,id=bld-npm-cache,target=/root/.npm \

metadata

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