dockerfile-rails 1.2.0 → 1.2.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: e8dc8b1f01f52091af8e9cb3322db265d96698e80fc203bfc570135efd69cb06
-  data.tar.gz: 6054ee7cb322ed79092c6205cce1969b7ab9ad1d868113024845d90bb52d4448
+  metadata.gz: cf2a81e905971b1372422667990588003a30836174b539622aab105a84da0a3b
+  data.tar.gz: 54719c03a535654284006637b1ed1d29ae418c3686d7ecc773eaf510d75268ea
 SHA512:
-  metadata.gz: 938d057a8f5faf7cca766898b5f6406a379bf90c1fc6116c05759e38a7d7439efdad941855a8cdf4029cc9aadd0131d7463a855e702fe8a69b7746250e1bfbd5
-  data.tar.gz: 4be1203c6fa6176c867dae6ef78511aa5e0a3c9943958430a8b77ba04cbb5368371d4ea3e100d4a037946cfd0f94ee7ced7425a1464bfe75450a3c1cc8703dbc
+  metadata.gz: b45fb087b5fed35931979b86ab5399af2a0406bba06eecbb3c6130272af1b429cb83a4f9d5fa8909e3b3d72ae124303ccff4fbe8b14ab3a2c4c57029e5057794
+  data.tar.gz: b022381f3e9a3639583345bebbf525ae67468c49f37ba8a659cc6ca14b4304865126c837d51935b5cad06cab50df00397b08aafd5a7595b40e93d056ffeb17b2

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/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.2.0
+  version: 1.2.1
 platform: ruby
 authors:
 - Sam Ruby
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2023-02-23 00:00:00.000000000 Z
+date: 2023-02-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails