Fix Ruby SSI deployment lockfiles

lib-injection/build/docker/ruby/dd-lib-ruby-init-test-rails-bundle-deploy/Dockerfile

@@ -43,11 +43,13 @@ WORKDIR /app
 COPY lib_injection_rails_app /app
 
 # Install gems
-RUN bundle config set --local deployment 'true'
-RUN bundle install
+RUN set -eu; \
+  ruby_minor="$(ruby -e 'print RUBY_VERSION.split(".").take(2).join(".")')"; \
+  cp "gemfiles/ruby-${ruby_minor}.gemfile.lock" Gemfile.lock; \
+  bundle config set --local deployment 'true'; \
+  bundle install
 
 # Set entrypoint
 ENTRYPOINT ["/bin/bash", "-c"]
 
 CMD ["bundle exec rails server -b 0.0.0.0 -p 18080"]
-

lib-injection/build/docker/ruby/dd-lib-ruby-init-test-rails-conflict/Dockerfile

@@ -42,6 +42,11 @@ WORKDIR /app
 # Add files
 COPY lib_injection_rails_app /app
 
+# Use the lockfile for this Ruby version before introducing a conflict
+RUN set -eu; \
+  ruby_minor="$(ruby -e 'print RUBY_VERSION.split(".").take(2).join(".")')"; \
+  cp "gemfiles/ruby-${ruby_minor}.gemfile.lock" Gemfile.lock
+
 # Introducing a conflict
 RUN echo "gem 'debase-ruby_core_source', '0.10.15'" >> Gemfile
 
@@ -52,4 +57,3 @@ RUN bundle install
 ENTRYPOINT ["/bin/bash", "-c"]
 
 CMD ["bin/rails server -b 0.0.0.0 -p 18080"]
-

lib-injection/build/docker/ruby/dd-lib-ruby-init-test-rails-explicit/Dockerfile

@@ -43,7 +43,11 @@ WORKDIR /app
 COPY lib_injection_rails_app /app
 
 # Replace with other gemfile and configure bundler to use it
-RUN mv Gemfile TestGemfile && mv Gemfile.lock TestGemfile.lock
+RUN set -eu; \
+  ruby_minor="$(ruby -e 'print RUBY_VERSION.split(".").take(2).join(".")')"; \
+  cp "gemfiles/ruby-${ruby_minor}.gemfile.lock" Gemfile.lock; \
+  mv Gemfile TestGemfile; \
+  mv Gemfile.lock TestGemfile.lock
 ENV BUNDLE_GEMFILE TestGemfile
 
 # Install gems
@@ -53,4 +57,3 @@ RUN bundle install
 ENTRYPOINT ["/bin/bash", "-c"]
 
 CMD ["bundle exec rails server -b 0.0.0.0 -p 18080"]
-

lib-injection/build/docker/ruby/dd-lib-ruby-init-test-rails-explicit/Dockerfile.lib_init_validator

@@ -54,7 +54,11 @@ WORKDIR /app
 COPY lib_injection_rails_app /app
 
 # Replace with other gemfile and configure bundler to use it
-RUN mv Gemfile TestGemfile && mv Gemfile.lock TestGemfile.lock
+RUN set -eu; \
+  ruby_minor="$(ruby -e 'print RUBY_VERSION.split(".").take(2).join(".")')"; \
+  cp "gemfiles/ruby-${ruby_minor}.gemfile.lock" Gemfile.lock; \
+  mv Gemfile TestGemfile; \
+  mv Gemfile.lock TestGemfile.lock
 ENV BUNDLE_GEMFILE TestGemfile
 
 # Install gems
@@ -64,4 +68,3 @@ RUN bundle install
 ENTRYPOINT ["/bin/bash", "-c"]
 
 CMD ["bundle exec rails server -b 0.0.0.0 -p 18080"]
-

lib-injection/build/docker/ruby/dd-lib-ruby-init-test-rails-gemsrb/Dockerfile

@@ -43,7 +43,11 @@ WORKDIR /app
 COPY lib_injection_rails_app /app
 
 # Replace Gemfile with gems.rb
-RUN mv Gemfile gems.rb && mv Gemfile.lock gems.locked
+RUN set -eu; \
+  ruby_minor="$(ruby -e 'print RUBY_VERSION.split(".").take(2).join(".")')"; \
+  cp "gemfiles/ruby-${ruby_minor}.gemfile.lock" Gemfile.lock; \
+  mv Gemfile gems.rb; \
+  mv Gemfile.lock gems.locked
 ENV BUNDLE_GEMFILE gems.rb
 
 # Install gems
@@ -53,4 +57,3 @@ RUN bundle install
 ENTRYPOINT ["/bin/bash", "-c"]
 
 CMD ["bundle exec rails server -b 0.0.0.0 -p 18080"]
-

lib-injection/build/docker/ruby/dd-lib-ruby-init-test-rails-gemsrb/Dockerfile.lib_init_validator

@@ -54,7 +54,11 @@ WORKDIR /app
 COPY lib_injection_rails_app /app
 
 # Replace Gemfile with gems.rb
-RUN mv Gemfile gems.rb && mv Gemfile.lock gems.locked
+RUN set -eu; \
+  ruby_minor="$(ruby -e 'print RUBY_VERSION.split(".").take(2).join(".")')"; \
+  cp "gemfiles/ruby-${ruby_minor}.gemfile.lock" Gemfile.lock; \
+  mv Gemfile gems.rb; \
+  mv Gemfile.lock gems.locked
 ENV BUNDLE_GEMFILE gems.rb
 
 # Install gems
@@ -64,4 +68,3 @@ RUN bundle install
 ENTRYPOINT ["/bin/bash", "-c"]
 
 CMD ["bundle exec rails server -b 0.0.0.0 -p 18080"]
-

lib-injection/build/docker/ruby/dd-lib-ruby-init-test-rails/Dockerfile

@@ -43,10 +43,12 @@ WORKDIR /app
 COPY lib_injection_rails_app /app
 
 # Install gems
-RUN bundle install
+RUN set -eu; \
+  ruby_minor="$(ruby -e 'print RUBY_VERSION.split(".").take(2).join(".")')"; \
+  cp "gemfiles/ruby-${ruby_minor}.gemfile.lock" Gemfile.lock; \
+  bundle install
 
 # Set entrypoint
 ENTRYPOINT ["/bin/bash", "-c"]
 
 CMD ["bin/rails server -b 0.0.0.0 -p 18080"]
-

lib-injection/build/docker/ruby/dd-lib-ruby-init-test-rails/Dockerfile.lib_init_validator

@@ -54,10 +54,12 @@ WORKDIR /app
 COPY lib_injection_rails_app /app
 
 # Install gems
-RUN bundle install
+RUN set -eu; \
+  ruby_minor="$(ruby -e 'print RUBY_VERSION.split(".").take(2).join(".")')"; \
+  cp "gemfiles/ruby-${ruby_minor}.gemfile.lock" Gemfile.lock; \
+  bundle install
 
 # Set entrypoint
 ENTRYPOINT ["/bin/bash", "-c"]
 
 CMD ["bin/rails server -b 0.0.0.0 -p 18080"]
-

lib-injection/build/docker/ruby/lib_injection_rails61_app/Gemfile

@@ -1,38 +1,4 @@
-source "https://rubygems.org"
-git_source(:github) { |repo| "https://github.com/#{repo}.git" }
-
-ruby '>= 2.6.0'
-
-# Bundle edge Rails instead: gem "rails", github: "rails/rails", branch: "main"
-gem "rails", "~> 6.1.7"
-
-# The original asset pipeline for Rails [https://github.com/rails/sprockets-rails]
-gem "sprockets-rails"
-
-# Use sqlite3 as the database for Active Record
-gem "sqlite3", "~> 1.4"
-
-# Use the Puma web server [https://github.com/puma/puma]
-gem "puma", "~> 5.0"
-
-# Windows does not include zoneinfo files, so bundle the tzinfo-data gem
-gem "tzinfo-data", platforms: %i[ mingw mswin x64_mingw jruby ]
-
-# Reduces boot times through caching; required in config/boot.rb
-gem "bootsnap", ">= 1.4.4", require: false
-
-group :development, :test do
-  # Call 'byebug' anywhere in the code to stop execution and get a debugger console
-  gem "byebug", platforms: %i[ mri mingw x64_mingw ]
-end
-
-group :development do
-  # Speed up commands on slow machines / big apps [https://github.com/rails/spring]
-  # gem "spring"
-end
-
-# See: https://stackoverflow.com/a/79361034
-gem 'concurrent-ruby', '1.3.4'
-
-# Needed by ActiveSupport::EventedFileUpdateChecker
-gem 'listen'
+# This app is used with SSI runtime matrix Dockerfiles.
+# Each supported Ruby minor has its own Gemfile and lockfile under gemfiles/.
+ruby_minor = RUBY_VERSION.split(".").take(2).join(".")
+eval_gemfile File.expand_path("gemfiles/ruby-#{ruby_minor}.gemfile", __dir__)

lib-injection/build/docker/ruby/lib_injection_rails61_app/gemfiles/common.gemfile

@@ -0,0 +1,36 @@
+source "https://rubygems.org"
+git_source(:github) { |repo| "https://github.com/#{repo}.git" }
+
+# Bundle edge Rails instead: gem "rails", github: "rails/rails", branch: "main"
+gem "rails", "~> 6.1.7"
+
+# The original asset pipeline for Rails [https://github.com/rails/sprockets-rails]
+gem "sprockets-rails"
+
+# Use sqlite3 as the database for Active Record
+gem "sqlite3", "~> 1.4"
+
+# Use the Puma web server [https://github.com/puma/puma]
+gem "puma", "~> 5.0"
+
+# Windows does not include zoneinfo files, so bundle the tzinfo-data gem
+gem "tzinfo-data", platforms: %i[mingw mswin x64_mingw jruby]
+
+# Reduces boot times through caching; required in config/boot.rb
+gem "bootsnap", ">= 1.4.4", require: false
+
+group :development, :test do
+  # Call 'byebug' anywhere in the code to stop execution and get a debugger console
+  gem "byebug", platforms: %i[mri mingw x64_mingw]
+end
+
+group :development do
+  # Speed up commands on slow machines / big apps [https://github.com/rails/spring]
+  # gem "spring"
+end
+
+# See: https://stackoverflow.com/a/79361034
+gem "concurrent-ruby", "1.3.4"
+
+# Needed by ActiveSupport::EventedFileUpdateChecker
+gem "listen"

lib-injection/build/docker/ruby/lib_injection_rails61_app/gemfiles/ruby-2.6.gemfile

@@ -0,0 +1 @@
+eval_gemfile File.expand_path("common.gemfile", __dir__)

lib-injection/build/docker/ruby/lib_injection_rails61_app/Gemfile.lock → lib-injection/build/docker/ruby/lib_injection_rails61_app/gemfiles/ruby-2.6.gemfile.lock

@@ -61,30 +61,25 @@ GEM
       tzinfo (~> 2.0)
       zeitwerk (~> 2.3)
     base64 (0.3.0)
-    bootsnap (1.19.0)
+    bootsnap (1.22.0)
       msgpack (~> 1.2)
     builder (3.3.0)
     byebug (11.1.3)
     concurrent-ruby (1.3.4)
     crass (1.0.6)
-    date (3.5.0)
-    date (3.5.0-java)
+    date (3.5.1)
     erubi (1.13.1)
-    ffi (1.17.2)
-    ffi (1.17.2-aarch64-linux-gnu)
-    ffi (1.17.2-arm64-darwin)
-    ffi (1.17.2-java)
-    ffi (1.17.2-x86_64-darwin)
-    ffi (1.17.2-x86_64-linux-gnu)
+    ffi (1.17.4)
     globalid (1.2.1)
       activesupport (>= 6.1)
-    i18n (1.14.7)
+    i18n (1.14.8)
       concurrent-ruby (~> 1.0)
-    listen (3.9.0)
+    listen (3.10.0)
+      logger
       rb-fsevent (~> 0.10, >= 0.10.3)
       rb-inotify (~> 0.9, >= 0.9.10)
     logger (1.7.0)
-    loofah (2.24.1)
+    loofah (2.25.1)
       crass (~> 1.0.2)
       nokogiri (>= 1.12.0)
     mail (2.9.0)
@@ -93,14 +88,13 @@ GEM
       net-imap
       net-pop
       net-smtp
-    marcel (1.1.0)
+    marcel (1.2.1)
     method_source (1.1.0)
     mini_mime (1.1.5)
     mini_portile2 (2.8.9)
     minitest (5.25.4)
-    msgpack (1.8.0)
-    msgpack (1.8.0-java)
-    net-imap (0.3.9)
+    msgpack (1.8.3)
+    net-imap (0.3.10)
       date
       net-protocol
     net-pop (0.1.2)
@@ -110,27 +104,14 @@ GEM
     net-smtp (0.5.1)
       net-protocol
     nio4r (2.7.5)
-    nio4r (2.7.5-java)
-    nokogiri (1.13.10)
-      mini_portile2 (~> 2.8.0)
-      racc (~> 1.4)
     nokogiri (1.13.10-aarch64-linux)
       racc (~> 1.4)
-    nokogiri (1.13.10-arm64-darwin)
-      racc (~> 1.4)
-    nokogiri (1.13.10-java)
-      racc (~> 1.4)
-    nokogiri (1.13.10-x86_64-darwin)
-      racc (~> 1.4)
     nokogiri (1.13.10-x86_64-linux)
       racc (~> 1.4)
     puma (5.6.9)
       nio4r (~> 2.0)
-    puma (5.6.9-java)
-      nio4r (~> 2.0)
     racc (1.8.1)
-    racc (1.8.1-java)
-    rack (2.2.21)
+    rack (2.2.23)
     rack-test (2.2.0)
       rack (>= 1.3)
     rails (6.1.7.10)
@@ -160,7 +141,7 @@ GEM
       method_source
       rake (>= 12.2)
       thor (~> 1.0)
-    rake (13.3.1)
+    rake (13.4.2)
     rb-fsevent (0.11.2)
     rb-inotify (0.11.1)
       ffi (~> 1.0)
@@ -174,27 +155,18 @@ GEM
       sprockets (>= 3.0.0)
     sqlite3 (1.6.9)
       mini_portile2 (~> 2.8.0)
-    thor (1.4.0)
-    timeout (0.4.4)
+    thor (1.5.0)
+    timeout (0.6.1)
     tzinfo (2.0.6)
       concurrent-ruby (~> 1.0)
-    tzinfo-data (1.2025.2)
-      tzinfo (>= 1.0.0)
-    websocket-driver (0.8.0)
-      base64
-      websocket-extensions (>= 0.1.0)
-    websocket-driver (0.8.0-java)
+    websocket-driver (0.8.1)
       base64
       websocket-extensions (>= 0.1.0)
     websocket-extensions (0.1.5)
     zeitwerk (2.6.18)
 
 PLATFORMS
   aarch64-linux
-  arm64-darwin
-  java
-  ruby
-  x86_64-darwin
   x86_64-linux
 
 DEPENDENCIES
@@ -208,8 +180,5 @@ DEPENDENCIES
   sqlite3 (~> 1.4)
   tzinfo-data
 
-RUBY VERSION
-   ruby 2.6.10p210
-
 BUNDLED WITH
    2.4.22

lib-injection/build/docker/ruby/lib_injection_rails_app/Gemfile

@@ -1,32 +1,4 @@
-source "https://rubygems.org"
-git_source(:github) { |repo| "https://github.com/#{repo}.git" }
-
-# Bundle edge Rails instead: gem "rails", github: "rails/rails", branch: "main"
-gem "rails", "~> 7.0.3"
-
-# The original asset pipeline for Rails [https://github.com/rails/sprockets-rails]
-gem "sprockets-rails"
-
-# Use sqlite3 as the database for Active Record
-gem "sqlite3", "~> 1.4"
-
-# Use the Puma web server [https://github.com/puma/puma]
-gem "puma", "~> 5.0"
-
-gem 'mutex_m', '~> 0.2.0'
-gem 'base64', '~> 0.1.0'
-gem 'bigdecimal', '~> 1.2', '>= 1.2.7'
-
-# Windows does not include zoneinfo files, so bundle the tzinfo-data gem
-gem "tzinfo-data", platforms: %i[ mingw mswin x64_mingw jruby ]
-
-group :development, :test do
-  # See https://guides.rubyonrails.org/debugging_rails_applications.html#debugging-with-the-debug-gem
-  gem "debug", platforms: %i[ mri mingw x64_mingw ]
-end
-
-group :development do
-  # Speed up commands on slow machines / big apps [https://github.com/rails/spring]
-  # gem "spring"
-end
-
+# This app is used with multiple Ruby versions in SSI tests.
+# Each supported Ruby minor has its own Gemfile and lockfile under gemfiles/.
+ruby_minor = RUBY_VERSION.split(".").take(2).join(".")
+eval_gemfile File.expand_path("gemfiles/ruby-#{ruby_minor}.gemfile", __dir__)