dockerfile-rails 1.5.9 → 1.5.10

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: aa278e91ec05725efb320caaecd9ca2cde617166b4ad4157f7103eeccecf4961
-  data.tar.gz: 748f841c1ba25cfa9f126c056a97e6eb9f6e854ea937f0e7c3a93756992746ed
+  metadata.gz: d88f0410567f5185fcffce4a01b85cd5d63d04864e261ded85f260389b1bbf35
+  data.tar.gz: 3f2d42a85d4b78401842aed0c78f277ae5d6c97fe8aa76a370a420d407b8ad5c
 SHA512:
-  metadata.gz: 6af2d5008690de608fb72d114c59a3a4a56ff7348be8d4a3c8f21243e3a5e002bd53341297ccaece8191c9e53312b080af973e382dc62b698bb0f7e4832cb188
-  data.tar.gz: c87bbb4eee23e9a5c2dc63d297308edc16df2baf42ea68640df6edca33537ed2acd195a0b49438b6d857c26a8812ad0c19809b8e129d0645e80f6e604a3d0553
+  metadata.gz: cf0c9e328c292f8e9f4cab6e5529ae0767837b0339cbd673809cd23aa6a884ff3fd7562e1a0d85fbe9711fb9925e60f1c3ecb9bf9f7b4ff9d6ad652dcab1b9d3
+  data.tar.gz: 9c1886019e9b95c8190beb66b82f65338f959b210ecced923aa819ec7843f903a849a8022b1429f92c6f0ab5ec20a0e62ef2e6bd05e1627e1e1cb3d79149afba

data/README.md

@@ -23,6 +23,10 @@ bin/rails generate dockerfile
 ### General option:
 
 * `--force` - overwrite existing files
+* `--skip` - keep existing files
+
+If neither are specified, you will be prompted if a file exists with
+different contents.  If both are specified, `--force` takes precedence.
 
 ### Runtime Optimizations:
 
@@ -61,6 +65,7 @@ additional support may be needed:
 * `--postgresql` - add postgresql libraries
 * `--redis` - add redis libraries
 * `--sqlite3` - add sqlite3 libraries
+* `--sqlserver` - add SQL Server libraries
 
 ### Add a package/environment variable/build argument:
 

data/lib/dockerfile-rails/scanner.rb

@@ -53,6 +53,7 @@ module DockerfileRails
       @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")
 
       ### node modules ###
 

data/lib/generators/dockerfile_generator.rb

@@ -35,6 +35,7 @@ class DockerfileGenerator < Rails::Generators::Base
     "rollbar" => false,
     "root" => false,
     "sqlite3" => false,
+    "sqlserver" => false,
     "sentry" => false,
     "sudo" => false,
     "swap" => nil,
@@ -127,6 +128,9 @@ class DockerfileGenerator < Rails::Generators::Base
   class_option :sqlite3, aliases: "--sqlite", type: :boolean, default: OPTION_DEFAULTS.sqlite3,
     desc: "include sqlite3 libraries"
 
+  class_option :sqlserver, aliases: "--sqlserver", type: :boolean, default: OPTION_DEFAULTS.sqlserver,
+    desc: "include SQL server libraries"
+
   class_option :litefs, type: :boolean, default: OPTION_DEFAULTS.litefs,
     desc: "replicate sqlite3 databases using litefs"
 
@@ -294,7 +298,7 @@ class DockerfileGenerator < Rails::Generators::Base
       fly_attach_consul
     end
 
-    if File.exist?("fly.toml") && (fly_processes || !options.prepare || options.swap)
+    if File.exist?("fly.toml") && (fly_processes || !options.prepare || options.swap || deploy_database == "sqlite3")
       if File.stat("fly.toml").size > 0
         template "fly.toml.erb", "fly.toml"
       else
@@ -560,6 +564,7 @@ private
     # add databases: sqlite3, postgres, mysql
     packages << "pkg-config" if options.sqlite3? || @sqlite3
     packages << "libpq-dev" if options.postgresql? || @postgresql
+    packages << "freetds-dev" if options.sqlserver? || @sqlserver
 
     if (options.mysql? || @mysql) && !using_trilogy?
       packages << "default-libmysqlclient-dev"
@@ -615,6 +620,7 @@ private
     # start with databases: sqlite3, postgres, mysql
     packages << "postgresql-client" if options.postgresql? || @postgresql
     packages << "default-mysql-client" if options.mysql? || @mysql
+    packages << "freetds-bin" if options.sqlserver? || @sqlserver
     packages << "libjemalloc2" if options.jemalloc? && !options.fullstaq?
     if options.sqlite3? || @sqlite3
       packages << "libsqlite3-0" unless packages.include? "sqlite3"
@@ -916,6 +922,8 @@ private
       "postgresql"
     elsif options.mysql? || @mysql || has_mysql_gem?
       "mysql"
+    elsif options.sqlserver || @sqlserver
+      "sqlserver"
     else
       "sqlite3"
     end
@@ -1147,6 +1155,12 @@ private
       end
     end
 
+    if deploy_database == "sqlite3"
+      if not toml.include? "[mounts]"
+        toml += "[mounts]\n  source=\"data\"\n  destination=\"/data\"\n\n"
+      end
+    end
+
     if options.swap
       suffixes = {
         "kib" => 1024,

data/lib/generators/templates/Dockerfile.erb

@@ -34,8 +34,8 @@ ENV <%= base_env.join(" \\\n    ") %>
 RUN gem update --system --no-document && \
     gem install -N <%= base_gems.join(" ") %>
 
-<% unless base_requirements.empty? -%>
-# Install packages needed to install <%= base_requirements %>
+<% unless base_packages.empty? -%>
+# Install packages<% unless base_requirements.empty? -%> needed to install <%= base_requirements %><% end %>
 <%= render partial: 'apt_install', locals: {packages: base_packages, clean: true, repos: base_repos} %>
 
 <% end -%>

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: dockerfile-rails
 version: !ruby/object:Gem::Version
-  version: 1.5.9
+  version: 1.5.10
 platform: ruby
 authors:
 - Sam Ruby
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2023-09-16 00:00:00.000000000 Z
+date: 2023-09-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -16,14 +16,14 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 3.0.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 3.0.0
 description:
 email: rubys@intertwingly.net
 executables: []