dockerfile-rails 1.6.17 → 1.6.19

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: e637270c44cb54868cd8947bc9347000e60ae76395d5f2033ca61f67f8266bac
-  data.tar.gz: afe0959d1da483ca595e1b13bf5f7568bf470aa1b6abaf8e3e604b21cebcf793
+  metadata.gz: 770d93b1bee2aa9cec4832a7a03b6c3ed8ccbfb82ca6c19a28959ab38f5f4501
+  data.tar.gz: d19ba2048b0c6d2f5d92506ab29dd2c06bdf106d782b4ce3ca45d41c079306a0
 SHA512:
-  metadata.gz: 11c0b726982acebf8d3943aaf2c498e9ecfb4960f943f3ef094881390601c9c6bdfb1d2cb69a45fbf4b0d481284d3cefc76986b3187f7b6d09a53434cd26f373
-  data.tar.gz: 5c971c5b102ec993900e0bb75ccb52e17335499649ae05c23c2d6302f12e8514e200071cdd19015af5f0e28d65e2405f77799bcb7089fdd2ae7de0c38ade0f9d
+  metadata.gz: 9dab86fe342a82d18911f2a1fc2d7ec5de69f3b7b3326f1ea9c9fb2945049dbcdd39ac9c125ab524997c16af6f1422b0d73062dfd80ff13044a79b7f0e81996e
+  data.tar.gz: ef62d1ff9359b3e702c0e5a914e39edeeb594bf5c3cc9f5ff2ac8564b974e5ae2bd753f4949d69353a8caf5cdb2ed220daa27255589b0c8f991b60cefd4dbb47

data/lib/fly_replay.rb

@@ -0,0 +1,29 @@
+# frozen_string_literal: true
+
+module Fly
+  class FlyReplay
+    def initialize(app)
+      @app = app
+    end
+
+    def call(env)
+      # replay /prometheus/* to the prom proxy in bubblegum
+      if env["PATH_INFO"].starts_with?("/prometheus")
+        return [307, { "Fly-Replay" => "app=flyio-bubblegum-api" }, []]
+      end
+
+      # replay /debug to the debug app. unsure if this is actually used
+      if env["PATH_INFO"].starts_with?("/debug")
+        return [307, { "Fly-Replay" => "app=debug" }, []]
+      end
+
+      @status, @headers, @response = @app.call(env)
+
+      context = OpenTelemetry::Trace.current_span.context
+      @headers["fly-trace-id"] = context.trace_id.unpack1("H*")
+      @headers["fly-span-id"] = context.span_id.unpack1("H*")
+
+      [@status, @headers, @response]
+    end
+  end
+end

data/lib/generators/dockerfile_generator.rb

@@ -331,6 +331,8 @@ class DockerfileGenerator < Rails::Generators::Base
 
     template "docker-compose.yml.erb", "docker-compose.yml" if options.compose
 
+    template "database.yml.erb", "config/database.yml" if fix_database_config
+
     if using_litefs?
       template "litefs.yml.erb", "config/litefs.yml"
 
@@ -517,12 +519,16 @@ private
     options.passenger? or options["max-idle"]
   end
 
+  def includes_jobs?
+    !(Dir["app/jobs/*.rb"] - ["app/jobs/application_job.rb"]).empty?
+  end
+
   def using_sidekiq?
-    @gemfile.include?("sidekiq")
+    @gemfile.include?("sidekiq") and includes_jobs?
   end
 
   def using_solidq?
-    @gemfile.include?("solid_queue")
+    @gemfile.include?("solid_queue") and includes_jobs?
   end
 
   def parallel?
@@ -1252,6 +1258,19 @@ private
     more
   end
 
+  def compose_web_volumes
+    volumes = %w[ log storage ]
+
+    if deploy_database == "sqlite3"
+      database = YAML.load_file("config/database.yml", aliases: true).dig("production", "database")
+      if database && database =~ /^\w/
+        volumes << File.dirname(database)
+      end
+    end
+
+    volumes.uniq.sort
+  end
+
   def max_idle
     option = options["max-idle"]
 
@@ -1433,4 +1452,31 @@ private
 
     toml
   end
+
+  # if there are multiple production databases defined, allow them all to be
+  # configured via DATABASE_URL.
+  def fix_database_config
+    yaml = IO.read("config/database.yml")
+
+    production = YAML.load(yaml, aliases: true)["production"]
+    return unless production.is_a?(Hash) && production.values.all?(Hash)
+    return if production.keys == [ "primary" ]
+
+    section = yaml[/^(production:.*?)(^\S|\z)/m, 1]
+
+    replacement = section.gsub(/(  ).*?\n((\1\s+).*?\n)*/) do |subsection|
+      spaces = $3
+      name = subsection[/\w+/]
+
+      if /^ +url:/.match?(subsection)
+        subsection
+      elsif name == "primary"
+        subsection + spaces + %(url: <%= ENV["DATABASE_URL"] %>\n)
+      else
+        subsection + spaces + %(url: <%= URI.parse(ENV["DATABASE_URL"]).tap { |url| url.path += "_#{name}" } if ENV["DATABASE_URL"] %>\n)
+      end
+    end
+
+    yaml.sub(section, replacement)
+  end
 end

data/lib/generators/templates/Dockerfile.erb

@@ -8,9 +8,9 @@ ARG RUBY_VERSION=<%= RUBY_VERSION %>
 
 <% end -%>
 <% if options.fullstaq -%>
-FROM <%= platform %>quay.io/evl.ms/fullstaq-ruby:${RUBY_VERSION}-<%= options.jemalloc ? 'jemalloc-' : 'malloctrim-' %><%= variant %><% unless options.precompile == "defer" %> as base<% end %>
+FROM <%= platform %>quay.io/evl.ms/fullstaq-ruby:${RUBY_VERSION}-<%= options.jemalloc ? 'jemalloc-' : 'malloctrim-' %><%= variant %><% unless options.precompile == "defer" %> AS base<% end %>
 <% else -%>
-FROM <%= platform %><%= options.registry %>ruby:$RUBY_VERSION-<%= variant %><% unless options.precompile == "defer" %> as base<% end %>
+FROM <%= platform %><%= options.registry %>ruby:$RUBY_VERSION-<%= variant %><% unless options.precompile == "defer" %> AS base<% end %>
 <% end -%>
 
 <% unless options.label.empty? -%>
@@ -50,7 +50,7 @@ RUN gem update --system <% if RUBY_VERSION.start_with? '2' %>3.4.22 <% end %>--n
 <% unless options.precompile == "defer" -%>
 
 # Throw-away build stage<%= parallel? ? 's' : '' %> to reduce size of final image
-FROM base as <%= parallel? ? 'pre' : '' %>build
+FROM base AS <%= parallel? ? 'pre' : '' %>build
 
 <% end -%>
 # Install packages needed to build gems<%= using_node? ? " and node modules" : "" %>
@@ -58,7 +58,7 @@ FROM base as <%= parallel? ? 'pre' : '' %>build
 
 <% if parallel? -%>
 
-FROM prebuild as <% if using_bun? %>bun<% else %>node<% end %>
+FROM prebuild AS <% if using_bun? %>bun<% else %>node<% end %>
 
 <% end -%>
 <% if using_bun? and (!using_execjs? || File.exist?('bun.lockb')) -%>
@@ -72,7 +72,7 @@ FROM prebuild as <% if using_bun? %>bun<% else %>node<% end %>
 <%= render partial: 'npm_install', locals: {sources: Dir[*%w(package.json yarn.lock bun.lockb)]} %>
 
 
-FROM prebuild as build
+FROM prebuild AS build
 
 <% end -%>
 <% unless build_args.empty? -%>

data/lib/generators/templates/_node_client.erb

@@ -1,6 +1,6 @@
 ARG NODE_VERSION=<%= node_version %>
 
-FROM <%= platform %>node:$NODE_VERSION-slim as client
+FROM <%= platform %>node:$NODE_VERSION-slim AS client
 
 WORKDIR /rails/<%= api_client_dir %>
 

data/lib/generators/templates/database.yml.erb

@@ -0,0 +1 @@
+<%= fix_database_config %>

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

@@ -1,4 +1,5 @@
 version: "3.8"
+
 services:
   web:
 <% if all_args.empty? -%>
@@ -18,11 +19,14 @@ services:
     secrets:
       - gemserver_credentials
 <% end -%>
+<% end -%>
+    volumes:
+<% compose_web_volumes.each do |path| -%>
+      - ./<%= path %>:/rails/<%= path %>
 <% end -%>
     ports:
       - "3000:3000"
     environment:
-      - RAILS_MASTER_KEY=$RAILS_MASTER_KEY
 <% if using_redis? -%>
       - REDIS_URL=redis://redis-db:6379
 <% end -%>
@@ -35,10 +39,9 @@ services:
       - DATABASE_URL=mysql2://root:password@mysql-db/
 <% end -%>
 <% end -%>
-<% if deploy_database == 'sqlite3' -%>
-    volumes:
-      - ./db:/rails/db
-<% end -%>
+    secrets:
+      - source: master_key
+        target: /rails/config/master.key
 <% if using_redis? or deploy_database != 'sqlite3' -%>
     depends_on:
 <% if using_redis? -%>
@@ -60,9 +63,7 @@ services:
       POSTGRES_USER: root
       POSTGRES_PASSWORD: password
     volumes:
-      - ./tmp/db:/var/lib/postgresql/data
-    ports:
-      - "5432:5432"
+      - ./tmp/postgres-db:/var/lib/postgresql/data
     healthcheck:
       test: pg_isready
       interval: 2s
@@ -77,7 +78,7 @@ services:
     environment:
       MYSQL_ROOT_PASSWORD: password
     volumes:
-      - ./tmp/db:/var/lib/mysql
+      - ./tmp/mysql-db:/var/lib/mysql
     healthcheck:
       test: mysqladmin ping -h 127.0.0.1 -u root --password=password
       interval: 2s
@@ -132,3 +133,7 @@ secrets:
   gemserver_credentials:
     file: ./GEMSERVER_CREDENTIALS.secret.txt
 <% end -%>
+
+secrets:
+  master_key:
+    file: ./config/master.key

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: dockerfile-rails
 version: !ruby/object:Gem::Version
-  version: 1.6.17
+  version: 1.6.19
 platform: ruby
 authors:
 - Sam Ruby
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2024-06-24 00:00:00.000000000 Z
+date: 2024-09-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -37,6 +37,7 @@ files:
 - Rakefile
 - lib/dockerfile-rails.rb
 - lib/dockerfile-rails/scanner.rb
+- lib/fly_replay.rb
 - lib/generators/dockerfile_generator.rb
 - lib/generators/templates/Dockerfile.erb
 - lib/generators/templates/_apt_install.erb
@@ -45,6 +46,7 @@ files:
 - lib/generators/templates/_node_client.erb
 - lib/generators/templates/_npm_install.erb
 - lib/generators/templates/_passenger.erb
+- lib/generators/templates/database.yml.erb
 - lib/generators/templates/docker-compose.yml.erb
 - lib/generators/templates/docker-entrypoint.erb
 - lib/generators/templates/dockerfile.yml.erb
@@ -74,7 +76,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.5.10
+rubygems_version: 3.5.14
 signing_key:
 specification_version: 4
 summary: Dockerfile generator for Rails