dockerfile-rails 0.5.1 → 0.5.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 5146ba972235a473c3018799f3b75bc7856dad4c7c1e1b34a9fc0e87aa0de196
-  data.tar.gz: f9848a9d5103550a9fe7e1be7ee3820d4f99cee50ec39cc53933f568ffe29357
+  metadata.gz: 90f5f36199b97da2a9a8cb8d787970846a8b50c17d68cd8192e335684d80dfd2
+  data.tar.gz: dc1106eb805b3d1640cc2fb7bbf292e512209f33367a91ba563e781fbca6e1f8
 SHA512:
-  metadata.gz: 14b6231959a35395703f0019a2c4e38062dd6b8d37d2c5c936dad2920c120118f7c95ad80a4c4d6591449bc2c79fc86c4ffd35bf3ac107ca6894291906ddd23b
-  data.tar.gz: d62ba6ea16c3705de8bc1606d8c1adbca6c91e591ff949d0d132f7f47b315662cc2659919a25febe9628dce5b7a9c34e5215dba0081b79525f6dae99b0fe4c3b
+  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,6 +4,7 @@ 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

data/lib/generators/dockerfile_generator.rb

@@ -87,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'
 
@@ -97,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
@@ -156,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)
@@ -163,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'

metadata

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