dockerfile-rails 1.0.0 → 1.0.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 67a9e8789b4664b2bcfe089e2e945aa1c2eee3db60adb3681e40f14cd51c2336
-  data.tar.gz: 830f021a2e7123db896bc8ee0dd990f6e4ee2c72c6bce79677ad84b07e13ab84
+  metadata.gz: 3cf90509af5087378fd186d88358f0157d40ca2335e19a66ecdddbf1efd9add4
+  data.tar.gz: 640b5eeb291be5e4168a5da7ffd17236b1ebf49deed3fb8a5d8148e6fe3ba92c
 SHA512:
-  metadata.gz: bc6fe2c172e7643e1cbce78e0e771bcb04db044d59f0125a4b420c6f2edfd984c0edd87402192335d14d6e136d44287e6e6a307bd273675b015aded3827934fe
-  data.tar.gz: 419134947acae57198255a99166fb16bd907ac5b581e0565a0765530591e2e277e8e4a90814ee0d28fc8db6b791d7e9ff5850d33819a448beafc99eb0593c46c
+  metadata.gz: 9390f22b5e4348c6d59345b08c843bec8ae4932e6b20afa69bffac4bf600c3489ae093e9847b9f59cd0b688b448d35c4c5a1815743b2693abd90db97d051a7cd
+  data.tar.gz: 77fe857b46a6aa3b5bda4d7b3ce0f68b24f1907d1a049c927b4e2d0e759d39b2fd771ebf3b5937d92c418f4d3e04b52f07788d939b06d644a0d4f028fb9bd7c2

data/DEMO.md

@@ -275,3 +275,31 @@ bin/rails generate dockerfile
 docker buildx build . -t rails-welcome
 docker run -p 3000:3000 -e RAILS_MASTER_KEY=$(cat config/master.key) rails-welcome
 ```
+
+# Demo 5 - Grover / puppeteer / Chrome
+
+This demo runs only on Intel hardware as Google doesn't supply Chrome
+binaries for Linux on ARM.
+
+```bash
+rails new welcome --minimal
+cd welcome
+bundle add grover
+npm install puppeteer
+
+echo 'Rails.application.routes.draw { root "grover#pdf" }' > config/routes.rb
+
+cat << 'EOF' > app/controllers/grover_controller.rb
+class GroverController < ApplicationController
+  def pdf
+    grover = Grover.new('https://google.com', format: 'A4')
+    send_data grover.to_pdf, filename: 'google.pdf', type: :pdf
+  end
+end
+EOF
+
+bundle add dockerfile-rails --group development
+bin/rails generate dockerfile
+docker buildx build . -t rails-welcome
+docker run -p 3000:3000 -e RAILS_MASTER_KEY=$(cat config/master.key) rails-welcome
+```

data/lib/generators/dockerfile_generator.rb

@@ -146,7 +146,11 @@ private
   end
 
   def using_execjs?
-    @gemfile.include? 'execjs'
+    @gemfile.include?('execjs') or @gemfile.include?('grover')
+  end
+
+  def using_puppeteer?
+    @gemfile.include?('grover')
   end
 
   def parallel?
@@ -238,9 +242,30 @@ private
     # Rmagick gem
     packages << 'imagemagick' if @gemfile.include? 'rmagick'
 
+    # Puppeteer
+    packages << 'google-chrome-stable' if using_puppeteer?
+
     packages.sort
   end
 
+  def deploy_repos
+    repos = []
+
+    if using_puppeteer?
+      repos += [
+       "curl https://dl-ssl.google.com/linux/linux_signing_key.pub |",
+       "gpg --dearmor > /etc/apt/trusted.gpg.d/google-archive.gpg &&",
+       'echo "deb http://dl.google.com/linux/chrome/deb/ stable main" >> /etc/apt/sources.list.d/google.list'
+      ]
+    end
+
+    if repos.empty?
+      ''
+    else
+      repos.join(" \\\n    ") + " && \\\n    "
+    end
+  end
+
   def deploy_env
     env = []
 
@@ -263,6 +288,11 @@ private
       env << 'MALLOC_CONF="dirty_decay_ms:1000,narenas:2,background_thread:true"'
     end
 
+    if using_puppeteer?
+      env << 'GROVER_NO_SANDBOX="true"' if @gemfile.include? 'grover'
+      env << 'PUPPETEER_EXECUTABLE_PATH="/usr/bin/google-chrome"'
+    end
+
     env
   end
 

data/lib/generators/templates/Dockerfile.erb

@@ -27,8 +27,13 @@ RUN gem update --system --no-document && \
     gem install -N bundler -v ${BUNDLER_VERSION}
 
 <% if using_execjs? -%>
+<% if using_puppeteer? -%>
+# Install packages needed to install nodejs and chrome
+<%= render partial: 'apt_install', locals: {packages: %w(curl gnupg unzip), clean: true, repos: ''} %>
+<% else -%>
 # Install packages needed to install nodejs
-<%= render partial: 'apt_install', locals: {packages: %w(curl unzip), clean: true} %>
+<%= render partial: 'apt_install', locals: {packages: %w(curl unzip), clean: true, repos: ''} %>
+<% end -%>
 
 <%= render partial: 'install_node', locals: {yarn_version: nil} %>
 
@@ -38,15 +43,15 @@ RUN gem update --system --no-document && \
 FROM base as <%= parallel? ? 'pre' : '' %>build
 
 # Install packages needed to build gems<%= using_node? ? " and node modules" : "" %>
-<%= render partial: 'apt_install', locals: {packages: build_packages, clean: false} %>
+<%= render partial: 'apt_install', locals: {packages: build_packages, clean: false, repos: ''} %>
 
 <% if parallel? -%>
 
 FROM prebuild as node
 
 <% end -%>
-<% if using_node? -%>
-<%= render partial: 'install_node', locals: {node_version: using_execjs? ? nil : node_version} %>
+<% if using_node? and (!using_execjs? || File.exist?('yarn.lock')) -%>
+<%= render partial: 'install_node', locals: {node_version: using_execjs? ? nil : node_version, yarn_version: File.exist?('yarn.lock') ? yarn_version : nil} %>
 
 <% end -%>
 <% if parallel? -%>
@@ -81,7 +86,7 @@ RUN bundle _${BUNDLER_VERSION}_ install<% if depend_on_bootsnap? -%> && \
 COPY --from=node /rails/node_modules /rails/node_modules
 
 <% elsif using_node? -%>
-<%= render partial: 'npm_install', locals: {sources: %w(package.json yarn.lock)} %>
+<%= render partial: 'npm_install', locals: {sources: Dir[*%w(package.json package-lock.json yarn.lock)]} %>
 
 <% end -%>
 # Copy application code
@@ -112,7 +117,7 @@ FROM base
 <% unless deploy_packages.empty? -%>
 
 # Install packages needed for deployment
-<%= render partial: 'apt_install', locals: {packages: deploy_packages, clean: true} %>
+<%= render partial: 'apt_install', locals: {packages: deploy_packages, clean: true, repos: deploy_repos} %>
 <% end -%>
 
 # Copy built application from previous stage

data/lib/generators/templates/_apt_install.erb

@@ -1,10 +1,10 @@
 <% if options.cache? -%>
 RUN --mount=type=cache,id=dev-apt-cache,sharing=locked,target=/var/cache/apt \
     --mount=type=cache,id=dev-apt-lib,sharing=locked,target=/var/lib/apt \
-    apt-get update -qq && \
+    <%= repos %>apt-get update -qq && \
     apt-get install --no-install-recommends -y <%= packages.join(" ") %>
 <% else -%>
-RUN apt-get update -qq && \
+RUN <%= repos %>apt-get update -qq && \
     apt-get install --no-install-recommends -y <%= packages.join(" ") %><% if clean %> && \
     rm -rf /var/lib/apt/lists /var/cache/apt/archives<% end %>
 <% end -%>
@@ -17,4 +17,4 @@ RUN apt-get update -qq && \
  		make && \
  		make install
  <% end -%>
- 
+

data/lib/generators/templates/_npm_install.erb

@@ -1,4 +1,7 @@
 # Install node modules
+<% if using_puppeteer? -%>
+ENV PUPPETEER_SKIP_CHROMIUM_DOWNLOAD="true"
+<% end -%>
 COPY <%=sources.join(' ') %> .
 <% if sources.join.include? 'yarn' -%>
 <% if options.cache? -%>
@@ -14,4 +17,4 @@ RUN --mount=type=cache,id=bld-npm-cache,target=/root/.npm \
 <% else -%>
 RUN npm install
 <% end -%>
-<% end -%>
+<% end -%>

metadata

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