dockerfile-rails 1.6.5 → 1.6.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 908d7d4babef398cd7948ad8cd175c8634901fc45b2129d01e595e25c5014e17
-  data.tar.gz: 30b27e3cdeda25023e9e277ae547c9896106f60b5f8668342a607d01a267d534
+  metadata.gz: c190ebed537c8bceba2405b670d2fc65b189e0d702112b39deec6cea801ebf23
+  data.tar.gz: 4d52c7dc5a0f6d764a1abb426318bb1f8ebbfa4225c28d6577d4ceac4f298fa6
 SHA512:
-  metadata.gz: 3036363bbfa20b4aebe5271da76111dc6044419c6d20a7182b5b3bdbf6b5b445671007054909d8848bbb24836d93f6b1aa804ecb65ea18e30e0fb250f856197b
-  data.tar.gz: aebe29d196c28a1fdc07d6e5ebd958cef15d65a258d417f02354b34744d9d46f6d641533639789cb55141e050ad0a6150840ecb59d15bc70d7bfb0d9f0f2e5a2
+  metadata.gz: ca197bd8b0262b8525102c55b9f8454931d388162059f8d4007e87ae27f85df453b40e47c76e88f438bb39da566faa02608cb87b6d3c6bd9dd9c4c08529c2f46
+  data.tar.gz: 48aa82c2ec5c8e6687260ce991899fe0f1faab8e914f78f88ed024ffa0a94c3a5d4b32340f5670c8d3deddc37b1d562f959e77118e7988aab65a8475bc2bdfb0

data/README.md

@@ -51,6 +51,7 @@ different contents.  If both are specified, `--force` takes precedence.
 * `--compose` - generate a `docker-compose.yml` file
 * `--max-idle=n` - exit afer *n* seconds of inactivity.  Supports [iso 8601](https://en.wikipedia.org/wiki/ISO_8601#Durations) and [sleep](https://man7.org/linux/man-pages/man1/sleep.1.html#DESCRIPTION) syntaxes.  Uses passenger for now, awaiting [puma](https://github.com/puma/puma/issues/2580) support.
 * `--nginx` - serve static files via [nginx](https://www.nginx.com/).  May require `--root` on some targets to access `/dev/stdout`
+* `--thruster` - serve static files via [thruster](https://github.com/basecamp/thruster?tab=readme-ov-file#thruster).
 * `--no-link` - don't add [--link](https://docs.docker.com/engine/reference/builder/#copy---link) to COPY statements.  Some tools (like at the moment, [buildah](https://www.redhat.com/en/topics/containers/what-is-buildah)) don't yet support this feature.
 * `--no-lock` - don't add linux platforms, set `BUNDLE_DEPLOY`, or `--frozen-lockfile`.  May be needed at times to work around a [rubygems bug](https://github.com/rubygems/rubygems/issues/6082#issuecomment-1329756343).
 * `--sudo` - install and configure sudo to enable `sudo -iu rails` access to full environment

data/lib/generators/dockerfile_generator.rb

@@ -40,6 +40,7 @@ class DockerfileGenerator < Rails::Generators::Base
     "sentry" => false,
     "sudo" => false,
     "swap" => nil,
+    "thruster" => false,
     "variant" => nil,
     "windows" => false,
     "yjit" => false,
@@ -185,6 +186,9 @@ class DockerfileGenerator < Rails::Generators::Base
   class_option :label, type: :hash, default: {},
     desc: "Add Docker label(s)"
 
+  class_option :thruster, type: :boolean, default: OPTION_DEFAULTS.thruster,
+    desc: "use Thruster HTTP/2 proxy"
+
   class_option :nginx, type: :boolean, default: OPTION_DEFAULTS.nginx,
     desc: "Serve static files with nginx"
 
@@ -507,6 +511,10 @@ private
       system "bundle add sentry-rails --skip-install" unless @gemfile.include? "sentry-rails"
     end
 
+    if options.thruster?
+      system "bundle add thruster --skip-install" unless @gemfile.include? "thruster"
+    end
+
     if options.rollbar?
       system "bundle add rollbar --skip-install" unless @gemfile.include? "rollbar"
     end
@@ -1126,6 +1134,10 @@ private
         nginx: '/usr/sbin/nginx -g "daemon off;"',
         rails: "./bin/rails server -p 3001"
       }
+    elsif options.thruster? || @gemfile.include?("thruster")
+      {
+        rails: "bundle exec thrust ./bin/rails server"
+      }
     else
       {
         rails: "./bin/rails server"
@@ -1162,6 +1174,12 @@ private
       more += "\n" + lines.join
     end
 
+    # Ignore files uploaded using Shrine in development. This is the location used in their documentation.
+    # https://shrinerb.com/docs/getting-started
+    if @gemfile.include?("shrine")
+      more += "\n/public/uploads/*\n"
+    end
+
     more
   end
 
@@ -1243,7 +1261,7 @@ private
           list.map { |name, cmd| "  #{name} = #{cmd.inspect}" }.join("\n") + '\1')
       else
         toml += "\n[processes]\n" +
-          list.map { |name, cmd| "  #{name} = #{cmd.inspect}\n" }.join
+          list.map { |name, cmd| "  #{name} = #{cmd.inspect}\n" }.join + "\n"
 
         app = list.has_key?("app") ? "app" : list.keys.first
 
@@ -1285,7 +1303,19 @@ private
 
       if match
         size = ((match[1].to_i * (suffixes[match[2]] || 1)) / 1048576.0).round
-        toml += "swap_size_mb = #{size}"
+        if toml.include? "swap_size_mb"
+          toml.sub!(/swap_size_mb.*/, "swap_size_mb = #{size}")
+        else
+          toml += "swap_size_mb = #{size}\n\n"
+        end
+      end
+    end
+
+    # Add statics if not already present and not using a web server and workdir doesn't contain a variable
+    unless options.nginx? || using_passenger? || options.thruster? || @gemfile.include?("thruster")
+      workdir = (IO.read "Dockerfile" rescue "").scan(/^\s*WORKDIR\s+(\S+)/).flatten.last
+      unless workdir && !workdir.include?("$") && toml.include?("[statics]")
+        toml += "[[statics]]\n  guest_path = \"#{workdir}/public\"\n  url_prefix = \"/\"\n\n"
       end
     end
 

data/lib/generators/templates/Dockerfile.erb

@@ -31,7 +31,7 @@ ARG <%= base_args.map {|key, value| "#{key}=#{value.inspect}"}.join(" \\\n    ")
 ENV <%= base_env.join(" \\\n    ") %>
 
 # Update gems and bundler
-RUN gem update --system --no-document && \
+RUN gem update --system <% if RUBY_VERSION.start_with? '2' %>3.4.22 <% end %>--no-document && \
     gem install -N <%= base_gems.join(" ") %>
 
 <% unless base_packages.empty? -%>
@@ -181,7 +181,7 @@ FROM base
 <% end -%>
 <% if using_litefs? -%>
 # Install, configure litefs
-COPY --from=flyio/litefs:0.4.0 /usr/local/bin/litefs /usr/local/bin/litefs
+COPY --from=flyio/litefs:0.5 /usr/local/bin/litefs /usr/local/bin/litefs
 COPY<% if options.link? %> --link<% end %> config/litefs.yml /etc/litefs.yml
 
 <% end -%>

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: dockerfile-rails
 version: !ruby/object:Gem::Version
-  version: 1.6.5
+  version: 1.6.7
 platform: ruby
 authors:
 - Sam Ruby
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2024-02-03 00:00:00.000000000 Z
+date: 2024-03-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails