.github/workflows/alpine.yml

@@ -9,7 +9,7 @@ jobs:
     - run: sudo apt install libvips-dev
     - uses: ruby/setup-ruby@v1
       with:
-        ruby-version: '3.3'
+        ruby-version: '3.4'
         bundler-cache: true
     - run: gem install rails
     - run: rake test:alpine

.github/workflows/ci.yml

@@ -9,7 +9,7 @@ jobs:
     - run: sudo apt install libvips-dev
     - uses: ruby/setup-ruby@v1
       with:
-        ruby-version: '3.3'
+        ruby-version: '3.4'
         bundler-cache: true
     - run: gem install rails
     - run: rake test

.github/workflows/rubocop.yml

@@ -14,10 +14,10 @@ jobs:
     steps:
     - uses: actions/checkout@v3
 
-    - name: Set up Ruby 3.3
+    - name: Set up Ruby 3.4
       uses: ruby/setup-ruby@v1
       with:
-        ruby-version: 3.3
+        ruby-version: 3.4
         bundler-cache: true
 
     - name: Run RuboCop

.github/workflows/system-test.yml

@@ -9,7 +9,7 @@ jobs:
     - run: sudo apt install libvips-dev
     - uses: ruby/setup-ruby@v1
       with:
-        ruby-version: '3.3'
+        ruby-version: '3.4'
         bundler-cache: true
     - run: gem install rails
     - run: rake test:system

README.md

@@ -67,6 +67,7 @@ are actually using.  But should you be using DATABASE_URL, for example, at runti
 additional support may be needed:
 
 * `--litefs` - use [LiteFS](https://fly.io/docs/litefs/)
+* `--litestream` - use [Litestream](https://litestream.io/)
 * `--mysql` - add mysql libraries
 * `--postgresql` - add postgresql libraries
 * `--redis` - add redis libraries
@@ -119,6 +120,16 @@ Options are saved between runs into `config/dockerfile.yml`.  To invert a boolea
 
 ## Testing
 
+Run:
+
+Installation:
+
+```
+brew install postgresql mysql zstd
+bundle config --local build.mysql2 "--with-opt-dir="$(brew --prefix zstd)""
+bundle install
+```
+
 A single invocation of `rake test:all` will run all of the tests defined.  dockerfile-rails has are three types of tests:
 
   * `rake test:rubocop` runs [rubocop](https://github.com/rubocop/rubocop) using the same options as the Rails codebase.

dockerfile-rails.gemspec

@@ -2,7 +2,7 @@
 
 Gem::Specification.new do |spec|
   spec.name        = "dockerfile-rails"
-  spec.version     = "1.6.25"
+  spec.version     = "1.7.8"
   spec.authors     = [
     "Sam Ruby",
   ]

lib/dockerfile-rails/scanner.rb

@@ -43,23 +43,30 @@ def scan_rails_app
 
       ### database ###
 
+      # start by checkout config/database.yml.  It defaults to sqlite3,
+      # but we can't rely on that because DATABASE_URL can override it.
+      # if we see anything else, assume the change was intentional.
       database = YAML.load_file("config/database.yml", aliases: true).
         dig("production", "adapter") rescue nil
 
-      if database == "sqlite3"
-        @sqlite3 = true
-      elsif database == "postgresql"
+      if database == "postgresql"
         @postgresql = true
       elsif (database == "mysql") || (database == "mysql2") || (database == "trilogy")
         @mysql = true
       elsif database == "sqlserver"
         @sqlserver = true
-      end
 
-      @sqlite3 = true if @gemfile.include? "sqlite3"
-      @postgresql = true if @gemfile.include? "pg"
-      @mysql = true if @gemfile.include?("mysql2") || using_trilogy?
-      @sqlserver = true if @gemfile.include?("activerecord-sqlserver-adapter")
+      ## if not found (or sqlite3), check the Gemfile
+      elsif @gemfile.include? "pg"
+        @postgresql = true
+      elsif @gemfile.include?("mysql2") || using_trilogy?
+        @mysql = true
+      elsif @gemfile.include?("activerecord-sqlserver-adapter")
+        @sqlserver = true
+      elsif @gemfile.include?("sqlite3") || database == "sqlite3"
+        # check this one last as sqlite3 may be used in development
+        @sqlite3 = true
+      end
 
       ### node modules ###