dockerfile-rails 0.5.0 → 0.5.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 906eaaf2f4166356a6cece9b347dd58a29324a0e7a3d0f557cfea85054c34816
-  data.tar.gz: 0c071eb1fd4da339676916705498c18fb2d5e08e0115b8f47745def8229390e3
+  metadata.gz: 5146ba972235a473c3018799f3b75bc7856dad4c7c1e1b34a9fc0e87aa0de196
+  data.tar.gz: f9848a9d5103550a9fe7e1be7ee3820d4f99cee50ec39cc53933f568ffe29357
 SHA512:
-  metadata.gz: 66b27141d048276513a4384b6dd88fae87f929d2128a9e6a19187cac6a1d75f751d5e261ccd4f94424ae7ae53ca0713141db34163d04cb997a719731a6e39dde
-  data.tar.gz: 7e927389954e205c3cc89e6de75506d85265ac394a749f0b394d9b5263b4de719a5dc935d8ff493f1c1cfdc30854b70f7f5b77f6c48599095a7132f0f050a0cd
+  metadata.gz: 14b6231959a35395703f0019a2c4e38062dd6b8d37d2c5c936dad2920c120118f7c95ad80a4c4d6591449bc2c79fc86c4ffd35bf3ac107ca6894291906ddd23b
+  data.tar.gz: d62ba6ea16c3705de8bc1606d8c1adbca6c91e591ff949d0d132f7f47b315662cc2659919a25febe9628dce5b7a9c34e5215dba0081b79525f6dae99b0fe4c3b

data/README.md

@@ -9,7 +9,7 @@ Provides a Rails generator to produce Dockerfiles and related files.  This is be
 ## Usage
 
 ```
-bundle add dockerfile-rails --group development
+bundle add dockerfile-rails --version ">= 0.5.0" --group development
 bin/rails generate dockerfile
 ```
 
@@ -77,3 +77,4 @@ Many of the following links relate to the current development status with respec
 * [Rails Dockerfile futures](https://discuss.rubyonrails.org/t/rails-dockerfile-futures/82091/1) - rationale for a generator
 * [Fly Cookbooks](https://fly.io/docs/rails/cookbooks/) - deeper dive into Dockerfile design choices
 * [app/templates/Dockerfile.tt](https://github.com/rails/rails/blob/main/railties/lib/rails/generators/rails/app/templates/Dockerfile.tt) - current Rails 7.1 template
+* Fly.io [Cut over to Rails Dockerfile Generator on Sunday 29 Jan 2023](https://community.fly.io/t/cut-over-to-rails-dockerfile-generator-on-sunday-29-jan-2023/10350)

data/lib/dockerfile-rails/scanner.rb

@@ -4,7 +4,7 @@ module DockerfileRails
 
       ### database ###
 
-      database = YAML.load_file('config/database.yml').
+      database = YAML.load_file('config/database.yml', aliases: true).
         dig('production', 'adapter') rescue nil
 
       if database == 'sqlite3'

data/lib/generators/dockerfile_generator.rb

@@ -14,6 +14,7 @@ class DockerfileGenerator < Rails::Generators::Base
     'mysql' => false,
     'parallel' => false,
     'platform' => nil,
+    'postgresql' => false,
     'prepare' => true,
     'redis' => false,
     'swap' => nil,
@@ -224,6 +225,31 @@ private
     packages.sort
   end
 
+  def deploy_env
+    env = []
+
+    if Rails::VERSION::MAJOR<7 || Rails::VERSION::STRING.start_with?('7.0')
+      env << 'RAILS_LOG_TO_STDOUT="1"'
+      env << 'RAILS_SERVE_STATIC_FILES="true"'
+    end
+
+    if options.yjit
+      env << 'RUBY_YJIT_ENABLE="1"'
+    end
+
+    if options.jemalloc and not options.fullstaq
+      if (options.platform || Gem::Platform::local.cpu).include? 'arm'
+        env << 'LD_PRELOAD="/usr/lib/aarch64-linux-gnu/libjemalloc.so.2"'
+      else
+        env << 'LD_PRELOAD="/usr/lib/x86_64-linux-gnu/libjemalloc.so.2"'
+      end
+
+      env << 'MALLOC_CONF="dirty_decay_ms:1000,narenas:2,background_thread:true"'
+    end
+
+    env
+  end
+
   def binfile_fixups
     # binfiles may have OS specific paths to ruby.  Normalize them.
     shebangs = Dir["bin/*"].map { |file| IO.read(file).lines.first }.join

data/lib/generators/templates/Dockerfile.erb

@@ -126,17 +126,11 @@ COPY --from=build /rails /rails
 COPY --from=client /rails/<%= api_client_dir %>/build /rails/public
 <% end -%>
 
+<% unless deploy_env.empty? -%>
 # Deployment options
-ENV RAILS_LOG_TO_STDOUT="1" \
-    RAILS_SERVE_STATIC_FILES="true"<% if options.yjit %> \
-    RUBY_YJIT_ENABLE="1"<% end %><% if options.jemalloc and not options.fullstaq %> \
-<% if (options.platform || Gem::Platform::local.cpu).include? 'arm' -%>
-    LD_PRELOAD="/usr/lib/aarch64-linux-gnu/libjemalloc.so.2" \
-<% else -%>
-    LD_PRELOAD="/usr/lib/x86_64-linux-gnu/libjemalloc.so.2" \
-<% end -%>
-    MALLOC_CONF="dirty_decay_ms:1000,narenas:2,background_thread:true"<% end %>
+ENV <%= deploy_env.join(" \\\n    ") %>
 
+<% end -%>
 <% if options.prepare -%>
 # Entrypoint prepares the database.
 <% else -%>

metadata

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