dockerfile-rails 1.1.1 → 1.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 968efbf5ac6bca9ea4eeaacebea37fb8a6af440d817de872fc4e4462fb1f8913
-  data.tar.gz: ec68385d986d3a937ecaeccd2ab932d82af8afab9fb1068beda3e3d2ed0e2684
+  metadata.gz: e8dc8b1f01f52091af8e9cb3322db265d96698e80fc203bfc570135efd69cb06
+  data.tar.gz: 6054ee7cb322ed79092c6205cce1969b7ab9ad1d868113024845d90bb52d4448
 SHA512:
-  metadata.gz: f2b5655c6fe51f0e2fe1861b595333fdd1b7ef37871fa17e7b49ce6c70b36ff3a3f228f2d31ecdcf5748a974010f78e388c2bd789fdd6f13de2558c7a7ab7bdc
-  data.tar.gz: 63b9a964c315e788829974bbd9adcca7ad90be7e1f97eb488c132ae1ba549128d8041e02ba2e032966a98ca47f279e3eab8f60d5c34f6317878d8f3e26478154
+  metadata.gz: 938d057a8f5faf7cca766898b5f6406a379bf90c1fc6116c05759e38a7d7439efdad941855a8cdf4029cc9aadd0131d7463a855e702fe8a69b7746250e1bfbd5
+  data.tar.gz: 4be1203c6fa6176c867dae6ef78511aa5e0a3c9943958430a8b77ba04cbb5368371d4ea3e100d4a037946cfd0f94ee7ced7425a1464bfe75450a3c1cc8703dbc

data/DEMO.md

@@ -310,10 +310,12 @@ docker buildx build . -t rails-demo
 docker run -p 3000:3000 -e RAILS_MASTER_KEY=$(cat config/master.key) rails-demo
 ```
 
-# Demo 6 - Grover / puppeteer / Chrome
+# Demo 6 - Grover / puppeteer / Chromium
 
-This demo runs only on Intel hardware as Google doesn't supply Chrome
-binaries for Linux on ARM.
+Uses Grover to produce a PDF of a web page.  If you specify a `--platform` that
+contains `amd64`, chrome will be substituted for Chromium.  `--platform` is
+required to access Chrome as Google doesn't supply Chrome binaries for Linux on
+ARM.
 
 ```bash
 rails new demo --minimal

data/README.md

@@ -40,7 +40,7 @@ bin/rails generate dockerfile
 
 * `--ci` - include test gems in deployed image
 * `--compose` - generate a `docker-compose.yml` file
-* `--nginx` - serve static files via [nginx](https://www.nginx.com/)
+* `--nginx` - serve static files via [nginx](https://www.nginx.com/).  May require `--root` on some targets to access `/dev/stdout`
 
 ### Add a Database:
 
@@ -108,3 +108,4 @@ The following links relate to the current development status with respect to Rai
 * [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)
 * Fly.io [FAQ](https://fly.io/docs/rails/getting-started/dockerfiles/)
+* DDH's [target](https://github.com/rails/rails/pull/47372#issuecomment-1438971730)

data/lib/generators/dockerfile_generator.rb

@@ -259,7 +259,7 @@ private
   end
 
   def run_as_root?
-    options.root? || options.nginx? # needed to access /dev/stdout
+    options.root?
   end
 
   def using_node?
@@ -311,7 +311,7 @@ private
     packages += @@packages["base"] if @@packages["base"]
 
     if using_execjs?
-      packages += %w(curl unzip)
+      packages += %w(curl)
     end
 
     if using_puppeteer?
@@ -364,7 +364,7 @@ private
     # node support, including support for building native modules
     if using_node?
       packages += %w(node-gyp pkg-config)
-      packages += %w(curl unzip) unless using_execjs? || using_puppeteer?
+      packages += %w(curl) unless using_execjs? || using_puppeteer?
 
       # module build process depends on Python, and debian changed
       # how python is installed with the bullseye release.  Below
@@ -412,7 +412,13 @@ private
     end
 
     # Puppeteer
-    packages << "google-chrome-stable" if using_puppeteer?
+    if using_puppeteer?
+      if options.platform&.include? "amd"
+        packages << "google-chrome-stable"
+      else
+        packages += %w(chromium chromium-sandbox)
+      end
+    end
 
     # nginx
     packages << "nginx" if options.nginx?
@@ -423,7 +429,7 @@ private
   def deploy_repos
     repos = []
 
-    if using_puppeteer?
+    if using_puppeteer? && deploy_packages.include?("google-chrome-stable")
       repos += [
        "curl https://dl-ssl.google.com/linux/linux_signing_key.pub |",
        "gpg --dearmor > /etc/apt/trusted.gpg.d/google-archive.gpg &&",
@@ -457,6 +463,14 @@ private
   def build_env
     env = {}
 
+    if using_execjs?
+      env["PATH"] = "/usr/local/node/bin:$PATH"
+    end
+
+    if using_puppeteer?
+      env["PUPPETEER_SKIP_CHROMIUM_DOWNLOAD"] = "true"
+    end
+
     if @@args["build"]
       env.merge! @@args["build"].to_h { |key, value| [key, "$#{key}"] }
     end
@@ -491,12 +505,14 @@ private
     end
 
     if using_puppeteer?
-      if options.root?
-        env["GROVER_NO_SANDBOX"] = "true" if @gemfile.include? "grover"
-        env["PUPPETEER_RUBY_NO_SANDBOX"] = "1"  if @gemfile.include? "puppeteer-ruby"
-      end
+      env["GROVER_NO_SANDBOX"] = "true" if @gemfile.include? "grover"
+      env["PUPPETEER_RUBY_NO_SANDBOX"] = "1"  if @gemfile.include? "puppeteer-ruby"
 
-      env["PUPPETEER_EXECUTABLE_PATH"] = "/usr/bin/google-chrome"
+      if options.platform&.include? "amd"
+        env["PUPPETEER_EXECUTABLE_PATH"] = "/usr/bin/google-chrome"
+      else
+        env["PUPPETEER_EXECUTABLE_PATH"] = "/usr/bin/chromium"
+      end
     end
 
     if @@args["deploy"]
@@ -675,7 +691,7 @@ private
   def procfile
     if options.nginx?
       {
-        nginx: 'nginx -g "daemon off;"',
+        nginx: '/usr/sbin/nginx -g "daemon off;"',
         rails: "./bin/rails server -p 3001"
       }
     else

data/lib/generators/templates/Dockerfile.erb

@@ -78,7 +78,7 @@ ARG <%= build_args.map {|key, value| "#{key}=#{value.inspect}"}.join(" \\\n    "
 
 <% end -%>
 <% unless build_env.empty? -%>
-# Deployment options
+# Build options
 ENV <%= build_env.join(" \\\n    ") %>
 
 <% end -%>
@@ -156,15 +156,14 @@ RUN gem install foreman
 
 <% end -%>
 <% unless run_as_root? -%>
-# # Run and own the application files as a non-root user for security
+# Run and own the application files as a non-root user for security
 <% if options.compose? -%>
 ARG UID=1000 \
     GID=1000
 RUN groupadd -f -g $GID rails && \
-    useradd -u $UID -g $GID rails
-<% else -%>
-RUN useradd rails
-<% end -%>
+    useradd -u $UID -g $GID rails<% else -%>
+RUN useradd rails<% end -%><% if options.nginx? %> && \
+    chown rails:rails /var/lib/nginx /var/log/nginx/*<% end %>
 USER rails:rails
 
 <% end -%>

data/lib/generators/templates/_install_node.erb

@@ -12,9 +12,11 @@ ARG NODE_VERSION=<%= node_version %>
 ARG YARN_VERSION=<%= yarn_version %>
 <% end -%>
 <% if node_version -%>
-RUN curl -fsSL https://fnm.vercel.app/install | bash && \
-    /root/.local/share/fnm/fnm install $NODE_VERSION
-ENV PATH=/root/.local/share/fnm/aliases/default/bin/:$PATH
+ENV PATH=/usr/local/node/bin:$PATH
+RUN curl -sL https://github.com/nodenv/node-build/archive/master.tar.gz | tar xz -C /tmp/ && \
+    /tmp/node-build-master/bin/node-build "${NODE_VERSION}" /usr/local/node && \
+    npm install -g yarn@$YARN_VERSION && \
+    rm -rf /tmp/node-build-master
 <% end -%>
 <% if yarn_version -%>
 <% if yarn_version < '2' -%>
@@ -27,4 +29,4 @@ RUN corepack enable && \
 <% end -%>
     corepack prepare yarn@$YARN_VERSION --activate
 <% end -%>
-<% end -%>
+<% end -%>

data/lib/generators/templates/_nginx.erb

@@ -1,5 +1,8 @@
 # configure nginx
 RUN gem install foreman && \
+<% unless run_as_root? -%>
+    sed -i 's|pid /run|pid /rails/tmp/pids|' /etc/nginx/nginx.conf && \
+<% end -%>
     sed -i 's/access_log\s.*;/access_log \/dev\/stdout;/' /etc/nginx/nginx.conf && \
     sed -i 's/error_log\s.*;/error_log \/dev\/stderr info;/' /etc/nginx/nginx.conf
 

data/lib/generators/templates/_npm_install.erb

@@ -1,7 +1,4 @@
 # Install node modules
-<% if using_puppeteer? -%>
-ENV PUPPETEER_SKIP_CHROMIUM_DOWNLOAD="true"
-<% end -%>
 COPY <%=sources.join(' ') %> .
 <% if sources.join.include? 'yarn' -%>
 <% if options.cache? -%>

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: dockerfile-rails
 version: !ruby/object:Gem::Version
-  version: 1.1.1
+  version: 1.2.0
 platform: ruby
 authors:
 - Sam Ruby
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2023-02-19 00:00:00.000000000 Z
+date: 2023-02-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails