dockerfile-rails 1.6.7 → 1.6.9

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: c190ebed537c8bceba2405b670d2fc65b189e0d702112b39deec6cea801ebf23
-  data.tar.gz: 4d52c7dc5a0f6d764a1abb426318bb1f8ebbfa4225c28d6577d4ceac4f298fa6
+  metadata.gz: 8273f4e7e16fa5763ebfee285648dfede6ec020e51d51e3e9b8caf5b70333aba
+  data.tar.gz: 16824fb5f76c53dcf5fb0ebca40335591def91034e9cdfea59d12f0b44fb1fed
 SHA512:
-  metadata.gz: ca197bd8b0262b8525102c55b9f8454931d388162059f8d4007e87ae27f85df453b40e47c76e88f438bb39da566faa02608cb87b6d3c6bd9dd9c4c08529c2f46
-  data.tar.gz: 48aa82c2ec5c8e6687260ce991899fe0f1faab8e914f78f88ed024ffa0a94c3a5d4b32340f5670c8d3deddc37b1d562f959e77118e7988aab65a8475bc2bdfb0
+  metadata.gz: 682c85b4a0a4d5e7157e39bb300b17ec4eff7be7beb98a6431b74d36d7e4f0dfa3d9b3bb81bfe5d31852423fc750595366ca503b9a44ac05a83acb5187afe1c1
+  data.tar.gz: c015796534771823bf606a22165d76899dd21745ac580d6bcc0b8aa780ef0ddf1427818536120616bf91eb3ea686838cf5f42b718b5d36804db6f59b3abc2a58

data/README.md

@@ -34,7 +34,7 @@ different contents.  If both are specified, `--force` takes precedence.
 
 ### Runtime Optimizations:
 
-* `--alpine` - use [alpine](https://www.alpinelinux.org/) as base image
+* `--alpine` - use [alpine](https://www.alpinelinux.org/) as base image (requires [Alpine <= 3.18 OR Rails >= 8.0](https://github.com/sparklemotion/sqlite3-ruby/issues/434))
 * `--fullstaq` - use [fullstaq](https://fullstaqruby.org/) [images](https://github.com/evilmartians/fullstaq-ruby-docker) on [quay.io](https://quay.io/repository/evl.ms/fullstaq-ruby?tab=tags&tag=latest)
 * `--jemalloc` - use [jemalloc](https://jemalloc.net/) memory allocator
 * `--swap=n` - allocate swap space.  See [falloc options](https://man7.org/linux/man-pages/man1/fallocate.1.html#OPTIONS) for suffixes
@@ -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/Rakefile

@@ -30,7 +30,7 @@ namespace :test do
       sh "bundle config set --local local.dockerfile-rails #{__dir__}"
       sh "bundle add dockerfile-rails --group development " +
         "--git https://github.com/rubys/dockerfile-rails.git"
-      sh "bin/rails generate dockerfile"
+      sh "bin/rails generate dockerfile --force"
       cp "#{__dir__}/test/docker-entrypoint", "bin"
       IO.write "config/routes.rb",
         'Rails.application.routes.draw {get "/up", to: proc {[200, {}, ["ok"]]}}'
@@ -45,13 +45,13 @@ namespace :test do
   task :alpine do
     rm_rf "test/tmp/system_test"
     Dir.chdir "test/tmp" do
-      sh "rails new system_test --javascript esbuild"
+      sh "rails new system_test --javascript esbuild --main"
       Dir.chdir "system_test"
       sh "bundle config disable_local_branch_check true"
       sh "bundle config set --local local.dockerfile-rails #{__dir__}"
       sh "bundle add dockerfile-rails --group development " +
         "--git https://github.com/rubys/dockerfile-rails.git"
-      sh "bin/rails generate dockerfile --alpine"
+      sh "bin/rails generate dockerfile --alpine --force"
       cp "#{__dir__}/test/docker-entrypoint", "bin"
       IO.write "config/routes.rb",
         'Rails.application.routes.draw {get "/up", to: proc {[200, {}, ["ok"]]}}'

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

@@ -87,16 +87,10 @@ ENV <%= build_env.join(" \\\n    ") %>
 <% end -%>
 # Install application gems
 COPY<% if options.link? %> --link<% end %> Gemfile Gemfile.lock <% if references_ruby_version_file? %>.ruby-version <% end %>./
-<% if options.alpine? and deploy_packages.include? 'sqlite-libs' -%>
-# Workaround sqlite/alpine issue: https://github.com/sparklemotion/sqlite3-ruby/issues/434
-RUN bundle config force_ruby_platform true && \
-    bundle config set frozen false && \
-    bundle lock --add-platform ruby
-<% end -%>
 <% if options.cache? -%>
 RUN --mount=type=cache,id=bld-gem-cache,sharing=locked,target=/srv/vendor \
 <% if private_gemserver_env_variable_name -%>
-    --mount=type=secret,id=gemserver_credentials,dst=/kaniko/gemserver_credentials \
+    --mount=type=secret,id=gemserver_credentials,target=/kaniko/gemserver_credentials \
     <%= private_gemserver_env_variable_name %>="$(cat /kaniko/gemserver_credentials)" && \
     export <%= private_gemserver_env_variable_name %> && \
 <% end -%>
@@ -113,7 +107,7 @@ RUN --mount=type=cache,id=bld-gem-cache,sharing=locked,target=/srv/vendor \
 
 <% else -%>
 <% if private_gemserver_env_variable_name -%>
-RUN --mount=type=secret,id=gemserver_credentials,dst=/kaniko/gemserver_credentials \
+RUN --mount=type=secret,id=gemserver_credentials,target=/kaniko/gemserver_credentials \
     <%= private_gemserver_env_variable_name %>="$(cat /kaniko/gemserver_credentials)" && \
     export <%= private_gemserver_env_variable_name %> && \
     bundle install<% if depend_on_bootsnap? && options.precompile != "defer" -%> && \
@@ -286,7 +280,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 +305,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/docker-compose.yml.erb

@@ -98,6 +98,10 @@ services:
     command: bundle exec sidekiq
 <% else -%>
     command: bundle exec rake solid_queue:start
+<% end -%>
+<% if private_gemserver_env_variable_name -%>
+    secrets:
+      - gemserver_credentials
 <% end -%>
     environment:
       - RAILS_MASTER_KEY=$RAILS_MASTER_KEY

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