dockerfile-rails 1.6.7 → 1.6.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: c190ebed537c8bceba2405b670d2fc65b189e0d702112b39deec6cea801ebf23
-  data.tar.gz: 4d52c7dc5a0f6d764a1abb426318bb1f8ebbfa4225c28d6577d4ceac4f298fa6
+  metadata.gz: a58920acbac3b3f5f952ae58113b9270f1b6817d8f61faeb357de48aad49b7ba
+  data.tar.gz: 89b5140bc2f150a5eda54229efcc984ecac8a3466ead51ac8fb1e57f5f2b8278
 SHA512:
-  metadata.gz: ca197bd8b0262b8525102c55b9f8454931d388162059f8d4007e87ae27f85df453b40e47c76e88f438bb39da566faa02608cb87b6d3c6bd9dd9c4c08529c2f46
-  data.tar.gz: 48aa82c2ec5c8e6687260ce991899fe0f1faab8e914f78f88ed024ffa0a94c3a5d4b32340f5670c8d3deddc37b1d562f959e77118e7988aab65a8475bc2bdfb0
+  metadata.gz: 77b12d5c786818fe06fcc7e931fd525d5737b4e7cfcf8a28c30807e7492bcf2a8c71cc30aeeacae1eed0cc148d8b75cee9c8e5ba73748e2fa797bd6075389da0
+  data.tar.gz: 868466c5f0b09071614d0530ea529e51906967e9976832596b35bd7d130a2e7ffc57e872df6db3bd0921b855f68e886f91027555840d295c3b3aedabf01cb850

data/README.md

@@ -128,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

@@ -1034,6 +1034,8 @@ private
   end
 
   def node_version
+    return unless using_node? || using_execjs?
+
     version = nil
 
     if File.exist? ".node-version"

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.7
+  version: 1.6.8
 platform: ruby
 authors:
 - Sam Ruby
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2024-03-17 00:00:00.000000000 Z
+date: 2024-04-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails