dockerfile-rails 1.0.14 → 1.0.16

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 850bc5224e5a60f46df7ddf4c7c31374d891d27fc2145a15cb1eb021f798f63f
-  data.tar.gz: a4254547f34fbd026215ec07c1f4c81a1eef9a15780cbc5b664cb05df5e70ef3
+  metadata.gz: 97f3c4b0a7c797b143ddf74c5478ddf225660a04ca0329fbbe3dd480fa2e2080
+  data.tar.gz: 065ea2146179c5e3942874401a8912f8fa1dcb465b1141e6e60ab6b42b1faa18
 SHA512:
-  metadata.gz: 30e21fea124f3293d384c0fcaae6f1001985a81e5ed229b8b49d321733f61b98c8f46f5cd9586ad35c37198604e90ddbd107ad54e2a09a0d1b96067791c31c48
-  data.tar.gz: 52eed0118d7eb11ffe6833f4e6339d7736174d2035e94eee369d05586e6c0fe44051907481ec065e1e4d88212abc692277838c3ea34865dbbb2e3053e68de505
+  metadata.gz: 4914704950b723956a5cabf755d77295e368a51cb0fee13f2795d09bcecde362a8fb50360d30438b1dbea16d41e8b8309dd977492519b231b01bd7d319629e7c
+  data.tar.gz: e9ea377ef708c94c141ce53f553b5e97db77f55a6f6d4763aea9b538b73cd37c0854f2378c8bc0978157c8b43eacd39e2413eb8f66a3607b1fcc96dcc9d7be4a

data/lib/dockerfile-rails/scanner.rb

@@ -2,21 +2,6 @@ module DockerfileRails
   module Scanner
     def scan_rails_app
 
-      ### database ###
-
-      database = YAML.load_file('config/database.yml', aliases: true).
-        dig('production', 'adapter') rescue nil
-
-      if database == 'sqlite3'
-        @sqlite3 = true
-      elsif database == 'postgresql'
-        @postgresql = true
-      elsif database == 'mysql' or database == 'mysql2'
-        @mysql = true
-      elsif database == 'sqlserver'
-        @sqlserver = true
-      end
-
       ### ruby gems ###
 
       @gemfile = []
@@ -49,6 +34,25 @@ module DockerfileRails
       @puppeteer = @gemfile.include? 'puppeteer'
       @bootsnap = @gemfile.include? 'bootsnap'
 
+      ### database ###
+
+      database = YAML.load_file('config/database.yml', aliases: true).
+        dig('production', 'adapter') rescue nil
+
+      if database == 'sqlite3'
+        @sqlite3 = true
+      elsif database == 'postgresql'
+        @postgresql = true
+      elsif database == 'mysql' or database == 'mysql2'
+        @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'
+
       ### node modules ###
 
       @package_json = []

data/lib/generators/dockerfile_generator.rb

@@ -28,7 +28,7 @@ class DockerfileGenerator < Rails::Generators::Base
 
   # load defaults from config file
   if File.exist? 'config/dockerfile.yml'
-    options = YAML.safe_load_file('config/dockerfile.yml', symbolize_names: true)[:options]
+    options = YAML.safe_load(IO.read('config/dockerfile.yml'), symbolize_names: true)[:options]
 
     if options
       OPTION_DEFAULTS.to_h.each do |option, value|
@@ -276,10 +276,12 @@ private
       # is based on debian release included with the Ruby images on
       # Dockerhub.
       case RUBY_VERSION
-      when /^2.7/
+      when /^2\.7/
         bullseye = RUBY_VERSION >= "2.7.4"
-      when /^3.0/
+      when /^3\.0/
         bullseye = RUBY_VERSION >= "3.0.2"
+      when /^2\./
+        bullseye = false
       else
         bullseye = true
       end
@@ -401,7 +403,7 @@ private
 
     # optionally, adjust cwd
     if options['bin-cd']
-      binfixups.push %{sed -i '/^#!/aDir.chdir File.expand_path("..", __dir__)' /app/bin/*}
+      binfixups.push %{sed -i '/^#!/aDir.chdir File.expand_path("..", __dir__)' /rails/bin/*}
     end
 
     binfixups

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: dockerfile-rails
 version: !ruby/object:Gem::Version
-  version: 1.0.14
+  version: 1.0.16
 platform: ruby
 authors:
 - Sam Ruby
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2023-02-12 00:00:00.000000000 Z
+date: 2023-02-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails