dockerfile-rails 1.6.16 → 1.6.17

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 58f8f53b0d27c7e345bd334b553fee30ae766900f396097e062a6436aeada430
-  data.tar.gz: 71f820e93e2b14351a33a1ab0f612850446676d24060e8f44d53f7e4a38da3ba
+  metadata.gz: e637270c44cb54868cd8947bc9347000e60ae76395d5f2033ca61f67f8266bac
+  data.tar.gz: afe0959d1da483ca595e1b13bf5f7568bf470aa1b6abaf8e3e604b21cebcf793
 SHA512:
-  metadata.gz: 9d959ba0aaf0890a66a914054c624e7575536ea33e441aa672bfd445f683964bab05bbb7f87ee11aaab9b6a285cc955c71164fb48668b5a194670eec97dc8dd3
-  data.tar.gz: 473551cdb95d6c409252ceda5cb721991b36b86c283960ca188c0b05bc7b0d417bec97b95ab5a3c2c285b0800fa1690417e294277e3aa535a95ba8b39f77dfeb
+  metadata.gz: 11c0b726982acebf8d3943aaf2c498e9ecfb4960f943f3ef094881390601c9c6bdfb1d2cb69a45fbf4b0d481284d3cefc76986b3187f7b6d09a53434cd26f373
+  data.tar.gz: 5c971c5b102ec993900e0bb75ccb52e17335499649ae05c23c2d6302f12e8514e200071cdd19015af5f0e28d65e2405f77799bcb7089fdd2ae7de0c38ade0f9d

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]]")
@@ -1394,10 +1403,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

@@ -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 -%>

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: dockerfile-rails
 version: !ruby/object:Gem::Version
-  version: 1.6.16
+  version: 1.6.17
 platform: ruby
 authors:
 - Sam Ruby
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2024-06-05 00:00:00.000000000 Z
+date: 2024-06-24 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.10
 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