dockerfile-rails 1.5.7 → 1.5.9

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 72398e19c6ec602cb3ee07308355ee88cb742f99b0fc5662f9853577d9821da0
-  data.tar.gz: ffe47ec3fd02742f6616624bbccc44396bd0e0857628dd016d5e702251c59c60
+  metadata.gz: aa278e91ec05725efb320caaecd9ca2cde617166b4ad4157f7103eeccecf4961
+  data.tar.gz: 748f841c1ba25cfa9f126c056a97e6eb9f6e854ea937f0e7c3a93756992746ed
 SHA512:
-  metadata.gz: 14eecd6bd9cb250dc156beb8520c57879d51531b5c5174d9b361d48a3dc2ca6e754062546b15201d8e67b7e851c62e5ef5d1efcd18f535e35acc0e164a87a307
-  data.tar.gz: ea07ff6cfcb76487cd07038e82895dfcf99ed7eec998e378046950a8406456b2de590f265186eb09c7f783f7cc1b60673a15ef4373a1920a1dca6234a1033b9b
+  metadata.gz: 6af2d5008690de608fb72d114c59a3a4a56ff7348be8d4a3c8f21243e3a5e002bd53341297ccaece8191c9e53312b080af973e382dc62b698bb0f7e4832cb188
+  data.tar.gz: c87bbb4eee23e9a5c2dc63d297308edc16df2baf42ea68640df6edca33537ed2acd195a0b49438b6d857c26a8812ad0c19809b8e129d0645e80f6e604a3d0553

data/lib/generators/dockerfile_generator.rb

@@ -387,6 +387,11 @@ private
     @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
@@ -501,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
@@ -572,7 +577,11 @@ private
     # node support, including support for building native modules
     if using_node?
       packages += %w(node-gyp pkg-config)
-      packages += %w(curl) unless using_execjs? || using_puppeteer?
+
+      unless using_execjs? || using_puppeteer?
+        packages << "curl"
+        packages << "unzip" if using_bun?
+      end
 
       # module build process depends on Python, and debian changed
       # how python is installed with the bullseye release.  Below
@@ -954,6 +963,14 @@ private
     "latest"
   end
 
+
+  def bun_version
+    version = `bun --version`[/\d+\.\d+\.\d+/] rescue nil
+    version ||= `npm show bun version`[/\d+\.\d+\.\d+/] rescue nil
+
+    version
+  end
+
   def depend_on_bootsnap?
     @gemfile.include? "bootsnap"
   end
@@ -982,7 +999,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

@@ -58,15 +58,18 @@ FROM base as <%= parallel? ? 'pre' : '' %>build
 
 <% if parallel? -%>
 
-FROM prebuild as node
+FROM prebuild as <% if using_bun? %>bun<% else %>node<% end %>
 
 <% end -%>
-<% if using_node? and (!using_execjs? || File.exist?('yarn.lock')) -%>
+<% if using_bun? and (!using_execjs? || File.exist?('bun.lockb')) -%>
+<%= render partial: 'install_node', locals: {bun_version: using_execjs? ? nil : bun_version} %>
+
+<% elsif using_node? and (!using_execjs? || File.exist?('yarn.lock')) -%>
 <%= render partial: 'install_node', locals: {node_version: using_execjs? ? nil : node_version, yarn_version: File.exist?('yarn.lock') ? yarn_version : nil} %>
 
 <% end -%>
 <% if parallel? -%>
-<%= render partial: 'npm_install', locals: {sources: %w(package.json yarn.lock)} %>
+<%= render partial: 'npm_install', locals: {sources: Dir[*%w(package.json yarn.lock bun.lockb)]} %>
 
 
 FROM prebuild as build
@@ -122,13 +125,20 @@ RUN passenger-config build-native-support
 
 <% end -%>
 <% if parallel? -%>
+<% if using_bun? -%>
+# Copy bun modules
+COPY --from=bun /rails/node_modules /rails/node_modules
+COPY --from=bun /usr/local/bun /usr/local/bun
+ENV PATH=/usr/local/bun/bin:$PATH
+<% else -%>
 # Copy node modules
 COPY --from=node /rails/node_modules /rails/node_modules
 COPY --from=node /usr/local/node /usr/local/node
 ENV PATH=/usr/local/node/bin:$PATH
+<% end -%>
 
 <% 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

@@ -1,3 +1,12 @@
+<% if using_bun? -%>
+# Install Bun
+<% if bun_version -%>
+ARG BUN_VERSION=<%= bun_version %>
+<% end -%>
+ENV BUN_INSTALL=/usr/local/bun
+ENV PATH=/usr/local/bun/bin:$PATH
+RUN curl -fsSL https://bun.sh/install | bash<% if bun_version %> -s -- "bun-v${BUN_VERSION}"<% end %>
+<% else -%>
 <% if node_version and yarn_version -%>
 # Install JavaScript dependencies
 <% elsif node_version -%>
@@ -31,3 +40,4 @@ RUN curl -sL https://github.com/nodenv/node-build/archive/master.tar.gz | tar xz
 <% if node_version -%>
     rm -rf /tmp/node-build-master
 <% end -%>
+<% end -%>

data/lib/generators/templates/_npm_install.erb

@@ -3,14 +3,13 @@ COPY<% if options.link? %> --link<% end %> <%= sources.join(' ') %> ./
 <% if sources.join.include?('.yarnrc') && !Dir['.yarn/releases/*'].empty? -%>
 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 %>
+<% if using_bun? -%>
+RUN <% if options.cache? %>--mount=type=cache,id=bld-bun-cache,target=/root/.bun \
+    <% end %>bun install<% if options.lock? %> --frozen-lockfile<% end %>
+<% elsif 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 %>
 <% else -%>
-<% if options.cache? -%>
-RUN --mount=type=cache,id=bld-npm-cache,target=/root/.npm \
-    npm install
-<% else -%>
-RUN npm install
-<% end -%>
+RUN <% if options.cache? %>--mount=type=cache,id=bld-npm-cache,target=/root/.npm \
+    <% end %>npm install
 <% end -%>

metadata

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