dockerfile-rails 1.2.3 → 1.2.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 98b182ee88ad6c1ba34edb41778c9d59dd329eefb6b199ede26697ded174aedb
-  data.tar.gz: 94e946801bc23ae53ce8ba8a4c7f8129a58e04aad1db4b9cf05bc5d43b22cebb
+  metadata.gz: 6f8b3176721310f5c043a7c2642f12b59fa7bc2952fb73f6e6164d199d24bc5a
+  data.tar.gz: 995b15167890754208baef9bc6ff48613e8cef121083f8d70c1be77593b5beb4
 SHA512:
-  metadata.gz: f20bb484ad3637c100cf2ff9a786404a686e961db71dbfdc1d48d0b33ea461c8031bb2ddacc05ebd3857aaa5d318fe2d49c2ecc21cd760b1fa08fac9e963a28f
-  data.tar.gz: 80f23221cf71777312e57165a23b93a165feae6db3af97ac8c836e71295493ff952ca34f36e2a190f392508fb0e8a92b56a42c090262076063d75b386b96be56
+  metadata.gz: 7f05f65f85a29fcfc242682ab6464adb88f9e0725fffe1c65c192c342e12444c3dbaff9f855ff28ccb94ea13fa706918b71609af06a87673007407083e77dd2c
+  data.tar.gz: 5bcca34771c67bf29e28be9a0342fbd9dac8a13694f3416d0b27a2070cabf0e38017ed195ecf2b1a80a03150698cb62502e73d63ec603500bb927fa627cd73aa

data/README.md

@@ -41,7 +41,9 @@ 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/).  May require `--root` on some targets to access `/dev/stdout`
+* `--no-link` - don't add [--link](https://docs.docker.com/engine/reference/builder/#copy---link) to COPY statements.  Some tools (like at the moment, [buildah](https://www.redhat.com/en/topics/containers/what-is-buildah)) don't yet support this feature.
 * `--no-lock` - don't add linux platforms, set `BUNDLE_DEPLOY`, or `--frozen-lockfile`.  May be needed at times to work around a [rubygems bug](https://github.com/rubygems/rubygems/issues/6082#issuecomment-1329756343).
+* `--sudo` - install and configure sudo to enable `sudo -iu rails` access to full environment
 
 ### Add a Database:
 

data/Rakefile

@@ -36,7 +36,7 @@ namespace :test do
         'Rails.application.routes.draw {get "/up", to: proc {[200, {}, ["ok"]]}}'
       sh "docker buildx build . --load -t system:test"
       key = IO.read("config/master.key")
-      sh "docker run -p 3000:3000 -e RAILS_MASTER_KEY=#{key} system:test"
+      sh "docker run -p 3000:3000 -e RAILS_MASTER_KEY=#{key} --rm system:test"
     end
   ensure
     rm_rf "test/tmp/system_test"

data/lib/generators/dockerfile_generator.rb

@@ -6,7 +6,7 @@ require_relative "../dockerfile-rails/scanner.rb"
 class DockerfileGenerator < Rails::Generators::Base
   include DockerfileRails::Scanner
 
-  OPTION_DEFAULTS = {
+  BASE_DEFAULTS = {
     "bin-cd" => false,
     "cache" => false,
     "ci" => false,
@@ -14,6 +14,7 @@ class DockerfileGenerator < Rails::Generators::Base
     "fullstaq" => false,
     "jemalloc" => false,
     "label" => {},
+    "link" => true,
     "lock" => true,
     "mysql" => false,
     "nginx" => false,
@@ -25,10 +26,13 @@ class DockerfileGenerator < Rails::Generators::Base
     "redis" => false,
     "root" => false,
     "sqlite3" => false,
+    "sudo" => false,
     "swap" => nil,
     "yjit" => false,
   }.then { |hash| Struct.new(*hash.keys.map(&:to_sym)).new(*hash.values) }
 
+  OPTION_DEFAULTS = BASE_DEFAULTS.dup
+
   @@labels = {}
   @@packages = { "base" => [], "build" => [], "deploy" => [] }
   @@vars = { "base" => {}, "build" => {}, "deploy" => {} }
@@ -68,6 +72,9 @@ class DockerfileGenerator < Rails::Generators::Base
   class_option :ci, type: :boolean, default: OPTION_DEFAULTS.ci,
     desc: "include test gems in bundle"
 
+  class_option :link, type: :boolean, default: OPTION_DEFAULTS.lock,
+    desc: "use COPY --link whenever possible"
+
   class_option :lock, type: :boolean, default: OPTION_DEFAULTS.lock,
     desc: "lock Gemfile/package.json"
 
@@ -125,6 +132,8 @@ class DockerfileGenerator < Rails::Generators::Base
   class_option :root, type: :boolean, default: OPTION_DEFAULTS.root,
     desc: "Run application as root user"
 
+  class_option :sudo, type: :boolean, default: OPTION_DEFAULTS.sudo,
+    desc: "Install and configure sudo to enable running as rails with full environment"
 
   class_option "add-base", type: :array, default: [],
     desc: "additional packages to install for both build and deploy"
@@ -212,18 +221,27 @@ class DockerfileGenerator < Rails::Generators::Base
 
     template "docker-compose.yml.erb", "docker-compose.yml" if options.compose
 
-    template "dockerfile.yml.erb", "config/dockerfile.yml", force: true
-
     if @gemfile.include?("vite_ruby")
       package = JSON.load_file("package.json")
       unless package.dig("scripts", "build")
         package["scripts"] ||= {}
-        package["scripts"]["build"] ||= "vite build --outDir public"
+        package["scripts"]["build"] = "vite build --outDir public"
 
         say_status :update, "package.json"
         IO.write("package.json", JSON.pretty_generate(package))
       end
     end
+
+    @dockerfile_config = (@dockerfile_config.to_a - BASE_DEFAULTS.to_h.stringify_keys.to_a).to_h
+    %w(packages envs args).each do |key|
+      @dockerfile_config.delete key if @dockerfile_config[key].empty?
+    end
+
+    if !@dockerfile_config.empty?
+      template "dockerfile.yml.erb", "config/dockerfile.yml", force: true
+    elsif File.exist? "config/dockerfile.yml"
+      remove_file "config/dockerfile.yml"
+    end
   end
 
 private
@@ -301,6 +319,10 @@ private
 
     gemfile = IO.read("Gemfile")
 
+    unless /^\s*source\s/.match?(gemfile)
+      gemfile = %{source "https://rubygems.org"\n} + gemfile
+    end
+
     if options.postgresql? || @postgresql
       system "bundle add pg --skip-install" unless @gemfile.include? "pg"
     end
@@ -343,6 +365,16 @@ private
     end
   end
 
+  def base_gems
+    gems = ["bundler"]
+
+    if options.ci? && options.lock? && @gemfile.include?("debug")
+      gems += %w(irb reline) - @gemfile
+    end
+
+    gems.sort
+  end
+
   def base_packages
     packages = []
     packages += @@packages["base"] if @@packages["base"]
@@ -454,6 +486,9 @@ private
     # nginx
     packages << "nginx" if options.nginx?
 
+    # sudo
+    packages << "sudo" if options.sudo?
+
     packages.sort
   end
 

data/lib/generators/templates/Dockerfile.erb

@@ -32,10 +32,7 @@ ENV <%= base_env.join(" \\\n    ") %>
 
 # Update gems and bundler
 RUN gem update --system --no-document && \
-<% if options.ci? and options.lock? -%>
-    gem install -N irb reline && \
-<% end -%>
-    gem install -N bundler
+    gem install -N <%= base_gems.join(" ") %>
 
 <% unless base_requirements.empty? -%>
 # Install packages needed to install <%= base_requirements %>
@@ -82,7 +79,7 @@ ENV <%= build_env.join(" \\\n    ") %>
 
 <% end -%>
 # Install application gems
-COPY Gemfile Gemfile.lock .
+COPY<% if options.link? %> --link<% end %> Gemfile Gemfile.lock ./
 <% if options.cache? -%>
 RUN --mount=type=cache,id=bld-gem-cache,sharing=locked,target=/srv/vendor \
     bundle config set app_config .bundle && \
@@ -98,7 +95,8 @@ RUN --mount=type=cache,id=bld-gem-cache,sharing=locked,target=/srv/vendor \
 
 <% else -%>
 RUN bundle install<% if depend_on_bootsnap? -%> && \
-    bundle exec bootsnap precompile --gemfile<% end %>
+    bundle exec bootsnap precompile --gemfile<% end %> && \
+    rm -rf ~/.bundle/ $BUNDLE_PATH/ruby/*/cache $BUNDLE_PATH/ruby/*/bundler/gems/*/.git
 
 <% end -%>
 <% if parallel? -%>
@@ -110,7 +108,7 @@ COPY --from=node /rails/node_modules /rails/node_modules
 
 <% end -%>
 # Copy application code
-COPY . .
+COPY<% if options.link? %> --link<% end %> . .
 
 <% if depend_on_bootsnap? -%>
 # Precompile bootsnap code for faster boot times
@@ -161,8 +159,10 @@ ARG UID=1000 \
     GID=1000
 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 %>
+RUN useradd rails<% end -%> --home /rails --shell /bin/bash<% if options.nginx? %> && \
+    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/_node_client.erb

@@ -9,5 +9,5 @@ ENV NODE_ENV=production
 <%= render partial: 'npm_install', locals: {sources: api_client_files} %>
 
 # build client application
-COPY <%= api_client_dir %> .
-RUN npm run build
+COPY<% if options.link? %> --link<% end %> <%= api_client_dir %> .
+RUN npm run build

data/lib/generators/templates/_npm_install.erb

@@ -1,5 +1,5 @@
 # Install node modules
-COPY <%=sources.join(' ') %> .
+COPY<% if options.link? %> --link<% end %> <%= sources.join(' ') %> ./
 <% if sources.join.include? 'yarn' -%>
 RUN <% if options.cache? -%>--mount=type=cache,id=bld-yarn-cache,target=/root/.yarn \
     YARN_CACHE_FOLDER=/root/.yarn <% end -%>yarn install<% if options.lock? %> --frozen-lockfile<% end %>

metadata

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