dockerfile-rails 1.5.8 → 1.5.10

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: c5e9c1e8d960ae456906f2936d6153ded39849a02208fa11a05ca4b8bc0d543e
-  data.tar.gz: 950ef36696d78e571d9a762235194009fedbf98f3f1809aa3a6740d7fb8aa507
+  metadata.gz: d88f0410567f5185fcffce4a01b85cd5d63d04864e261ded85f260389b1bbf35
+  data.tar.gz: 3f2d42a85d4b78401842aed0c78f277ae5d6c97fe8aa76a370a420d407b8ad5c
 SHA512:
-  metadata.gz: 66806af153d826188e9e3d7e582f683f66b4cae76b8d0307db0dbc1e9d3d839aa6037ccf578d8a9aa894d2dd18dd42549d23adcacde544e0000a09f58ef3cd22
-  data.tar.gz: 8589fe07b31ca9064c8b6b9d9a839efb78f36f512a00dc3e589bf1a18cbd5605b63e15933d1eb844168501a4283624c160b45f2dea068f06283317fdef731b11
+  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"
@@ -577,7 +582,11 @@ private
     # node support, including support for building native modules
     if using_node?
       packages += %w(node-gyp pkg-config)
-      packages += %w(curl) unless using_execjs? || using_puppeteer?
+
+      unless using_execjs? || using_puppeteer?
+        packages << "curl"
+        packages << "unzip" if using_bun?
+      end
 
       # module build process depends on Python, and debian changed
       # how python is installed with the bullseye release.  Below
@@ -611,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"
@@ -912,6 +922,8 @@ private
       "postgresql"
     elsif options.mysql? || @mysql || has_mysql_gem?
       "mysql"
+    elsif options.sqlserver || @sqlserver
+      "sqlserver"
     else
       "sqlite3"
     end
@@ -961,8 +973,8 @@ private
 
 
   def bun_version
-    version = `bun --version`[/\d+\.\d+\.\d+/]
-    version ||= `npm show bun version`[/\d+\.\d+\.\d+/]
+    version = `bun --version`[/\d+\.\d+\.\d+/] rescue nil
+    version ||= `npm show bun version`[/\d+\.\d+\.\d+/] rescue nil
 
     version
   end
@@ -1143,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 -%>
@@ -58,15 +58,18 @@ FROM base as <%= parallel? ? 'pre' : '' %>build
 
 <% if parallel? -%>
 
-FROM prebuild as node
+FROM prebuild as <% if using_bun? %>bun<% else %>node<% end %>
 
 <% end -%>
-<% if using_node? and (!using_execjs? || File.exist?('yarn.lock')) -%>
+<% if using_bun? and (!using_execjs? || File.exist?('bun.lockb')) -%>
+<%= render partial: 'install_node', locals: {bun_version: using_execjs? ? nil : bun_version} %>
+
+<% elsif using_node? and (!using_execjs? || File.exist?('yarn.lock')) -%>
 <%= render partial: 'install_node', locals: {node_version: using_execjs? ? nil : node_version, yarn_version: File.exist?('yarn.lock') ? yarn_version : nil} %>
 
 <% end -%>
 <% if parallel? -%>
-<%= render partial: 'npm_install', locals: {sources: %w(package.json yarn.lock)} %>
+<%= render partial: 'npm_install', locals: {sources: Dir[*%w(package.json yarn.lock bun.lockb)]} %>
 
 
 FROM prebuild as build
@@ -122,10 +125,17 @@ RUN passenger-config build-native-support
 
 <% end -%>
 <% if parallel? -%>
+<% if using_bun? -%>
+# Copy bun modules
+COPY --from=bun /rails/node_modules /rails/node_modules
+COPY --from=bun /usr/local/bun /usr/local/bun
+ENV PATH=/usr/local/bun/bin:$PATH
+<% else -%>
 # Copy node modules
 COPY --from=node /rails/node_modules /rails/node_modules
 COPY --from=node /usr/local/node /usr/local/node
 ENV PATH=/usr/local/node/bin:$PATH
+<% end -%>
 
 <% elsif using_node? -%>
 <%= render partial: 'npm_install', locals: {sources: Dir[*%w(.npmrc .yarnrc package.json package-lock.json yarn.lock bun.lockb)]} %>

data/lib/generators/templates/_install_node.erb

@@ -1,3 +1,12 @@
+<% if using_bun? -%>
+# Install Bun
+<% if bun_version -%>
+ARG BUN_VERSION=<%= bun_version %>
+<% end -%>
+ENV BUN_INSTALL=/usr/local/bun
+ENV PATH=/usr/local/bun/bin:$PATH
+RUN curl -fsSL https://bun.sh/install | bash<% if bun_version %> -s -- "bun-v${BUN_VERSION}"<% end %>
+<% else -%>
 <% if node_version and yarn_version -%>
 # Install JavaScript dependencies
 <% elsif node_version -%>
@@ -8,23 +17,14 @@
 <% if node_version && node_version != 'lts' -%>
 ARG NODE_VERSION=<%= node_version %>
 <% end -%>
-<% if using_bun? -%>
-<% if bun_version -%>
-ARG BUN_VERSION=<%= bun_version %>
-<% end -%>
-<% else -%>
 <% if yarn_version -%>
 ARG YARN_VERSION=<%= yarn_version %>
 <% end -%>
-<% end -%>
 <% if node_version && node_version != 'lts' -%>
 ENV PATH=/usr/local/node/bin:$PATH
 RUN curl -sL https://github.com/nodenv/node-build/archive/master.tar.gz | tar xz -C /tmp/ && \
     /tmp/node-build-master/bin/node-build "${NODE_VERSION}" /usr/local/node && \
 <% end -%>
-<% if using_bun? -%>
-    npm install -g bun<% if bun_version %>@$BUN_VERSION<% end %> && \
-<% else -%>
 <% if yarn_version -%>
 <% if yarn_version < '2' -%>
 <% if node_version -%>   <% else %>RUN<% end %> npm install -g yarn@$YARN_VERSION<% if node_version -%> && \<% end %>
@@ -37,7 +37,7 @@ RUN curl -sL https://github.com/nodenv/node-build/archive/master.tar.gz | tar xz
     corepack prepare yarn@$YARN_VERSION --activate<% if node_version -%> && \<% end %>
 <% end -%>
 <% end -%>
-<% end -%>
 <% if node_version -%>
     rm -rf /tmp/node-build-master
 <% end -%>
+<% end -%>

data/lib/generators/templates/_npm_install.erb

@@ -3,14 +3,13 @@ COPY<% if options.link? %> --link<% end %> <%= sources.join(' ') %> ./
 <% if sources.join.include?('.yarnrc') && !Dir['.yarn/releases/*'].empty? -%>
 COPY<% if options.link? %> --link<% end %> .yarn/releases/* .yarn/releases/
 <% end -%>
-<% if sources.join.include? 'yarn' -%>
-RUN <% if options.cache? -%>--mount=type=cache,id=bld-yarn-cache,target=/root/.yarn \
-    YARN_CACHE_FOLDER=/root/.yarn <% end -%><% if using_bun? %>bun<% else %>yarn<% end %> install<% if options.lock? %> --frozen-lockfile<% end %>
+<% if using_bun? -%>
+RUN <% if options.cache? %>--mount=type=cache,id=bld-bun-cache,target=/root/.bun \
+    <% end %>bun install<% if options.lock? %> --frozen-lockfile<% end %>
+<% elsif sources.join.include? 'yarn' -%>
+RUN <% if options.cache? %>--mount=type=cache,id=bld-yarn-cache,target=/root/.yarn \
+    YARN_CACHE_FOLDER=/root/.yarn <% end %>yarn install<% if options.lock? %> --frozen-lockfile<% end %>
 <% else -%>
-<% if options.cache? -%>
-RUN --mount=type=cache,id=bld-npm-cache,target=/root/.npm \
-    npm install
-<% else -%>
-RUN npm install
-<% end -%>
+RUN <% if options.cache? %>--mount=type=cache,id=bld-npm-cache,target=/root/.npm \
+    <% end %>npm install
 <% end -%>

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: dockerfile-rails
 version: !ruby/object:Gem::Version
-  version: 1.5.8
+  version: 1.5.10
 platform: ruby
 authors:
 - Sam Ruby
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2023-09-14 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: []