dockerfile-rails 0.1.0 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 536685e13e342227e5d6af85e3d778539668bbdab81b5430902ae08286a57c62
-  data.tar.gz: a3155769a131089493ae0682e195f6108dd4c81d03c79c6774ce21af0eda04be
+  metadata.gz: b317d73db1dda4043a0cf7ad8bc237cc909cf6fe08550960e57190651fe15f5a
+  data.tar.gz: 15454b9d5fee80e253dff57fe4f708f9e2c0bc729a1c1b506e2e96a7f1c13666
 SHA512:
-  metadata.gz: 0547a5c9224213fdab9b99a2ca03e5aa411f086abb723b121561226079968e6da769f9acdf76ee123b1fbd57a64aa7d622c5dc44a48ab05717d9a523322955a1
-  data.tar.gz: 37923bd9eaa647b9ca44433ce374d30e0250799e7078669b180f2ac5734241dc7af757a58b12227de999d78e3d4171ae7e3e9ebbbf828e90f2d71184999fb8c7
+  metadata.gz: ff075f1ab57a0a7bf5a6f084bc8c552f5a9a4b2e16a9452fec6d07b5f245dd7e8cc56e74d447af3083906926747fb868e0a76a99da8f0cba20c61273fd7f7010
+  data.tar.gz: c6306db9e351812343158cad19c59da387889f1fb449006e73806329d8b375d3ff8534e9f4c358c9b34368f1ea9e98d3e0b23d5833067477ccf6a68fe744bf9b

data/README.md

@@ -5,7 +5,7 @@ Provide Rails generators to produce Dockerfiles and related files.
 ## Usage
 
 ```
-bundle add dockerfile-rails
+bundle add dockerfile-rails --group development
 bin/rails generate dockerfile
 ```
 
@@ -26,4 +26,10 @@ additional support may be needed:
 * `--mysql` - add mysql libraries
 * `--posgresql` - add posgresql libraries
 * `--redis` - add redis libraries
-* `--sqlite3` - add sqlite3 libraries
+* `--sqlite3` - add sqlite3 libraries
+
+Links:
+
+* [Demos](./DEMO.md)
+* [Preparations for Rails 7.1](https://community.fly.io/t/preparations-for-rails-7-1/9512)
+* [Rails Dockerfile futures](https://discuss.rubyonrails.org/t/rails-dockerfile-futures/82091/1)

data/lib/generators/dockerfile_generator.rb

@@ -163,13 +163,13 @@ private
   end
 
   def node_version
-    using_node? and `node --version`[/\d+\.\d+\.\d+/]
+    `node --version`[/\d+\.\d+\.\d+/]
   rescue
     "lts" 
   end
 
   def yarn_version
-    using_node? and `yarn --version`[/\d+\.\d+\.\d+/]
+    `yarn --version`[/\d+\.\d+\.\d+/]
   rescue
     "latest"
   end
@@ -182,6 +182,23 @@ private
     Rails.application.config.api_only
   end
 
+  def api_client_dir
+    return unless api_only?
+
+    file = Dir['*/package.json'].find do |file|
+      JSON.load_file(file).dig('scripts', 'build')
+    end
+
+    file && File.dirname(file)
+  end
+
+  def api_client_files
+    client = api_client_dir
+    return unless client
+
+    Dir["#{client}/{package.json,package-lock.json,yarn.lock}"]
+  end
+
   def dbprep_command
     if Rails::VERSION::MAJOR >= 6
       'db:prepare'

data/lib/generators/templates/Dockerfile.erb

@@ -1,7 +1,40 @@
 # syntax = docker/dockerfile:1
 
-# Make sure it matches the Ruby version in .ruby-version and Gemfile
+# Make sure RUBY_VERSION matches the Ruby version in .ruby-version and Gemfile
 ARG RUBY_VERSION=<%= Gem.ruby_version %>
+<% if api_client_dir -%>
+ARG NODE_VERSION=<%= node_version %>
+
+FROM node:$NODE_VERSION-slim as client
+
+WORKDIR /rails/<%= api_client_dir %>
+
+ENV NODE_ENV=production
+
+# Install node modules
+COPY <%= api_client_files.join(' ') %> .
+<% if api_client_files.join.include? 'yarn' -%>
+<% if options.cache? -%>
+RUN --mount=type=cache,id=bld-yarn-cache,target=/root/.yarn \
+    YARN_CACHE_FOLDER=/root/.yarn yarn install
+<% else -%>
+RUN yarn install
+<% end -%>
+<% else -%>
+<% if options.cache? -%>
+RUN --mount=type=cache,id=bld-yarn-cache,target=/root/.npm \
+    npm install
+<% else -%>
+RUN npm install
+<% end -%>
+<% end -%>
+
+# build client application
+COPY <%= api_client_dir %> .
+RUN npm run build
+
+
+<% end -%>
 FROM ruby:$RUBY_VERSION-slim as base
 
 # Rails app lives here
@@ -122,11 +155,16 @@ RUN apt-get update -qq && \
 <% end -%>
 <% end -%>
 
-# Copy built application from second stage
+# Copy built application from previous stage
 <% if options.ci? -%>
 COPY --from=build /usr/local/bundle /usr/local/bundle
 <% end -%>
 COPY --from=build /rails /rails
+<% if api_client_dir -%>
+
+# Copy built client
+COPY --from=client /rails/<%= api_client_dir %>/build /rails/public
+<% end -%>
 
 # Deployment options
 ENV RAILS_LOG_TO_STDOUT="1" \

metadata

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