dockerfile-rails 1.6.8 → 1.6.10

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: a58920acbac3b3f5f952ae58113b9270f1b6817d8f61faeb357de48aad49b7ba
-  data.tar.gz: 89b5140bc2f150a5eda54229efcc984ecac8a3466ead51ac8fb1e57f5f2b8278
+  metadata.gz: d778306a922152b1b8fa89406d1afcb45d977c0d5b9bb468340464dbfa9dddbe
+  data.tar.gz: e9bf92490211e18e117ccc5164761e2fa5ff3d32d886762e3bbb95d7e506b37c
 SHA512:
-  metadata.gz: 77b12d5c786818fe06fcc7e931fd525d5737b4e7cfcf8a28c30807e7492bcf2a8c71cc30aeeacae1eed0cc148d8b75cee9c8e5ba73748e2fa797bd6075389da0
-  data.tar.gz: 868466c5f0b09071614d0530ea529e51906967e9976832596b35bd7d130a2e7ffc57e872df6db3bd0921b855f68e886f91027555840d295c3b3aedabf01cb850
+  metadata.gz: e5be4fcf0d992d8c3fedf4fa3ccc216fddf02c132eeae4313498a11bdee40ea67f2680d7933339ad36ffc339294501cbc06b9377d70aee544c6c37e112d1bcce
+  data.tar.gz: f23457093b3fd65b398770231cfc805efef41acf90419a742e7ac1e9d804e6bbddb3c1943cec9b47f8fd11a56833a31367d72dcd834595a6f15bd6b671d2bc09

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

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

@@ -364,6 +364,30 @@ class DockerfileGenerator < Rails::Generators::Base
     elsif File.exist? "config/dockerfile.yml"
       remove_file "config/dockerfile.yml"
     end
+
+    # check Dockerfile for common errors: missing packages, mismatched Ruby version
+    if options.skip? && File.exist?("Dockerfile")
+      message = nil
+      shell = Thor::Base.shell.new
+
+      dockerfile = IO.read("Dockerfile")
+      missing = Set.new(base_packages + build_packages) -
+        Set.new(dockerfile.scan(/[-\w]+/))
+
+      unless missing.empty?
+        message = "The following packages are missing from the Dockerfile: #{missing.to_a.join(", ")}"
+        STDERR.puts "\n" + shell.set_color(message, Thor::Shell::Color::RED, Thor::Shell::Color::BOLD)
+      end
+
+      ruby_version = dockerfile.match(/ARG RUBY_VERSION=(\d+\.\d+\.\d+)/)[1]
+
+      if ruby_version && ruby_version != RUBY_VERSION
+        message = "The Ruby version in the Dockerfile (#{ruby_version}) does not match the Ruby version of the Rails app (#{RUBY_VERSION})"
+        STDERR.puts "\n" + shell.set_color(message, Thor::Shell::Color::RED, Thor::Shell::Color::BOLD)
+      end
+
+      exit 42 if message
+    end
   end
 
 private

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" -%> && \

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: dockerfile-rails
 version: !ruby/object:Gem::Version
-  version: 1.6.8
+  version: 1.6.10
 platform: ruby
 authors:
 - Sam Ruby
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2024-04-09 00:00:00.000000000 Z
+date: 2024-05-01 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.5.4
+rubygems_version: 3.5.9
 signing_key:
 specification_version: 4
 summary: Dockerfile generator for Rails