dockerfile-rails 1.6.0 → 1.6.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 1a7a5c96358c0e7974364e0b23c6a6b15542c05e67c352b917c36619d7bf8618
-  data.tar.gz: 69df0f5095152bf72c20ec9b9607d2597b10225a9e7da584785c2ab147d619a7
+  metadata.gz: cadc12073c9a21acfbcab9778dc9864d967779f16a1be4bcfd1f23acf43e203d
+  data.tar.gz: 7dd17c1a575c438b3adaa9d1c6e506a48fcb8ca901c69019e51576d0de419537
 SHA512:
-  metadata.gz: d57bfbad64083ec22060f19ba971d3ab71383a1111cefc2a053b01cd670ef2b8652702b802e1ec6670e07dd93a19a46e534e22ed12b775913ed2042b8377a3e1
-  data.tar.gz: e7e6b18c708121fd4c9e7aaadff5c05a32e291e139ffdb4c72f1d8fe0eaaf8b9ca9bd93a742d112fd119d634c08f3ddcce89c21db38560073f462ab9e3e09447
+  metadata.gz: 14760dcac1784800f19ee67e8dc77642f1e5872b27bd7b8628e41fd7d1815e09094191e6ed4b691372199dd04144a87fcef75f5770e8379dd2d223292cf7fd28
+  data.tar.gz: 9fd1234b3cf3ac61e55710c64a26595f043401252a17753f0f39d9676251ea5092b37239ede5cf1d1eb5950ef91503dbf02448e032823241289f4ac4df76e504

data/README.md

@@ -99,15 +99,15 @@ Args and environment variables can be tailored to a specific build phase by addi
 
 ### Advanced Customization:
 
-There may be times where feature detection plus flags just aren't enough.  As an example, you may wish to configure and run multiple processes.  
+There may be times where feature detection plus flags just aren't enough.  As an example, you may wish to configure and run multiple processes.
 
-* `--instructions=path` - a dockerfile fragment to be inserted into the final document. 
+* `--instructions=path` - a dockerfile fragment to be inserted into the final document.
 * `--migration=cmd` - a replacement (generally a script) for `db:prepare`/`db:migrate`.
 * `--procfile=path` - a [Procfile](https://github.com/ddollar/foreman#foreman) to use in place of launching Rails directly.
 
 Like with environment variables, packages, and build args, `--instructions` can be tailored to a specific build phase by adding `-base`, `-build`, or `-deploy` after the flag name, with the default being `-deploy`.
 
-Additionaly, if the instructions start with a [shebang](https://en.wikipedia.org/wiki/Shebang_(Unix)) instead the file being treated as a Dockerfile fragment, the file is treated as a script and a `RUN` statement is added to your Dockerfile instead.
+Additionally, if the instructions start with a [shebang](https://en.wikipedia.org/wiki/Shebang_(Unix)) instead the file being treated as a Dockerfile fragment, the file is treated as a script and a `RUN` statement is added to your Dockerfile instead.
 
 ---
 

data/lib/generators/dockerfile_generator.rb

@@ -65,6 +65,7 @@ class DockerfileGenerator < Rails::Generators::Base
     "libmagickwand-dev" => "imagemagick-libs",
     "libsqlite3-0" => "sqlite-dev",
     "libtiff-dev" => "tiff-dev",
+    "libjemalloc2" => "jemalloc",
     "libvips" => "vips-dev",
     "node-gyp" => "gyp",
     "pkg-config" => "pkgconfig",
@@ -415,7 +416,8 @@ private
 
   def using_node?
     return @using_node if @using_node != nil
-    @using_node = File.exist? "package.json"
+    return if using_bun?
+    @using_node = File.exist?("package.json")
   end
 
   def using_bun?
@@ -423,6 +425,10 @@ private
     @using_bun = File.exist?("bun.config.js") || File.exist?("bun.lockb")
   end
 
+  def references_ruby_version_file?
+    @references_ruby_version_file ||= IO.read("Gemfile").include?(".ruby-version")
+  end
+
   def using_redis?
     # Note: If you have redis installed on your computer, 'rails new` will
     # automatically add redis to your Gemfile, so having it in your Gemfile is
@@ -454,8 +460,12 @@ private
     @gemfile.include?("sidekiq")
   end
 
+  def using_solidq?
+    @gemfile.include?("solid_queue")
+  end
+
   def parallel?
-    using_node? && options.parallel
+    (using_node? || using_bun?) && options.parallel
   end
 
   def has_mysql_gem?
@@ -597,6 +607,7 @@ private
     packages = %w(build-essential)
     packages += @@packages["build"] if @@packages["build"]
     packages += %w(nodejs npm) if (node_version == "lts") && (not using_execjs?)
+    packages << "libyaml-dev" if options.fullstaq?
 
     # add databases: sqlite3, postgres, mysql
     packages << "pkg-config" if options.sqlite3? || @sqlite3
@@ -622,7 +633,6 @@ private
 
       unless using_execjs? || using_puppeteer?
         packages << "curl"
-        packages << "unzip" if using_bun?
       end
 
       # module build process depends on Python, and debian changed
@@ -647,6 +657,10 @@ private
       end
     end
 
+    if using_bun?
+      packages += %w(curl unzip)
+    end
+
     if options.alpine?
       alpinize(packages)
     else
@@ -1121,7 +1135,7 @@ private
 
   def fly_processes
     return unless File.exist? "fly.toml"
-    return unless using_sidekiq?
+    return unless using_sidekiq? || using_solidq?
 
     if procfile.size > 1
       list = { "app" => "foreman start --procfile=Procfile.prod" }
@@ -1129,7 +1143,11 @@ private
       list = { "app" => procfile.values.first }
     end
 
-    list["sidekiq"] = "bundle exec sidekiq"
+    if using_sidekiq?
+      list["sidekiq"] = "bundle exec sidekiq"
+    elsif using_solidq?
+      list["solidq"] = "bundle exec rake solid_queue:start"
+    end
 
     list
   end

data/lib/generators/templates/Dockerfile.erb

@@ -8,7 +8,7 @@ ARG RUBY_VERSION=<%= RUBY_VERSION %>
 
 <% end -%>
 <% if options.fullstaq -%>
-FROM <%= platform %>quay.io/evl.ms/fullstaq-ruby:${RUBY_VERSION}-<%= options.jemalloc ? 'jemalloc-' : '' %><%= variant %><% unless options.precompile == "defer" %> as base<% end %>
+FROM <%= platform %>quay.io/evl.ms/fullstaq-ruby:${RUBY_VERSION}-<%= options.jemalloc ? 'jemalloc-' : 'malloctrim-' %><%= variant %><% unless options.precompile == "defer" %> as base<% end %>
 <% else -%>
 FROM <%= platform %><%= options.registry %>ruby:$RUBY_VERSION-<%= variant %><% unless options.precompile == "defer" %> as base<% end %>
 <% end -%>
@@ -86,7 +86,7 @@ ENV <%= build_env.join(" \\\n    ") %>
 
 <% end -%>
 # Install application gems
-COPY<% if options.link? %> --link<% end %> Gemfile Gemfile.lock ./
+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 && \
@@ -143,7 +143,7 @@ COPY --from=node /usr/local/node /usr/local/node
 ENV PATH=/usr/local/node/bin:$PATH
 <% end -%>
 
-<% elsif using_node? -%>
+<% elsif using_node? || using_bun? -%>
 <%= render partial: 'npm_install', locals: {sources: Dir[*%w(.npmrc .yarnrc package.json package-lock.json yarn.lock bun.lockb)]} %>
 
 <% end -%>

data/lib/generators/templates/docker-compose.yml.erb

@@ -90,11 +90,15 @@ services:
   redis-db:
     image: redis
 <% end -%>
-<% if using_sidekiq? and deploy_database != 'sqlite3' -%>
+<% if (using_sidekiq? or using_solidq?) and deploy_database != 'sqlite3' -%>
 
-  sidekiq:
+  <%= using_sidekiq? ? "sidekiq" : "solidq" %>:
     build: .
+<% if using_sidekiq? -%>
     command: bundle exec sidekiq
+<% else -%>
+    command: bundle exec rake solid_queue:start
+<% end -%>
     environment:
       - RAILS_MASTER_KEY=$RAILS_MASTER_KEY
       - REDIS_URL=redis://redis-db:6379

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: dockerfile-rails
 version: !ruby/object:Gem::Version
-  version: 1.6.0
+  version: 1.6.2
 platform: ruby
 authors:
 - Sam Ruby
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2023-12-17 00:00:00.000000000 Z
+date: 2024-01-06 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.4.10
+rubygems_version: 3.4.8
 signing_key:
 specification_version: 4
 summary: Dockerfile generator for Rails