dockerfile-rails 1.6.11 → 1.6.12

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 38dcdef2aee6ee5c058a39c20f94dd1a786cebd4ae13b73c04ce105af60b1227
-  data.tar.gz: 491eb04d414d7a97268eddb82d5637997cd6bafe84ff8ae04c5c859ffbf62353
+  metadata.gz: 2166500bf8ebbd97df50dec8e206c6233414fb6310a9369693664fa662927acc
+  data.tar.gz: 751a16215549914f56b91330b5c8168916efe276dc290090ea44ca357d6af66c
 SHA512:
-  metadata.gz: 9404ac27ff75311447320c4a0092a11dda3bd82fb7db8b369ccbb65efb7f291b445ea3d8867c8247baad9fb2efbe8f7aa9437c1a02529add19bdf416b4f5ff8c
-  data.tar.gz: 0703e28305e99057211826a13ba2d8992d52238fbaeb4b71e10a29ab2f3f130ae7efc91248f663bb1e4215b1b0bc484bcf05a6ad0a1842f93d76b3fce229ca76
+  metadata.gz: 32fff3700db3dc21809587ea403e7f8c4ba8fd8ba30321b4f5489419f15b853680dd6ad941b02c17aa0d632451e10a390f9d24f36389cc0a1766019f7a4fcc29
+  data.tar.gz: 8cc6ca30994f5837c9d9728f3c1ee1a0f232fdbc439f345e7827c404e613f46c119a2a2e370f908bba8feb747c9d3a0cbcf55f8f6742657fcc68948823504d5d

data/README.md

@@ -97,6 +97,7 @@ Args and environment variables can be tailored to a specific build phase by addi
 * `--root` - run application as root
 * `--windows` - make Dockerfile work for Windows users that may have set `git config --global core.autocrlf true`
 * `--private-gemserver-domain=gems.example.com` - set the domain name of your private gemserver.  This is used to tell bundler for what domain to use the credentials of a private gemserver provided via a docker secret
+* `--no-precompiled-gems` - compile all gems instead of using precompiled versions
 
 ### Advanced Customization:
 
@@ -106,6 +107,7 @@ There may be times where feature detection plus flags just aren't enough.  As an
 * `--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.
+* `--registry=another.docker.registry.com` - use a different registry for sourcing Docker images (e.g. public.ecr.aws).
 
 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/generators/dockerfile_generator.rb

@@ -29,6 +29,7 @@ class DockerfileGenerator < Rails::Generators::Base
     "platform" => nil,
     "postgresql" => false,
     "precompile" => nil,
+    "precompiled-gems" => true,
     "prepare" => true,
     "private-gemserver-domain" => nil,
     "procfile" => "",
@@ -124,6 +125,9 @@ class DockerfileGenerator < Rails::Generators::Base
   class_option :precompile, type: :string, default: OPTION_DEFAULTS.precompile,
     desc: 'if set to "defer", assets:precompile will be done at deploy time'
 
+  class_option "precompiled-gems", type: :boolean, default: OPTION_DEFAULTS["precompiled-gems"],
+    desc: "use precompiled gems"
+
   class_option "bin-cd", type: :boolean, default: OPTION_DEFAULTS["bin-cd"],
     desc: "modify binstubs to set working directory"
 
@@ -223,7 +227,6 @@ class DockerfileGenerator < Rails::Generators::Base
   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"
 

data/lib/generators/templates/Dockerfile.erb

@@ -113,7 +113,7 @@ RUN --mount=type=secret,id=gemserver_credentials,target=/kaniko/gemserver_creden
     bundle install<% if depend_on_bootsnap? && options.precompile != "defer" -%> && \
     bundle exec bootsnap precompile --gemfile<% end %> && \
 <% else -%>
-RUN bundle install<% if depend_on_bootsnap? && options.precompile != "defer" -%> && \
+RUN <% if options["precompiled-gems"] != true %>bundle config set force_ruby_platform true && \<%= "\n    " %><% end %>bundle install<% if depend_on_bootsnap? && options.precompile != "defer" -%> && \
     bundle exec bootsnap precompile --gemfile<% end %> && \
 <% end -%>
     rm -rf ~/.bundle/ "${BUNDLE_PATH}"/ruby/*/cache "${BUNDLE_PATH}"/ruby/*/bundler/gems/*/.git

metadata

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

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