dockerfile-rails 1.5.11 → 1.5.14

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 1d82a193aafa58b460153c6f40f11eb3ef6928dd889b2225cf05c8d54403413e
-  data.tar.gz: 102a8194647678ee4d21cbdc5e01aeab3f626a6498ae8b01bc1ec1f9ab8e25ae
+  metadata.gz: 0fe17ee50b4f27de006bd75e0c810a0dcc0340676c79888729039e2bce7394d3
+  data.tar.gz: 135cf712dcd44282a8255460288045078450fe809dd24413aa510eb2a5505a69
 SHA512:
-  metadata.gz: f9eeb2d4615acba7c25d796b7c77cf636794b73e003f966c061607e5c46948db96c84c42d3cc4608ad2afbdcae8ebb13f580dfac971e5318d232190b983d8eb0
-  data.tar.gz: 4f94cb176f2d6bb93379895cc5616d93061638c2f5ec17af50492d397007d8457f90adc14851e0bde6c8d95a1ccb5f57294466fddd19169f29b3ef8db43201b2
+  metadata.gz: 152a64e964d12c90dd9f723cfcc5a22f8676eca1aed835de5f829fb851b67075521115eeb24d5f72f4ec2482954a4bc3739c5f9f0b3594a167bf05af65f3da80
+  data.tar.gz: 76579f910905786f5b1c38320f3efce47accebd5d3e829a16e6cec5aa3a32ac609a3b9c4137f66f4d299ed3b32c4acda9643db32f1ac0825b187c501bea1cfdf

data/README.md

@@ -22,7 +22,7 @@ bundle add dockerfile-rails --optimistic --group development
 bin/rails generate dockerfile
 ```
 
-The `--optomistic` flag will make sure you always get the latest `dockerfile-rails` gem when you run `bundle update && rails g dockerfile`.
+The `--optimistic` flag will make sure you always get the latest `dockerfile-rails` gem when you run `bundle update && rails g dockerfile`.
 
 ### General option:
 

data/lib/generators/dockerfile_generator.rb

@@ -880,8 +880,9 @@ private
   end
 
   def binfile_fixups
+    binfiles = Dir["bin/*"].select { |f| File.file?(f) }
     # binfiles may have OS specific paths to ruby.  Normalize them.
-    shebangs = Dir["bin/*"].map do |file|
+    shebangs = binfiles.map do |file|
       IO.read(file).lines.first.encode("UTF-8", "binary", invalid: :replace, undef: :replace, replace: "")
     end.join
     rubies = shebangs.scan(%r{#!/usr/bin/env (ruby.*)}).flatten.uniq
@@ -896,14 +897,14 @@ private
     # line endings.  This avoids adding unnecessary fixups if
     # none are required, but prepares for the need to do the
     # fix line endings if other fixups are required.
-    has_cr = Dir["bin/*"].any? { |file| IO.read(file).include? "\r" }
+    has_cr = binfiles.any? { |file| IO.read(file).include? "\r" }
     if has_cr || (Gem.win_platform? && !binfixups.empty?) || options.windows?
       binfixups.unshift 'sed -i "s/\r$//g" bin/*'
     end
 
     # Windows file systems may not have the concept of executable.
     # In such cases, fix up during the build.
-    if Dir["bin/*"].any? { |file| !File.executable?(file) } || options.windows?
+    if binfiles.any? { |file| !File.executable?(file) } || options.windows?
       binfixups.unshift "chmod +x bin/*"
     end
 
@@ -1107,12 +1108,17 @@ private
     return unless toml.include?("primary_region") # v2
 
     # see if flyctl is in the path
-    paths = ENV["PATH"].split(File::PATH_SEPARATOR)
-    cmds = %w(flyctl)
-    exts = ENV["PATHEXT"] ? ENV["PATHEXT"].split(";") : [""]
-    flyctl = Enumerator.product(paths, cmds, exts).
-      map { |path, cmd, ext| File.join(path, "#{cmd}#{ext}") }.
-      find { |path| File.executable? path }
+    flyctl = (lambda do
+      cmd = "flyctl"
+      ENV["PATH"].split(File::PATH_SEPARATOR).each do |path|
+        (ENV["PATHEXT"] ? ENV["PATHEXT"].split(";") : [""]).each do |ext|
+          path = File.join(path, "#{cmd}#{ext}")
+          return path if File.executable? path
+        end
+      end
+
+      nil
+    end).call
     return unless flyctl
 
     # see if secret is already set?

data/lib/generators/templates/Dockerfile.erb

@@ -222,27 +222,30 @@ RUN mkdir /data
 <% else -%>
 # Run and own only the runtime files as a non-root user for security
 <% if options.compose? -%>
+<% user = "rails:rails" -%>
 ARG UID=1000 \
     GID=1000
 RUN groupadd -f -g $GID rails && \
     useradd -u $UID -g $GID rails --create-home --shell /bin/bash && \
 <% else -%>
-RUN useradd rails --create-home --shell /bin/bash && \
+<% user = "1000:1000" -%>
+RUN groupadd --system --gid 1000 rails && \
+    useradd rails --uid 1000 --gid 1000 --create-home --shell /bin/bash && \
 <% end -%>
 <% if options.nginx? -%>
-    chown rails:rails /var/lib/nginx /var/log/nginx/* && \
+    chown <%= user %> /var/lib/nginx /var/log/nginx/* && \
 <% end -%>
 <% if deploy_packages.include?("sudo") && options.sudo? -%>
     sed -i 's/env_reset/env_keep="*"/' /etc/sudoers && \
 <% end -%>
 <% if deploy_database == 'sqlite3' -%>
     mkdir /data<% if using_litefs? %> /litefs<% end %> && \
-    chown -R rails:rails <%= Dir[*%w(db log storage tmp)].join(" ") %> /data<% if using_litefs? %> /litefs<% end %>
+    chown -R <%= user %> <%= Dir[*%w(db log storage tmp)].join(" ") %> /data<% if using_litefs? %> /litefs<% end %>
 <% else -%>
-    chown -R rails:rails <%= Dir[*%w(db log storage tmp)].join(" ") %>
+    chown -R <%= user %> <%= Dir[*%w(db log storage tmp)].join(" ") %>
 <% end -%>
 <% unless options.swap? or using_passenger? or using_litefs? -%>
-USER rails:rails
+USER <%= user %>
 <% end -%>
 
 <% end -%>

data/lib/generators/templates/_npm_install.erb

@@ -8,7 +8,7 @@ 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 %>
+    YARN_CACHE_FOLDER=/root/.yarn <% end %>yarn install<% if options.lock? %> --<% if yarn_version < '2' -%>frozen-lockfile<% else %>immutable<% end %><% end %>
 <% else -%>
 RUN <% if options.cache? %>--mount=type=cache,id=bld-npm-cache,target=/root/.npm \
     <% end %>npm install

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: dockerfile-rails
 version: !ruby/object:Gem::Version
-  version: 1.5.11
+  version: 1.5.14
 platform: ruby
 authors:
 - Sam Ruby
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2023-10-22 00:00:00.000000000 Z
+date: 2023-12-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -74,7 +74,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.4.8
+rubygems_version: 3.4.10
 signing_key:
 specification_version: 4
 summary: Dockerfile generator for Rails