dockerfile-rails 1.6.16 → 1.6.18

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 58f8f53b0d27c7e345bd334b553fee30ae766900f396097e062a6436aeada430
-  data.tar.gz: 71f820e93e2b14351a33a1ab0f612850446676d24060e8f44d53f7e4a38da3ba
+  metadata.gz: '06001664944f094c87433a52a0dcdb69fe820682478861d502923676e26f3c73'
+  data.tar.gz: 4189db8d30eefd52ddf399368f60ea63d940325f143c506304f257b87301b508
 SHA512:
-  metadata.gz: 9d959ba0aaf0890a66a914054c624e7575536ea33e441aa672bfd445f683964bab05bbb7f87ee11aaab9b6a285cc955c71164fb48668b5a194670eec97dc8dd3
-  data.tar.gz: 473551cdb95d6c409252ceda5cb721991b36b86c283960ca188c0b05bc7b0d417bec97b95ab5a3c2c285b0800fa1690417e294277e3aa535a95ba8b39f77dfeb
+  metadata.gz: 46e8f29cdfdfd8b16feb8392e65c57e4d5a6ea60e2b596273f1c2af43cb4cb88ac969b0a25a2702e35c6c29422e5e557046aa30a1f9c12df3b1b8663d747c159
+  data.tar.gz: 417cd9a7715a2769c9060f9f2438f6486a06362c662a9ea3dc254f2d842b5120e0fea78661eab18f2cc00529b2db5a0a18be5a44055d29e84f7cbca57ceeb009

data/Rakefile

@@ -1,5 +1,8 @@
 # frozen_string_literal: true
 
+require "rails"
+Rails.env = "test"
+
 require "bundler/gem_tasks"
 
 # Run `rake release` to release a new version of the gem.

data/lib/dockerfile-rails/scanner.rb

@@ -14,6 +14,12 @@ module DockerfileRails
         @git ||= ENV["RAILS_ENV"] != "test" && parser.specs.any? do |spec|
           spec.source.instance_of? Bundler::Source::Git
         end
+
+        # determine if the application is affected by the net-pop bug
+        # https://github.com/ruby/ruby/pull/11006#issuecomment-2176562332
+        if RUBY_VERSION == "3.3.3" && @gemfile.include?("net-pop")
+          @netpopbug = parser.specs.find { |spec| spec.name == "net-pop" }.dependencies.empty?
+        end
       end
 
       if File.exist? "Gemfile"
@@ -86,5 +92,11 @@ module DockerfileRails
     def using_trilogy?
       @gemfile.include?("trilogy") || @gemfile.include?("activerecord-trilogy-adapter")
     end
+
+    ### patches ###
+    if RUBY_VERSION == "3.3.3"
+      Bundler::LockfileParser.new(Bundler.read_file("Gemfile.lock"))
+
+    end
   end
 end

data/lib/generators/dockerfile_generator.rb

@@ -402,6 +402,15 @@ class DockerfileGenerator < Rails::Generators::Base
         STDERR.puts "\n" + shell.set_color(message, Thor::Shell::Color::RED, Thor::Shell::Color::BOLD)
       end
 
+      if @netpopbug && !dockerfile.include?("net-pop")
+        message = "Ruby 3.3.3 net-pop bug detected."
+        STDERR.puts "\n" + shell.set_color(message, Thor::Shell::Color::RED, Thor::Shell::Color::BOLD)
+        STDERR.puts "Please see https://github.com/ruby/ruby/pull/11006"
+        STDERR.puts "Change your Ruby version, or run `bin/rails generate dockerfile`,"
+        STDERR.puts "or add the following to your Dockerfile:"
+        STDERR.puts 'RUN sed -i "/net-pop (0.1.2)/a\      net-protocol" Gemfile.lock'
+      end
+
       if (options.sqlite3? || @sqlite3) && !dockerfile.include?("DATABASE_URL") && File.exist?("fly.toml")
         toml = IO.read("fly.toml")
         if !toml.include?("[[env]]")
@@ -508,12 +517,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?
@@ -1243,6 +1256,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"]
 
@@ -1394,10 +1420,10 @@ private
         "kb"  => 1000,
         "mib" => 1048576,
         "m"   => 1048576,
-        "mb"  => 100000,
+        "mb"  => 1000000,
         "gib" => 1073741824,
         "g"   => 1073741824,
-        "gb"  => 100000000,
+        "gb"  => 1000000000,
       }
 
       pattern = Regexp.new("^(\\d+)(#{suffixes.keys.join('|')})?$", "i")

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? -%>
@@ -87,6 +87,9 @@ ENV <%= build_env.join(" \\\n    ") %>
 <% end -%>
 # Install application gems
 COPY<% if options.link? %> --link<% end %> Gemfile Gemfile.lock <% if references_ruby_version_file? %>.ruby-version <% end %>./
+<% if @netpopbug && Rails.env != "test" -%>
+RUN sed -i "/net-pop (0.1.2)/a\      net-protocol" Gemfile.lock
+<% end -%>
 <% if options.cache? -%>
 RUN --mount=type=cache,id=bld-gem-cache,sharing=locked,target=/srv/vendor \
 <% if private_gemserver_env_variable_name -%>

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/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.16
+  version: 1.6.18
 platform: ruby
 authors:
 - Sam Ruby
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2024-06-05 00:00:00.000000000 Z
+date: 2024-09-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -37,7 +37,6 @@ 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
@@ -75,7 +74,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.5.9
+rubygems_version: 3.5.18
 signing_key:
 specification_version: 4
 summary: Dockerfile generator for Rails

data/lib/fly_replay.rb

@@ -1,29 +0,0 @@
-# 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