dockerfile-rails 1.5.8 → 1.5.9

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: c5e9c1e8d960ae456906f2936d6153ded39849a02208fa11a05ca4b8bc0d543e
-  data.tar.gz: 950ef36696d78e571d9a762235194009fedbf98f3f1809aa3a6740d7fb8aa507
+  metadata.gz: aa278e91ec05725efb320caaecd9ca2cde617166b4ad4157f7103eeccecf4961
+  data.tar.gz: 748f841c1ba25cfa9f126c056a97e6eb9f6e854ea937f0e7c3a93756992746ed
 SHA512:
-  metadata.gz: 66806af153d826188e9e3d7e582f683f66b4cae76b8d0307db0dbc1e9d3d839aa6037ccf578d8a9aa894d2dd18dd42549d23adcacde544e0000a09f58ef3cd22
-  data.tar.gz: 8589fe07b31ca9064c8b6b9d9a839efb78f36f512a00dc3e589bf1a18cbd5605b63e15933d1eb844168501a4283624c160b45f2dea068f06283317fdef731b11
+  metadata.gz: 6af2d5008690de608fb72d114c59a3a4a56ff7348be8d4a3c8f21243e3a5e002bd53341297ccaece8191c9e53312b080af973e382dc62b698bb0f7e4832cb188
+  data.tar.gz: c87bbb4eee23e9a5c2dc63d297308edc16df2baf42ea68640df6edca33537ed2acd195a0b49438b6d857c26a8812ad0c19809b8e129d0645e80f6e604a3d0553

data/lib/generators/dockerfile_generator.rb

@@ -577,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
@@ -961,8 +965,8 @@ private
 
 
   def bun_version
-    version = `bun --version`[/\d+\.\d+\.\d+/]
-    version ||= `npm show bun version`[/\d+\.\d+\.\d+/]
+    version = `bun --version`[/\d+\.\d+\.\d+/] rescue nil
+    version ||= `npm show bun version`[/\d+\.\d+\.\d+/] rescue nil
 
     version
   end

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,10 +125,17 @@ 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 bun.lockb)]} %>

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 -%>
@@ -8,23 +17,14 @@
 <% 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 %>
@@ -37,7 +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 -%>
+<% 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 -%><% if using_bun? %>bun<% else %>yarn<% end %> 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.8
+  version: 1.5.9
 platform: ruby
 authors:
 - Sam Ruby
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2023-09-14 00:00:00.000000000 Z
+date: 2023-09-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails