dockerfile-rails 1.2.4 → 1.2.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: e81390f34a7074b21fb4fc08e82b3b378bf40b0bf32529d94a55a3fb8f5b55c1
-  data.tar.gz: 6e83d04de7615de96f75edf66dde5aa8d39624a2e745ae2de796d352559c097e
+  metadata.gz: 6f8b3176721310f5c043a7c2642f12b59fa7bc2952fb73f6e6164d199d24bc5a
+  data.tar.gz: 995b15167890754208baef9bc6ff48613e8cef121083f8d70c1be77593b5beb4
 SHA512:
-  metadata.gz: 16a4fc1e67c1583555b7fdae5af6346c8c2b06503d51b5896a89bd86c55d60e1506a65f50f3b5987f5962c6d14f4cfb1217d379884df168469f18b8f28f76d61
-  data.tar.gz: 031c86b3c27e7c594eef1fc3f653ada551a0fdae2919f753c46a339fdb30e378d7770b2db987acd10d2e0f84c36680a2c6190d5966b19383b36854ebfc6686ff
+  metadata.gz: 7f05f65f85a29fcfc242682ab6464adb88f9e0725fffe1c65c192c342e12444c3dbaff9f855ff28ccb94ea13fa706918b71609af06a87673007407083e77dd2c
+  data.tar.gz: 5bcca34771c67bf29e28be9a0342fbd9dac8a13694f3416d0b27a2070cabf0e38017ed195ecf2b1a80a03150698cb62502e73d63ec603500bb927fa627cd73aa

data/lib/generators/templates/Dockerfile.erb

@@ -160,7 +160,9 @@ ARG UID=1000 \
 RUN groupadd -f -g $GID rails && \
     useradd -u $UID -g $GID rails<% else -%>
 RUN useradd rails<% end -%> --home /rails --shell /bin/bash<% if options.nginx? %> && \
-    chown rails:rails /var/lib/nginx /var/log/nginx/*<% end %>
+    chown rails:rails /var/lib/nginx /var/log/nginx/*<% end %><% if deploy_packages.include?("sudo") && options.sudo? %> && \
+    sed -i 's/env_reset/env_keep="*"/' /etc/sudoers && \
+    chown rails:rails .<% end %>
 <% unless options.swap -%>
 USER rails:rails
 <% end -%>

data/lib/generators/templates/_apt_install.erb

@@ -6,9 +6,6 @@ RUN --mount=type=cache,id=dev-apt-cache,sharing=locked,target=/var/cache/apt \
 <% else -%>
 RUN <%= repos %>apt-get update -qq && \
     apt-get install --no-install-recommends -y <%= packages.join(" ") %><% if clean %> && \
-<% if packages.include?("sudo") && options.sudo? -%>
-    sed -i 's/env_reset/env_keep="*"/' /etc/sudoers && \
-<% end -%>
     rm -rf /var/lib/apt/lists /var/cache/apt/archives<% end %>
 <% end -%>
 <% if @sqlserver -%>

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: dockerfile-rails
 version: !ruby/object:Gem::Version
-  version: 1.2.4
+  version: 1.2.5
 platform: ruby
 authors:
 - Sam Ruby
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2023-03-04 00:00:00.000000000 Z
+date: 2023-03-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails