dockerfile-rails 1.6.6 → 1.6.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: ff714b723bfd0a501b2ebef7946a4d00877233cf1912d5092c7ff92d57b938ae
-  data.tar.gz: 5ba04178d0f287466a58c8bc496583faa6f01812c58086819ec8d8e37c8190fb
+  metadata.gz: a58920acbac3b3f5f952ae58113b9270f1b6817d8f61faeb357de48aad49b7ba
+  data.tar.gz: 89b5140bc2f150a5eda54229efcc984ecac8a3466ead51ac8fb1e57f5f2b8278
 SHA512:
-  metadata.gz: 17cc361096d9afdb32917d80701af6904395160e1e4715f4b41bdfbe707bb51c1c074d0f5b1cc3f8fbdeed6ac2ca90702721d844ed65ede457144eab820b863d
-  data.tar.gz: b2af2f207fa347f4b90a9fe09cfe7466702ffdce144e40d1f618049be00ab64fdf577b067111635ee46593d6bd1e5aacd80061770e950846a3c426b8bb5fbdef
+  metadata.gz: 77b12d5c786818fe06fcc7e931fd525d5737b4e7cfcf8a28c30807e7492bcf2a8c71cc30aeeacae1eed0cc148d8b75cee9c8e5ba73748e2fa797bd6075389da0
+  data.tar.gz: 868466c5f0b09071614d0530ea529e51906967e9976832596b35bd7d130a2e7ffc57e872df6db3bd0921b855f68e886f91027555840d295c3b3aedabf01cb850

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
@@ -127,7 +128,9 @@ Running all integration tests, or even a single individual test can be done as f
 
 ```
 rake test
-ruby test/test_minimal.rb
+
+bundle exec rake test TEST=test/test_minimal.rb
+bundle exec ruby test/test_minimal.rb
 ```
 
 To assist with this process, outputs of tests can be captured automatically.  This is useful when adding new tests and when making a change that affects many tests.  Be sure to inspect the output (e.g., by using `git diff`) before committing.

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
@@ -1026,6 +1034,8 @@ private
   end
 
   def node_version
+    return unless using_node? || using_execjs?
+
     version = nil
 
     if File.exist? ".node-version"
@@ -1126,6 +1136,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"
@@ -1249,7 +1263,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
 
@@ -1291,7 +1305,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

@@ -286,7 +286,11 @@ ENV <%= deploy_env.join(" \\\n    ") %>
 <% else -%>
 # Entrypoint sets up the container.
 <% end -%>
+<% if using_litefs? -%>
+ENTRYPOINT ["litefs", "mount"]
+<% else -%>
 ENTRYPOINT ["/rails/bin/docker-entrypoint"]
+<% end -%>
 
 <% if procfile.size > 1 -%>
 # Build a Procfile for production use
@@ -307,7 +311,7 @@ VOLUME /data
 CMD ["foreman", "start", "--procfile=<%= options.procfile %>"]
 <% elsif procfile.size > 1 -%>
 CMD ["foreman", "start", "--procfile=Procfile.prod"]
-<% else -%>
+<% elsif !using_litefs? -%>
 CMD <%= procfile.values.first.split(" ").inspect %>
 <% end -%>
 <% end -%>

data/lib/generators/templates/litefs.yml.erb

@@ -77,6 +77,8 @@ proxy:
 # "static" which assigns a single node to be the primary and does
 # not failover.
 lease:
+  promote: true
+
   # Required. Must be either "consul" or "static".
   type: "consul"
 
@@ -114,3 +116,19 @@ lease:
     # can become leader. This buffer is intended to prevent
     # overlap in leadership due to clock skew or in-flight calls.
     lock-delay: "1s"
+
+exec:
+  # Only run migrations on candidate nodes.
+  - cmd: "./bin/rails db:prepare"
+    if-candidate: true
+
+  # Then run the application server on all nodes.
+<% if !options.procfile.blank? -%>
+  - cmd: "foreman start --procfile=<%= options.procfile %>"
+<% elsif procfile.size > 1 -%>
+  - cmd: "foreman start --procfile=Procfile.prod"
+<% elsif !using_litefs? -%>
+  - cmd: <%= procfile.values.first.split(" ").inspect %>
+<% else -%>
+  - cmd: "./bin/rails server"
+<% end -%>  

metadata

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