dockerfile-rails 1.2.2 → 1.2.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: a56568105d5613dd366d84227a550dcdbc3f1f71460330772aa32c128ce5b922
-  data.tar.gz: 7b8539f3fb1ef2b26a29a9f33d7dccd825e433ddfdbc7034f6828118764f596f
+  metadata.gz: 98b182ee88ad6c1ba34edb41778c9d59dd329eefb6b199ede26697ded174aedb
+  data.tar.gz: 94e946801bc23ae53ce8ba8a4c7f8129a58e04aad1db4b9cf05bc5d43b22cebb
 SHA512:
-  metadata.gz: ae18c0c80988fd501ffa053f31752f73e2d6c8d94784b701bda85e5c1e7a01c5d0d12c48f9b8f1f6cf3c2f5a4bb718d1f5648a686bc5e819e09021c03c8c5de4
-  data.tar.gz: 3d4731ad7b9cc8b81c48fdb58a8324eee1c0b999a64cbe3fe27f2bde84afab6f7f7d83d09f5a40f6c829acfc8e235405e7126d6648e69282d4d68ec8e24436b3
+  metadata.gz: f20bb484ad3637c100cf2ff9a786404a686e961db71dbfdc1d48d0b33ea461c8031bb2ddacc05ebd3857aaa5d318fe2d49c2ecc21cd760b1fa08fac9e963a28f
+  data.tar.gz: 80f23221cf71777312e57165a23b93a165feae6db3af97ac8c836e71295493ff952ca34f36e2a190f392508fb0e8a92b56a42c090262076063d75b386b96be56

data/README.md

@@ -36,11 +36,12 @@ bin/rails generate dockerfile
 * `--cache` - use build caching to speed up builds
 * `--parallel` - use multi-stage builds to install gems and node modules in parallel
 
-### Add a Feature:
+### Add/remove a Feature:
 
 * `--ci` - include test gems in deployed image
 * `--compose` - generate a `docker-compose.yml` file
 * `--nginx` - serve static files via [nginx](https://www.nginx.com/).  May require `--root` on some targets to access `/dev/stdout`
+* `--no-lock` - don't add linux platforms, set `BUNDLE_DEPLOY`, or `--frozen-lockfile`.  May be needed at times to work around a [rubygems bug](https://github.com/rubygems/rubygems/issues/6082#issuecomment-1329756343).
 
 ### Add a Database:
 

data/lib/generators/dockerfile_generator.rb

@@ -14,6 +14,7 @@ class DockerfileGenerator < Rails::Generators::Base
     "fullstaq" => false,
     "jemalloc" => false,
     "label" => {},
+    "lock" => true,
     "mysql" => false,
     "nginx" => false,
     "parallel" => false,
@@ -67,6 +68,9 @@ class DockerfileGenerator < Rails::Generators::Base
   class_option :ci, type: :boolean, default: OPTION_DEFAULTS.ci,
     desc: "include test gems in bundle"
 
+  class_option :lock, type: :boolean, default: OPTION_DEFAULTS.lock,
+    desc: "lock Gemfile/package.json"
+
   class_option :precompile, type: :string, default: OPTION_DEFAULTS.precompile,
     desc: 'if set to "defer", assets:precompile will be done at deploy time'
 
@@ -252,7 +256,7 @@ private
 
   def platform
     if options.platform
-      "--platform #{options.platform} "
+      "--platform=#{options.platform} "
     else
       ""
     end
@@ -295,32 +299,47 @@ private
   def install_gems
     ENV["BUNDLE_IGNORE_MESSAGES"] = "1"
 
+    gemfile = IO.read("Gemfile")
+
     if options.postgresql? || @postgresql
-      system "bundle add pg" unless @gemfile.include? "pg"
+      system "bundle add pg --skip-install" unless @gemfile.include? "pg"
     end
 
     if options.mysql? || @mysql
-      system "bundle add mysql2" unless @gemfile.include? "mysql2"
+      system "bundle add mysql2 --skip-install" unless @gemfile.include? "mysql2"
     end
 
     if options.redis? || using_redis?
-      system "bundle add redis" unless @gemfile.include? "redis"
+      system "bundle add redis --skip-install" unless @gemfile.include? "redis"
     end
 
-    # ensure linux platform is in the bundle lock
-    current_platforms = `bundle platform`
-    add_platforms = []
-
-    if !current_platforms.include?("x86_64-linux")
-      add_platforms += ["--add-platform=x86_64-linux"]
+    # https://stackoverflow.com/questions/70500220/rails-7-ruby-3-1-loaderror-cannot-load-such-file-net-smtp/70500221#70500221
+    if @gemfile.include? "mail"
+      %w(net-smtp net-imap net-pop).each do |gem|
+        system "bundle add #{gem} --skip-install --require false" unless @gemfile.include? gem
+      end
     end
 
-    if !current_platforms.include?("aarch64-linux") && RUBY_PLATFORM.start_with?("arm64")
-      add_platforms += ["--add-platform=aarch64-linux"]
+    unless gemfile == IO.read("Gemfile")
+      system "bundle install --quiet"
     end
 
-    unless add_platforms.empty?
-      system "bundle lock #{add_platforms.join(" ")}"
+    if options.lock?
+      # ensure linux platform is in the bundle lock
+      current_platforms = `bundle platform`
+      add_platforms = []
+
+      if !current_platforms.include?("x86_64-linux")
+        add_platforms += ["--add-platform=x86_64-linux"]
+      end
+
+      if !current_platforms.include?("aarch64-linux") && RUBY_PLATFORM.start_with?("arm64")
+        add_platforms += ["--add-platform=aarch64-linux"]
+      end
+
+      unless add_platforms.empty?
+        system "bundle lock #{add_platforms.join(" ")}"
+      end
     end
   end
 
@@ -370,9 +389,6 @@ private
     # add git if needed to install gems
     packages << "git" if @git
 
-    # add redis if Action Cable, caching, or sidekiq are used
-    packages << "redis" if options.redis? || using_redis?
-
     # ActiveStorage preview support
     packages << "libvips" if @gemfile.include? "ruby-vips"
 
@@ -418,9 +434,6 @@ private
     packages << "postgresql-client" if options.postgresql? || @postgresql
     packages << "default-mysql-client" if options.mysql || @mysql
 
-    # add redis in case Action Cable, caching, or sidekiq are added later
-    packages << "redis" if using_redis?
-
     # ActiveStorage preview support
     packages << "libvips" if @gemfile.include? "ruby-vips"
 
@@ -465,10 +478,13 @@ private
   def base_env
     env = {
       "RAILS_ENV" => "production",
-      "BUNDLE_DEPLOYMENT" => "1",
       "BUNDLE_WITHOUT" => options.ci? ? "development" : "development:test"
     }
 
+    if options.lock?
+      env["BUNDLE_DEPLOYMENT"] = "1"
+    end
+
     if @@args["base"]
       env.merge! @@args["base"].to_h { |key, value| [key, "$#{key}"] }
     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-' : '' %>slim<% unless options.precompile == "defer" %> as base<% end %>
+FROM <%= platform %>quay.io/evl.ms/fullstaq-ruby:${RUBY_VERSION}-<%= options.jemalloc ? 'jemalloc-' : '' %>slim<% unless options.precompile == "defer" %> as base<% end %>
 <% else -%>
 FROM <%= platform %>ruby:$RUBY_VERSION-slim<% unless options.precompile == "defer" %> as base<% end %>
 <% end -%>
@@ -32,7 +32,7 @@ ENV <%= base_env.join(" \\\n    ") %>
 
 # Update gems and bundler
 RUN gem update --system --no-document && \
-<% if options.ci? -%>
+<% if options.ci? and options.lock? -%>
     gem install -N irb reline && \
 <% end -%>
     gem install -N bundler

data/lib/generators/templates/_npm_install.erb

@@ -2,7 +2,7 @@
 COPY <%=sources.join(' ') %> .
 <% if sources.join.include? 'yarn' -%>
 RUN <% if options.cache? -%>--mount=type=cache,id=bld-yarn-cache,target=/root/.yarn \
-    YARN_CACHE_FOLDER=/root/.yarn <% end -%>yarn install --frozen-lockfile
+    YARN_CACHE_FOLDER=/root/.yarn <% end -%>yarn install<% if options.lock? %> --frozen-lockfile<% end %>
 <% else -%>
 <% if options.cache? -%>
 RUN --mount=type=cache,id=bld-npm-cache,target=/root/.npm \

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: dockerfile-rails
 version: !ruby/object:Gem::Version
-  version: 1.2.2
+  version: 1.2.3
 platform: ruby
 authors:
 - Sam Ruby
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2023-02-26 00:00:00.000000000 Z
+date: 2023-02-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails