dockerfile-rails 1.6.1 → 1.6.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 563c6043b8c8890edd114a6fe77b543dc745a43e18f59585ae945dbbe9a31bb2
-  data.tar.gz: 16ebea3a573d36330c4b38105d3d49391b7ca751f737298bda61bd70c41df35d
+  metadata.gz: 1ee863e3eae2b33b85291826856413562be9239b95bf64987c04b2c983fb6ed1
+  data.tar.gz: 110b65ba0c47dd4c8787ea3a594da5ca24de98b857a7c2b254b4d24a417b1e21
 SHA512:
-  metadata.gz: 62bed853707b519c58e8e242cf7b3a0011f82fcd4523799ce35942e2d960df750483c8cf9f40face14c1cb356d6852cc117559afb903b5acebd4f0e5d637fbf1
-  data.tar.gz: d0029262a06767acebfbf93b5cc46d46550098191167733717eba7f23e4e9631fe6cac13651bb1cbff2a4197a7114f457ccea56a99f9535e5b7e9a82699fe24d
+  metadata.gz: de6ef088a9e2d1c1920d58299f17ecb175ed68233e500e12c635061ba93d5fe0a4029492b8591f029fcd3cb5e0670432f5b536d0a60d33afa903efaf77688150
+  data.tar.gz: 884faca812d4dc1ff79ca131cdee688c67f3bc591a89bc0f5fda914ae18387448ae41c1da92cd8064987aff2cc180fd783396ca06ffd593deb589db64b79877b

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",
@@ -424,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
@@ -455,6 +460,10 @@ private
     @gemfile.include?("sidekiq")
   end
 
+  def using_solidq?
+    @gemfile.include?("solid_queue")
+  end
+
   def parallel?
     (using_node? || using_bun?) && options.parallel
   end
@@ -598,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
@@ -1125,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" }
@@ -1133,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 && \
@@ -207,7 +207,7 @@ RUN gem install foreman
 <% end -%>
 <% unless options.precompile == "defer" -%>
 # Copy built artifacts: gems, application
-COPY --from=build /usr/local/bundle /usr/local/bundle
+COPY --from=build "${BUNDLE_PATH}" "${BUNDLE_PATH}"
 COPY --from=build /rails /rails
 <% if using_passenger? -%>
 

data/lib/generators/templates/_install_node.erb

@@ -22,8 +22,10 @@ ARG YARN_VERSION=<%= yarn_version %>
 <% end -%>
 <% if node_version && node_version != 'lts' -%>
 <% if options.alpine? -%>
+ENV PATH=/usr/local/node/bin:$PATH
 RUN curl -sL https://unofficial-builds.nodejs.org/download/release/v${NODE_VERSION}/node-v${NODE_VERSION}-linux-x64-musl.tar.gz | tar xz -C /tmp/ && \
-    cp -rp /tmp/node-v${NODE_VERSION}-linux-x64-musl/* /usr/local/ && \
+    mkdir /usr/local/node && \
+    cp -rp /tmp/node-v${NODE_VERSION}-linux-x64-musl/* /usr/local/node/ && \
 <% else -%>
 ENV PATH=/usr/local/node/bin:$PATH
 RUN curl -sL https://github.com/nodenv/node-build/archive/master.tar.gz | tar xz -C /tmp/ && \

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.1
+  version: 1.6.3
 platform: ruby
 authors:
 - Sam Ruby
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2023-12-21 00:00:00.000000000 Z
+date: 2024-01-08 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