dockerfile-rails 1.1.2 → 1.2.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 9c9c9a8eb85b3dbb31aefb0f0f3fa9bac0ab070e0b2807a0e084cc553643ece4
-  data.tar.gz: 79388988476275627c99e27630556b02a732b7baf9737003ac5276395825ed14
+  metadata.gz: cf2a81e905971b1372422667990588003a30836174b539622aab105a84da0a3b
+  data.tar.gz: 54719c03a535654284006637b1ed1d29ae418c3686d7ecc773eaf510d75268ea
 SHA512:
-  metadata.gz: 78271283892ec8c0140ca96a6bc3347c2836ca6f720752f3d5956d8bd267a63efb1b19a6efa1ba45b8cb045e4e7e036c3ec74c9aa2b816a347ed9f26276e5134
-  data.tar.gz: 036137a0829ecc764007181d4332b940d45f15197e02360db7d6ac960039463084d3ceaeae65f269b813896fbe4daabc1e97dcb16b42f7dd2db992848985f040
+  metadata.gz: b45fb087b5fed35931979b86ab5399af2a0406bba06eecbb3c6130272af1b429cb83a4f9d5fa8909e3b3d72ae124303ccff4fbe8b14ab3a2c4c57029e5057794
+  data.tar.gz: b022381f3e9a3639583345bebbf525ae67468c49f37ba8a659cc6ca14b4304865126c837d51935b5cad06cab50df00397b08aafd5a7595b40e93d056ffeb17b2

data/README.md

@@ -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

@@ -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
@@ -464,7 +464,7 @@ private
     env = {}
 
     if using_execjs?
-      env["PATH"] = "/root/.local/share/fnm/aliases/default/bin/:$PATH"
+      env["PATH"] = "/usr/local/node/bin:$PATH"
     end
 
     if using_puppeteer?

data/lib/generators/templates/Dockerfile.erb

@@ -164,7 +164,9 @@ RUN groupadd -f -g $GID rails && \
     useradd -u $UID -g $GID rails<% else -%>
 RUN useradd rails<% end -%><% if options.nginx? %> && \
     chown rails:rails /var/lib/nginx /var/log/nginx/*<% end %>
+<% unless options.swap -%>
 USER rails:rails
+<% end -%>
 
 <% end -%>
 <% unless options.precompile == "defer" -%>

data/lib/generators/templates/_install_node.erb

@@ -12,12 +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<% if !run_as_root? && using_execjs? %> && \
-    mv /root/.local/share/fnm/aliases/default/bin/node /usr/local/bin<% end %>
-<% if !using_execjs? || yarn_version -%>
-ENV PATH=/root/.local/share/fnm/aliases/default/bin/:$PATH
-<% end -%>
+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' -%>
@@ -30,4 +29,4 @@ RUN corepack enable && \
 <% end -%>
     corepack prepare yarn@$YARN_VERSION --activate
 <% end -%>
-<% end -%>
+<% end -%>

data/lib/generators/templates/docker-entrypoint.erb

@@ -1,13 +1,23 @@
 #!/bin/bash -e
 
 <% if options.swap -%>
-# allocate swap space
-fallocate -l <%= options.swap %> /swapfile
-chmod 0600 /swapfile
-mkswap /swapfile
-echo 10 > /proc/sys/vm/swappiness
-swapon /swapfile
-echo 1 > /proc/sys/vm/overcommit_memory
+<% if run_as_root? -%>
+<% @space = "" -%>
+<% else -%>
+<% @space = "  " -%>
+if [ $UID -eq 0 ]; then
+<% end -%>
+<%= @space %># allocate swap space
+<%= @space %>fallocate -l <%= options.swap %> /swapfile
+<%= @space %>chmod 0600 /swapfile
+<%= @space %>mkswap /swapfile
+<%= @space %>echo 10 > /proc/sys/vm/swappiness
+<%= @space %>swapon /swapfile
+<%= @space %>echo 1 > /proc/sys/vm/overcommit_memory
+<% unless run_as_root? -%>
+  exec su rails $0 $@
+fi
+<% end -%>
 
 <% end -%>
 <% if options.prepare -%>

metadata

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