dockerfile-rails 1.6.17 → 1.6.18

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: e637270c44cb54868cd8947bc9347000e60ae76395d5f2033ca61f67f8266bac
-  data.tar.gz: afe0959d1da483ca595e1b13bf5f7568bf470aa1b6abaf8e3e604b21cebcf793
+  metadata.gz: '06001664944f094c87433a52a0dcdb69fe820682478861d502923676e26f3c73'
+  data.tar.gz: 4189db8d30eefd52ddf399368f60ea63d940325f143c506304f257b87301b508
 SHA512:
-  metadata.gz: 11c0b726982acebf8d3943aaf2c498e9ecfb4960f943f3ef094881390601c9c6bdfb1d2cb69a45fbf4b0d481284d3cefc76986b3187f7b6d09a53434cd26f373
-  data.tar.gz: 5c971c5b102ec993900e0bb75ccb52e17335499649ae05c23c2d6302f12e8514e200071cdd19015af5f0e28d65e2405f77799bcb7089fdd2ae7de0c38ade0f9d
+  metadata.gz: 46e8f29cdfdfd8b16feb8392e65c57e4d5a6ea60e2b596273f1c2af43cb4cb88ac969b0a25a2702e35c6c29422e5e557046aa30a1f9c12df3b1b8663d747c159
+  data.tar.gz: 417cd9a7715a2769c9060f9f2438f6486a06362c662a9ea3dc254f2d842b5120e0fea78661eab18f2cc00529b2db5a0a18be5a44055d29e84f7cbca57ceeb009

data/lib/generators/dockerfile_generator.rb

@@ -517,12 +517,16 @@ private
     options.passenger? or options["max-idle"]
   end
 
+  def includes_jobs?
+    !(Dir["app/jobs/*.rb"] - ["app/jobs/application_job.rb"]).empty?
+  end
+
   def using_sidekiq?
-    @gemfile.include?("sidekiq")
+    @gemfile.include?("sidekiq") and includes_jobs?
   end
 
   def using_solidq?
-    @gemfile.include?("solid_queue")
+    @gemfile.include?("solid_queue") and includes_jobs?
   end
 
   def parallel?
@@ -1252,6 +1256,19 @@ private
     more
   end
 
+  def compose_web_volumes
+    volumes = %w[ log storage ]
+
+    if deploy_database == "sqlite3"
+      database = YAML.load_file("config/database.yml", aliases: true).dig("production", "database")
+      if database && database =~ /^\w/
+        volumes << File.dirname(database)
+      end
+    end
+
+    volumes.uniq.sort
+  end
+
   def max_idle
     option = options["max-idle"]
 

data/lib/generators/templates/Dockerfile.erb

@@ -8,9 +8,9 @@ ARG RUBY_VERSION=<%= RUBY_VERSION %>
 
 <% end -%>
 <% if options.fullstaq -%>
-FROM <%= platform %>quay.io/evl.ms/fullstaq-ruby:${RUBY_VERSION}-<%= options.jemalloc ? 'jemalloc-' : 'malloctrim-' %><%= variant %><% unless options.precompile == "defer" %> as base<% end %>
+FROM <%= platform %>quay.io/evl.ms/fullstaq-ruby:${RUBY_VERSION}-<%= options.jemalloc ? 'jemalloc-' : 'malloctrim-' %><%= variant %><% unless options.precompile == "defer" %> AS base<% end %>
 <% else -%>
-FROM <%= platform %><%= options.registry %>ruby:$RUBY_VERSION-<%= variant %><% unless options.precompile == "defer" %> as base<% end %>
+FROM <%= platform %><%= options.registry %>ruby:$RUBY_VERSION-<%= variant %><% unless options.precompile == "defer" %> AS base<% end %>
 <% end -%>
 
 <% unless options.label.empty? -%>
@@ -50,7 +50,7 @@ RUN gem update --system <% if RUBY_VERSION.start_with? '2' %>3.4.22 <% end %>--n
 <% unless options.precompile == "defer" -%>
 
 # Throw-away build stage<%= parallel? ? 's' : '' %> to reduce size of final image
-FROM base as <%= parallel? ? 'pre' : '' %>build
+FROM base AS <%= parallel? ? 'pre' : '' %>build
 
 <% end -%>
 # Install packages needed to build gems<%= using_node? ? " and node modules" : "" %>
@@ -58,7 +58,7 @@ FROM base as <%= parallel? ? 'pre' : '' %>build
 
 <% if parallel? -%>
 
-FROM prebuild as <% if using_bun? %>bun<% else %>node<% end %>
+FROM prebuild AS <% if using_bun? %>bun<% else %>node<% end %>
 
 <% end -%>
 <% if using_bun? and (!using_execjs? || File.exist?('bun.lockb')) -%>
@@ -72,7 +72,7 @@ FROM prebuild as <% if using_bun? %>bun<% else %>node<% end %>
 <%= render partial: 'npm_install', locals: {sources: Dir[*%w(package.json yarn.lock bun.lockb)]} %>
 
 
-FROM prebuild as build
+FROM prebuild AS build
 
 <% end -%>
 <% unless build_args.empty? -%>

data/lib/generators/templates/_node_client.erb

@@ -1,6 +1,6 @@
 ARG NODE_VERSION=<%= node_version %>
 
-FROM <%= platform %>node:$NODE_VERSION-slim as client
+FROM <%= platform %>node:$NODE_VERSION-slim AS client
 
 WORKDIR /rails/<%= api_client_dir %>
 

data/lib/generators/templates/docker-compose.yml.erb

@@ -1,4 +1,5 @@
 version: "3.8"
+
 services:
   web:
 <% if all_args.empty? -%>
@@ -18,11 +19,14 @@ services:
     secrets:
       - gemserver_credentials
 <% end -%>
+<% end -%>
+    volumes:
+<% compose_web_volumes.each do |path| -%>
+      - ./<%= path %>:/rails/<%= path %>
 <% end -%>
     ports:
       - "3000:3000"
     environment:
-      - RAILS_MASTER_KEY=$RAILS_MASTER_KEY
 <% if using_redis? -%>
       - REDIS_URL=redis://redis-db:6379
 <% end -%>
@@ -35,10 +39,9 @@ services:
       - DATABASE_URL=mysql2://root:password@mysql-db/
 <% end -%>
 <% end -%>
-<% if deploy_database == 'sqlite3' -%>
-    volumes:
-      - ./db:/rails/db
-<% end -%>
+    secrets:
+      - source: master_key
+        target: /rails/config/master.key
 <% if using_redis? or deploy_database != 'sqlite3' -%>
     depends_on:
 <% if using_redis? -%>
@@ -60,9 +63,7 @@ services:
       POSTGRES_USER: root
       POSTGRES_PASSWORD: password
     volumes:
-      - ./tmp/db:/var/lib/postgresql/data
-    ports:
-      - "5432:5432"
+      - ./tmp/postgres-db:/var/lib/postgresql/data
     healthcheck:
       test: pg_isready
       interval: 2s
@@ -77,7 +78,7 @@ services:
     environment:
       MYSQL_ROOT_PASSWORD: password
     volumes:
-      - ./tmp/db:/var/lib/mysql
+      - ./tmp/mysql-db:/var/lib/mysql
     healthcheck:
       test: mysqladmin ping -h 127.0.0.1 -u root --password=password
       interval: 2s
@@ -132,3 +133,7 @@ secrets:
   gemserver_credentials:
     file: ./GEMSERVER_CREDENTIALS.secret.txt
 <% end -%>
+
+secrets:
+  master_key:
+    file: ./config/master.key

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: dockerfile-rails
 version: !ruby/object:Gem::Version
-  version: 1.6.17
+  version: 1.6.18
 platform: ruby
 authors:
 - Sam Ruby
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2024-06-24 00:00:00.000000000 Z
+date: 2024-09-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -74,7 +74,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.5.10
+rubygems_version: 3.5.18
 signing_key:
 specification_version: 4
 summary: Dockerfile generator for Rails