dockerfile-rails 1.5.0 → 1.5.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 4478af556f6059702ab4b1fce65ab4735a024299796bdebce3014730f3d86220
-  data.tar.gz: 941e1e7a2fd88238d3ee9dd7fe16ffb2e290e10568fd1ca2ed3e0001d5aceed8
+  metadata.gz: d8ce323b4347b43694278ab3b78c36c300deef6c88acff15e3a5c6e66ef5a0ad
+  data.tar.gz: 507e7a76e5f38761f3d729b665d93f231185ffc07edd3665ca88a034244a1dc3
 SHA512:
-  metadata.gz: ed8adae939c867d565049530df18915c49f0cbd775cc9b909733960ea8b3075b9185132eaf1454e501f7ea211a3f903dca44ce394f20fe356168154d8c2165dd
-  data.tar.gz: a289a97a457eedd708e9449172b5191685d5f120de3b04df18d6e35950131f681972bf009953967120e32d949b4aede461ac0fb675e14fff8858ccf38de7d522
+  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/dockerfile-rails/scanner.rb

@@ -44,7 +44,7 @@ module DockerfileRails
         @sqlite3 = true
       elsif database == "postgresql"
         @postgresql = true
-      elsif (database == "mysql") || (database == "mysql2")
+      elsif (database == "mysql") || (database == "mysql2") || (database == "trilogy")
         @mysql = true
       elsif database == "sqlserver"
         @sqlserver = true
@@ -52,7 +52,7 @@ module DockerfileRails
 
       @sqlite3 = true if @gemfile.include? "sqlite3"
       @postgresql = true if @gemfile.include? "pg"
-      @mysql = true if @gemfile.include? "mysql2"
+      @mysql = true if @gemfile.include?("mysql2") || using_trilogy?
 
       ### node modules ###
 
@@ -81,5 +81,9 @@ module DockerfileRails
 
       @redis = @redis_cable || @redis_cache
     end
+
+    def using_trilogy?
+      @gemfile.include?("trilogy") || @gemfile.include?("activerecord-trilogy-adapter")
+    end
   end
 end

data/lib/generators/dockerfile_generator.rb

@@ -33,12 +33,13 @@ class DockerfileGenerator < Rails::Generators::Base
     "registry" => "",
     "root" => false,
     "sqlite3" => false,
+    "sentry" => false,
     "sudo" => false,
     "swap" => nil,
     "variant" => "slim",
     "windows" => false,
     "yjit" => false,
-  }.then { |hash| Struct.new(*hash.keys.map(&:to_sym)).new(*hash.values) }
+  }.yield_self { |hash| Struct.new(*hash.keys.map(&:to_sym)).new(*hash.values) }
 
   OPTION_DEFAULTS = BASE_DEFAULTS.dup
 
@@ -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,17 +286,19 @@ class DockerfileGenerator < Rails::Generators::Base
       fly_attach_consul
     end
 
-    if fly_processes # therefore File.exist?('fly.toml')
+    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
-        toml = fly_make_processes(fly_processes)
-        if toml != IO.read("fly.toml")
-          File.write "fly.toml", toml
-        end
+        toml = fly_make_toml
+        File.write "fly.toml", toml if toml != ""
       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")
@@ -321,7 +327,7 @@ private
     scope = (Class.new do
       def initialize(obj, locals)
         @_obj = obj
-        @_locals = locals.then do |hash|
+        @_locals = locals.yield_self do |hash|
           return nil if hash.empty?
           Struct.new(*hash.keys.map(&:to_sym)).new(*hash.values)
         end
@@ -400,6 +406,14 @@ private
     using_node? && options.parallel
   end
 
+  def has_mysql_gem?
+    @gemfile.include? "mysql2" or using_trilogy?
+  end
+
+  def using_trilogy?
+    @gemfile.include?("trilogy") || @gemfile.include?("activerecord-trilogy-adapter")
+  end
+
   def keeps?
     return @keeps if @keeps != nil
     @keeps = !!Dir["**/.keep"]
@@ -419,13 +433,18 @@ private
     end
 
     if options.mysql? || @mysql
-      system "bundle add mysql2 --skip-install" unless @gemfile.include? "mysql2"
+      system "bundle add mysql2 --skip-install" unless has_mysql_gem?
     end
 
     if options.redis? || using_redis?
       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|
@@ -511,7 +530,10 @@ private
     # add databases: sqlite3, postgres, mysql
     packages << "pkg-config" if options.sqlite3? || @sqlite3
     packages << "libpq-dev" if options.postgresql? || @postgresql
-    packages << "default-libmysqlclient-dev" if options.mysql? || @mysql
+
+    if (options.mysql? || @mysql) && !using_trilogy?
+      packages << "default-libmysqlclient-dev"
+    end
 
     # add git if needed to install gems
     packages << "git" if @git
@@ -635,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
 
@@ -714,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
 
@@ -857,7 +874,7 @@ private
     # use presence of "pg" or "mysql2" in the bundle as evidence of intent.
     if options.postgresql? || @postgresql || @gemfile.include?("pg")
       "postgresql"
-    elsif options.mysql? || @mysql || @gemfile.include?("mysql2")
+    elsif options.mysql? || @mysql || has_mysql_gem?
       "mysql"
     else
       "sqlite3"
@@ -1042,19 +1059,54 @@ private
     system "#{flyctl} consul attach"
   end
 
-  def fly_make_processes(list)
+  def fly_make_toml
     toml = File.read("fly.toml")
 
-    if toml.include? "[processes]"
-      toml.sub!(/\[processes\].*?(\n\n|\n?\z)/m, "[processes]\n" +
-        list.map { |name, cmd| "  #{name} = #{cmd.inspect}" }.join("\n") + '\1')
-    else
-      toml += "\n[processes]\n" +
-        list.map { |name, cmd| "  #{name} = #{cmd.inspect}\n" }.join
+    list = fly_processes
+    if list
+      if toml.include? "[processes]"
+        toml.sub!(/\[processes\].*?(\n\n|\n?\z)/m, "[processes]\n" +
+          list.map { |name, cmd| "  #{name} = #{cmd.inspect}" }.join("\n") + '\1')
+      else
+        toml += "\n[processes]\n" +
+          list.map { |name, cmd| "  #{name} = #{cmd.inspect}\n" }.join
+
+        app = list.has_key?("app") ? "app" : list.keys.first
+
+        toml.sub! "[http_service]\n", "\\0  processes = [#{app.inspect}]\n"
+      end
+    end
+
+    if options.prepare == false
+      deploy = "[deploy]\n  release_command = #{dbprep_command.inspect}\n\n"
+      if toml.include? "[deploy]"
+        toml.sub!(/\[deploy\].*?(\n\n|\n?\z)/m, deploy)
+      else
+        toml += deploy
+      end
+    end
 
-      app = list.has_key?("app") ? "app" : list.keys.first
+    if options.swap
+      suffixes = {
+        "kib" => 1024,
+        "k"   => 1024,
+        "kb"  => 1000,
+        "mib" => 1048576,
+        "m"   => 1048576,
+        "mb"  => 100000,
+        "gib" => 1073741824,
+        "g"   => 1073741824,
+        "gb"  => 100000000,
+      }
 
-      toml.sub! "[http_service]\n", "\\0  processes = [#{app.inspect}]\n"
+      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

data/lib/generators/templates/_install_node.erb

@@ -20,7 +20,7 @@ RUN curl -sL https://github.com/nodenv/node-build/archive/master.tar.gz | tar xz
 <% if yarn_version < '2' -%>
 <% if node_version -%>   <% else %>RUN<% end %> npm install -g yarn@$YARN_VERSION<% if node_version -%> && \<% end %>
 <% else -%>
-<% if (node_version.split('.').map(&:to_i) <=> [16,10,0]) < 0 -%>
+<% if node_version && (node_version.split('.').map(&:to_i) <=> [16,10,0]) < 0 -%>
     npm i -g corepack && \
 <% else -%>
     corepack enable && \

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-compose.yml.erb

@@ -21,8 +21,12 @@ services:
 <% if deploy_database == 'postgresql' -%>
       - DATABASE_URL=postgres://root:password@postgres-db/
 <% elsif deploy_database == 'mysql' -%>
+<% if using_trilogy? -%>
+      - DATABASE_URL=trilogy://root:password@mysql-db/
+<% else -%>
       - DATABASE_URL=mysql2://root:password@mysql-db/
 <% end -%>
+<% end -%>
 <% if deploy_database == 'sqlite3' -%>
     volumes:
       - ./db:/rails/db
@@ -89,7 +93,11 @@ services:
 <% if deploy_database == 'postgresql' -%>
       - DATABASE_URL=postgres://root:password@postgres-db/
 <% elsif deploy_database == 'mysql' -%>
+<% if using_trilogy? -%>
+      - DATABASE_URL=trilogy://root:password@mysql-db/
+<% else -%>
       - DATABASE_URL=mysql2://root:password@mysql-db/
+<% end -%>
 <% end -%>
     depends_on:
       redis-db:

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/fly.toml.erb

@@ -1 +1 @@
-<%= fly_make_processes(fly_processes) -%>
+<%= fly_make_toml -%>

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.0
+  version: 1.5.2
 platform: ruby
 authors:
 - Sam Ruby
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2023-06-22 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
@@ -65,7 +66,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 2.6.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="