dockerfile-rails 0.5.0 → 0.5.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 906eaaf2f4166356a6cece9b347dd58a29324a0e7a3d0f557cfea85054c34816
-  data.tar.gz: 0c071eb1fd4da339676916705498c18fb2d5e08e0115b8f47745def8229390e3
+  metadata.gz: 90f5f36199b97da2a9a8cb8d787970846a8b50c17d68cd8192e335684d80dfd2
+  data.tar.gz: dc1106eb805b3d1640cc2fb7bbf292e512209f33367a91ba563e781fbca6e1f8
 SHA512:
-  metadata.gz: 66b27141d048276513a4384b6dd88fae87f929d2128a9e6a19187cac6a1d75f751d5e261ccd4f94424ae7ae53ca0713141db34163d04cb997a719731a6e39dde
-  data.tar.gz: 7e927389954e205c3cc89e6de75506d85265ac394a749f0b394d9b5263b4de719a5dc935d8ff493f1c1cfdc30854b70f7f5b77f6c48599095a7132f0f050a0cd
+  metadata.gz: 7bf221c15c7041792a736296d90732949bd31c27b660a06fc0ee743cf295516b0db874be835e7263c57836df8b748cb73548264b92aeb6383327226e513a3d38
+  data.tar.gz: abb6c6468353f3ea793d145c503e807ba301f752d227fec8406040989e303d1ad60372758fac3bc7a053f56f01bbf378197302710e6587ad9aac334816c1db5c

data/DEMO.md

@@ -10,10 +10,12 @@ cd welcome
 echo 'Rails.application.routes.draw { root "rails/welcome#index" }' > config/routes.rb
 bundle add dockerfile-rails --group development
 bin/rails generate dockerfile
-docker buildx build . -t rails-welcome # add --load to save the image to local Docker
+docker buildx build . -t rails-welcome
 docker run -p 3000:3000 -e RAILS_MASTER_KEY=$(cat config/master.key) rails-welcome
 ```
 
+Add `--load` to the `buildx` command if you want to save the image to local Docker.
+
 # Demo 2 - Action Cable and Active Record
 
 Real applications involve a network of services.  The following demo makes use of PostgreSQL and Redis to display a welcome screen with a live, updating, visitors counter. Once done, take a look at the `docker-compose.yml` file produced.
@@ -101,7 +103,7 @@ node moddules and ruby gems in parallel.
 ```bash
 rails new welcome --api
 cd welcome
-npx create-react-app client
+npx -y create-react-app client
 
 bin/rails generate controller Api versions
 

data/README.md

@@ -4,12 +4,13 @@ Provides a Rails generator to produce Dockerfiles and related files.  This is be
 
   * Supports all [Rails supported releases](https://guides.rubyonrails.org/maintenance_policy.html), not just Rails 7.1, and likely works with a number of previous releases.
   * Can be customized using flags on the `generate dockerfile` command, and rerun to produce a custom tailored dockerfile based on detecting the actual features used by your application.
+  * Will set `.node_version`, `packageManager` and install gems if needed to deploy your application.
   * Can produce a `docker-compose.yml` file for locally testing your configuration before deploying.
 
 ## Usage
 
 ```
-bundle add dockerfile-rails --group development
+bundle add dockerfile-rails --version ">= 0.5.0" --group development
 bin/rails generate dockerfile
 ```
 
@@ -77,3 +78,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,
@@ -86,6 +87,8 @@ class DockerfileGenerator < Rails::Generators::Base
 
     scan_rails_app
 
+    Bundler.with_original_env { install_gems }
+
     template 'Dockerfile.erb', 'Dockerfile'
     template 'dockerignore.erb', '.dockerignore'
 
@@ -96,7 +99,7 @@ class DockerfileGenerator < Rails::Generators::Base
 
     template 'docker-compose.yml.erb', 'docker-compose.yml' if options.compose
 
-    template 'dockerfile.yml.erb', 'config/dockerfile.yml'
+    template 'dockerfile.yml.erb', 'config/dockerfile.yml', force: true
   end
 
 private
@@ -155,6 +158,20 @@ private
     @keeps = !Dir['**/.keep']
   end
 
+  def install_gems
+    if options.postgresql? or @postgresql
+      system "bundle add pg" unless @gemfile.include? 'pg'
+    end
+
+    if options.mysql? or @mysql
+      system "bundle add mysql2" unless @gemfile.include? 'mysql2'
+    end
+
+    if options.redis? or using_redis?
+      system "bundle add redis" unless @gemfile.include? 'redis'
+    end
+  end
+
   def build_packages
     # start with the essentials
     packages = %w(build-essential)
@@ -162,13 +179,13 @@ private
     # add databases: sqlite3, postgres, mysql
     packages << 'pkg-config' if options.sqlite3? or @sqlite3
     packages << 'libpq-dev' if options.postgresql? or @postgresql
-    packages << 'default-libmysqlclient-dev' if options.mysql or @mysql
+    packages << 'default-libmysqlclient-dev' if options.mysql? or @mysql
 
     # add git if needed to install gems
     packages << 'git' if @git
 
     # add redis in case Action Cable, caching, or sidekiq are added later
-    packages << "redis" if using_redis?
+    packages << "redis" if options.redis? or using_redis?
 
     # ActiveStorage preview support
     packages << "libvips" if @gemfile.include? 'ruby-vips'
@@ -224,6 +241,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.2
 platform: ruby
 authors:
 - Sam Ruby
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2023-01-24 00:00:00.000000000 Z
+date: 2023-01-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails