dockerfile-rails 1.0.18 → 1.1.0

data/lib/generators/templates/Dockerfile.erb

@@ -22,10 +22,13 @@ LABEL <%= key =~ /^\w[.\w]*$/ ? key : key.inspect %>=<%= value.inspect %>
 # Rails app lives here
 WORKDIR /rails
 
+<% unless base_args.empty? -%>
+# Base build arguments
+ARG <%= base_args.map {|key, value| "#{key}=#{value.inspect}"}.join(" \\\n    ") %>
+
+<% end -%>
 # Set production environment
-ENV RAILS_ENV="production" \
-    BUNDLE_PATH="vendor/bundle" \
-    BUNDLE_WITHOUT="<%= options.ci? ? 'development' : 'development:test' %>"
+ENV <%= base_env.join(" \\\n    ") %>
 
 # Update gems and preinstall the desired version of bundler
 ARG BUNDLER_VERSION=<%= Bundler::VERSION %>
@@ -68,6 +71,16 @@ FROM prebuild as node
 
 FROM prebuild as build
 
+<% end -%>
+<% unless build_args.empty? -%>
+# Build arguments
+ARG <%= build_args.map {|key, value| "#{key}=#{value.inspect}"}.join(" \\\n    ") %>
+
+<% end -%>
+<% unless build_env.empty? -%>
+# Deployment options
+ENV <%= build_env.join(" \\\n    ") %>
+
 <% end -%>
 # Install application gems
 COPY Gemfile Gemfile.lock ./
@@ -125,9 +138,9 @@ RUN SECRET_KEY_BASE<%= Rails::VERSION::MAJOR<7 || Rails::VERSION::STRING.start_w
 FROM base
 
 <% end -%>
-<% unless run_as_root? -%>
-# add a non-root user
-RUN useradd rails
+<% unless deploy_args.empty? -%>
+# Deployment build arguments
+ARG <%= deploy_args.map {|key, value| "#{key}=#{value.inspect}"}.join(" \\\n    ") %>
 
 <% end -%>
 <% unless deploy_packages.empty? -%>
@@ -141,6 +154,19 @@ RUN useradd rails
 <% elsif procfile.size > 1 -%>
 RUN gem install foreman
 
+<% end -%>
+<% unless run_as_root? -%>
+# # 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 -%>
+USER rails
+
 <% end -%>
 <% unless options.precompile == "defer" -%>
 # Copy built application from previous stage

data/lib/generators/templates/docker-compose.yml.erb

@@ -1,7 +1,16 @@
 version: "3.8"
 services:
   web:
+<% if all_args.empty? -%>
     build: .
+<% else -%>
+    build:
+      context: .
+      args:
+<% all_args.each do |name, value| -%>
+        <%= name %>: <%= value.html_safe? ? value : "\"#{Shellwords.escape(value)}\"" %>
+<% end -%>
+<% end -%>
     ports:
       - "3000:3000"
     environment:

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: dockerfile-rails
 version: !ruby/object:Gem::Version
-  version: 1.0.18
+  version: 1.1.0
 platform: ruby
 authors:
 - Sam Ruby
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2023-02-16 00:00:00.000000000 Z
+date: 2023-02-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -32,6 +32,7 @@ extra_rdoc_files: []
 files:
 - DEMO.md
 - MIT-LICENSE
+- MOTIVATION.md
 - README.md
 - Rakefile
 - lib/dockerfile-rails.rb