dockerfile-rails 1.6.9 → 1.6.11

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 8273f4e7e16fa5763ebfee285648dfede6ec020e51d51e3e9b8caf5b70333aba
-  data.tar.gz: 16824fb5f76c53dcf5fb0ebca40335591def91034e9cdfea59d12f0b44fb1fed
+  metadata.gz: 38dcdef2aee6ee5c058a39c20f94dd1a786cebd4ae13b73c04ce105af60b1227
+  data.tar.gz: 491eb04d414d7a97268eddb82d5637997cd6bafe84ff8ae04c5c859ffbf62353
 SHA512:
-  metadata.gz: 682c85b4a0a4d5e7157e39bb300b17ec4eff7be7beb98a6431b74d36d7e4f0dfa3d9b3bb81bfe5d31852423fc750595366ca503b9a44ac05a83acb5187afe1c1
-  data.tar.gz: c015796534771823bf606a22165d76899dd21745ac580d6bcc0b8aa780ef0ddf1427818536120616bf91eb3ea686838cf5f42b718b5d36804db6f59b3abc2a58
+  metadata.gz: 9404ac27ff75311447320c4a0092a11dda3bd82fb7db8b369ccbb65efb7f291b445ea3d8867c8247baad9fb2efbe8f7aa9437c1a02529add19bdf416b4f5ff8c
+  data.tar.gz: 0703e28305e99057211826a13ba2d8992d52238fbaeb4b71e10a29ab2f3f130ae7efc91248f663bb1e4215b1b0bc484bcf05a6ad0a1842f93d76b3fce229ca76

data/README.md

@@ -103,7 +103,8 @@ Args and environment variables can be tailored to a specific build phase by addi
 There may be times where feature detection plus flags just aren't enough.  As an example, you may wish to configure and run multiple processes.
 
 * `--instructions=path` - a dockerfile fragment to be inserted into the final document.
-* `--migration=cmd` - a replacement (generally a script) for `db:prepare`/`db:migrate`.
+* `--migrate=cmd` - a replacement (generally a script) for `db:prepare`/`db:migrate`.
+* `--no-gemfile-updates` - do not modify my gemfile.
 * `--procfile=path` - a [Procfile](https://github.com/ddollar/foreman#foreman) to use in place of launching Rails directly.
 
 Like with environment variables, packages, and build args, `--instructions` can be tailored to a specific build phase by adding `-base`, `-build`, or `-deploy` after the flag name, with the default being `-deploy`.

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

@@ -14,6 +14,7 @@ class DockerfileGenerator < Rails::Generators::Base
     "ci" => false,
     "compose" => false,
     "fullstaq" => false,
+    "gemfile-updates" => true,
     "jemalloc" => false,
     "label" => {},
     "link" => true,
@@ -219,6 +220,9 @@ class DockerfileGenerator < Rails::Generators::Base
   class_option "private-gemserver-domain", type: :string, default: OPTION_DEFAULTS["private-gemserver-domain"],
     desc: "domain name of a private gemserver used when installing application gems"
 
+  class_option "gemfile-updates", type: :boolean, default: OPTION_DEFAULTS["gemfile-updates"],
+    desc: "include gemfile updates"
+
 
   class_option "add-base", type: :array, default: [],
     desc: "additional packages to install for both build and deploy"
@@ -364,6 +368,30 @@ class DockerfileGenerator < Rails::Generators::Base
     elsif File.exist? "config/dockerfile.yml"
       remove_file "config/dockerfile.yml"
     end
+
+    # check Dockerfile for common errors: missing packages, mismatched Ruby version
+    if options.skip? && File.exist?("Dockerfile")
+      message = nil
+      shell = Thor::Base.shell.new
+
+      dockerfile = IO.read("Dockerfile")
+      missing = Set.new(base_packages + build_packages) -
+        Set.new(dockerfile.scan(/[-\w]+/))
+
+      unless missing.empty?
+        message = "The following packages are missing from the Dockerfile: #{missing.to_a.join(", ")}"
+        STDERR.puts "\n" + shell.set_color(message, Thor::Shell::Color::RED, Thor::Shell::Color::BOLD)
+      end
+
+      ruby_version = dockerfile.match(/ARG RUBY_VERSION=(\d+\.\d+\.\d+)/)[1]
+
+      if ruby_version && ruby_version != RUBY_VERSION
+        message = "The Ruby version in the Dockerfile (#{ruby_version}) does not match the Ruby version of the Rails app (#{RUBY_VERSION})"
+        STDERR.puts "\n" + shell.set_color(message, Thor::Shell::Color::RED, Thor::Shell::Color::BOLD)
+      end
+
+      exit 42 if message
+    end
   end
 
 private
@@ -486,6 +514,8 @@ private
   end
 
   def install_gems
+    return unless options["gemfile-updates"]
+
     ENV["BUNDLE_IGNORE_MESSAGES"] = "1"
 
     gemfile = IO.read("Gemfile")

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: dockerfile-rails
 version: !ruby/object:Gem::Version
-  version: 1.6.9
+  version: 1.6.11
 platform: ruby
 authors:
 - Sam Ruby
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2024-04-25 00:00:00.000000000 Z
+date: 2024-05-08 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
@@ -74,7 +75,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.5.4
+rubygems_version: 3.5.9
 signing_key:
 specification_version: 4
 summary: Dockerfile generator for Rails