dockerfile-rails 1.5.1 → 1.5.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 1aca228134c031de432e9c059c2451da36827f11334c25498506e1dc1a5f7819
-  data.tar.gz: b661bfc9e1d9a3aafa0a10181a33927616e06162bb4ea24f960d33ff5598337c
+  metadata.gz: d8ce323b4347b43694278ab3b78c36c300deef6c88acff15e3a5c6e66ef5a0ad
+  data.tar.gz: 507e7a76e5f38761f3d729b665d93f231185ffc07edd3665ca88a034244a1dc3
 SHA512:
-  metadata.gz: b432aedcdafad7b3aea076ad4501252aa2dc51f3cd980be1e6d4761d43b57773ec76ebc862d4f9cdd8526f1d5e3cf77c5f24b48d615fe558e0055b54aabd0803
-  data.tar.gz: c20b0900280252cef4eab686b3f0b2718e99e46779504174fd4898d86ec68868607acc1cc5179d5c815334c2d911e0bd587169dfe6ca023af40e2caa743f66fc
+  metadata.gz: d9d99879f76d1e9d1e4f601db989b5d6a80e3b4113456827e2b0ab17a495163fb14925c6a6ea34ed760f2921fe482ccfc377e89382e40c10681d3423da6c3f16
+  data.tar.gz: 40a0a469845941a12367aa5f1a7e54f7834a8b07ac081b9bdcf922d30c57d02d75dc994c7b6d1c77e301fac2142e7dcac29551b443286a9c51342582ac043aaa

data/README.md

@@ -44,6 +44,7 @@ bin/rails generate dockerfile
 * `--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).
+* `--sentry` -- install gems and a starter initializer for sentry
 * `--sudo` - install and configure sudo to enable `sudo -iu rails` access to full environment
 
 ### Add a Database:

data/lib/generators/dockerfile_generator.rb

@@ -33,6 +33,7 @@ class DockerfileGenerator < Rails::Generators::Base
     "registry" => "",
     "root" => false,
     "sqlite3" => false,
+    "sentry" => false,
     "sudo" => false,
     "swap" => nil,
     "variant" => "slim",
@@ -169,6 +170,9 @@ class DockerfileGenerator < Rails::Generators::Base
   class_option :sudo, type: :boolean, default: OPTION_DEFAULTS.sudo,
     desc: "Install and configure sudo to enable running as rails with full environment"
 
+  class_option :sentry, type: :boolean, default: OPTION_DEFAULTS.sentry,
+    desc: "Install gems and a starter initializer for sentry"
+
   class_option "migrate", type: :string, default: OPTION_DEFAULTS.migrate,
     desc: "custom migration/db:prepare script"
 
@@ -282,7 +286,7 @@ class DockerfileGenerator < Rails::Generators::Base
       fly_attach_consul
     end
 
-    if File.exist?("fly.toml") && (fly_processes || !options.prepare)
+    if File.exist?("fly.toml") && (fly_processes || !options.prepare || options.swap)
       if File.stat("fly.toml").size > 0
         template "fly.toml.erb", "fly.toml"
       else
@@ -291,6 +295,10 @@ class DockerfileGenerator < Rails::Generators::Base
       end
     end
 
+    if options.sentry? && (not File.exist?("config/initializers/sentry.rb"))
+      template "sentry.rb.erb", "config/initializers/sentry.rb"
+    end
+
     if @gemfile.include?("vite_ruby")
       package = JSON.load_file("package.json")
       unless package.dig("scripts", "build")
@@ -432,6 +440,11 @@ private
       system "bundle add redis --skip-install" unless @gemfile.include? "redis"
     end
 
+    if options.sentry?
+      system "bundle add sentry-ruby --skip-install" unless @gemfile.include? "sentry-ruby"
+      system "bundle add sentry-rails --skip-install" unless @gemfile.include? "sentry-rails"
+    end
+
     # https://stackoverflow.com/questions/70500220/rails-7-ruby-3-1-loaderror-cannot-load-such-file-net-smtp/70500221#70500221
     if @gemfile.include? "mail"
       %w(net-smtp net-imap net-pop).each do |gem|
@@ -644,7 +657,7 @@ private
       repos += [
        "curl https://dl-ssl.google.com/linux/linux_signing_key.pub |",
        "  gpg --dearmor > /etc/apt/trusted.gpg.d/google-archive.gpg &&",
-       'echo "deb http://dl.google.com/linux/chrome/deb/ stable main" >> /etc/apt/sources.list.d/google.list'
+       'echo "deb http://dl.google.com/linux/chrome/deb/ stable main" >> /etc/apt/sources.list.d/google-chrome.list'
       ]
     end
 
@@ -723,12 +736,7 @@ private
     end
 
     if options.jemalloc? && !options.fullstaq?
-      if (options.platform || Gem::Platform.local.cpu).include? "arm"
-        env["LD_PRELOAD"] = "/usr/lib/aarch64-linux-gnu/libjemalloc.so.2"
-      else
-        env["LD_PRELOAD"] = "/usr/lib/x86_64-linux-gnu/libjemalloc.so.2"
-      end
-
+      env["LD_PRELOAD"] = "libjemalloc.so.2"
       env["MALLOC_CONF"] = "dirty_decay_ms:1000,narenas:2,background_thread:true"
     end
 
@@ -1078,6 +1086,29 @@ private
       end
     end
 
+    if options.swap
+      suffixes = {
+        "kib" => 1024,
+        "k"   => 1024,
+        "kb"  => 1000,
+        "mib" => 1048576,
+        "m"   => 1048576,
+        "mb"  => 100000,
+        "gib" => 1073741824,
+        "g"   => 1073741824,
+        "gb"  => 100000000,
+      }
+
+      pattern = Regexp.new("^(\\d+)(#{suffixes.keys.join('|')})?$", "i")
+
+      match = pattern.match(options.swap.downcase)
+
+      if match
+        size = ((match[1].to_i * (suffixes[match[2]] || 1)) / 1048576.0).round
+        toml += "swap_size_mb = #{size}"
+      end
+    end
+
     toml
   end
 end

data/lib/generators/templates/_nginx.erb

@@ -3,14 +3,14 @@ RUN gem install foreman && \
 <% unless run_as_root? -%>
     sed -i 's|pid /run|pid /rails/tmp/pids|' /etc/nginx/nginx.conf && \
 <% end -%>
-    sed -i 's/access_log\s.*;/access_log \/dev\/stdout;/' /etc/nginx/nginx.conf && \
-    sed -i 's/error_log\s.*;/error_log \/dev\/stderr info;/' /etc/nginx/nginx.conf
+    sed -i 's/access_log\s.*;/access_log stdout;/' /etc/nginx/nginx.conf && \
+    sed -i 's/error_log\s.*;/error_log stderr info;/' /etc/nginx/nginx.conf
 
 COPY <<-"EOF" /etc/nginx/sites-available/default
 server {
   listen 3000 default_server;
   listen [::]:3000 default_server;
-  access_log /dev/stdout;
+  access_log stdout;
 
   root /rails/public;
 

data/lib/generators/templates/_passenger.erb

@@ -20,10 +20,10 @@ EOF
 <% end -%>
 EOF
 RUN echo "daemon off;" >> /etc/nginx/nginx.conf && \
-    sed -i 's/access_log\s.*;/access_log \/dev\/stdout;/' /etc/nginx/nginx.conf && \
-    sed -i 's/error_log\s.*;/error_log \/dev\/stderr info;/' /etc/nginx/nginx.conf && \
+    sed -i 's/access_log\s.*;/access_log stdout;/' /etc/nginx/nginx.conf && \
+    sed -i 's/error_log\s.*;/error_log stderr info;/' /etc/nginx/nginx.conf && \
 <% if options['max-idle'] -%>
     chmod +sx /etc/nginx/sites-enabled/hook_detached_process && \
 <% end -%>
     sed -i 's/user www-data/user rails/' /etc/nginx/nginx.conf && \
-    mkdir /var/run/passenger-instreg
+    mkdir /var/run/passenger-instreg

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

@@ -1,6 +1,6 @@
 #!/bin/bash -e
 
-<% if options.swap -%>
+<% if options.swap && !File.exist?("fly.toml")-%>
 <% if run_as_root? or using_passenger? -%>
 <% @space = "" -%>
 <% else -%>

data/lib/generators/templates/sentry.rb.erb

@@ -0,0 +1,13 @@
+Sentry.init do |config|
+  config.dsn = ENV["SENTRY_DSN"]
+  config.breadcrumbs_logger = [:active_support_logger, :http_logger]
+
+  # Set traces_sample_rate to 1.0 to capture 100%
+  # of transactions for performance monitoring.
+  # We recommend adjusting this value in production.
+  config.traces_sample_rate = 1.0
+  # or
+  config.traces_sampler = lambda do |context|
+    true
+  end
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: dockerfile-rails
 version: !ruby/object:Gem::Version
-  version: 1.5.1
+  version: 1.5.2
 platform: ruby
 authors:
 - Sam Ruby
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2023-07-01 00:00:00.000000000 Z
+date: 2023-07-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -52,6 +52,7 @@ files:
 - lib/generators/templates/fly.toml.erb
 - lib/generators/templates/litefs.yml.erb
 - lib/generators/templates/node-version.erb
+- lib/generators/templates/sentry.rb.erb
 homepage: https://github.com/fly-apps/dockerfile-rails
 licenses:
 - MIT