dockerfile-rails 1.4.0 → 1.4.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 5d1b0d5e237b0a8c33a3b1263d34590db8912967420863332ad0b2c8f5661e5f
-  data.tar.gz: 000fd8db20304bc2ba8623aaa1a4bd19870ec4143cacc3cb6ea31b8690510782
+  metadata.gz: 70cab322c4f52cdddb9934de220be781a87ef306af7a21bf1db8a15c8db16a3a
+  data.tar.gz: a8363fcbdd774e3a2b3254f274366c0ad0f700eabdc90502a189c727005de25e
 SHA512:
-  metadata.gz: 64b8702f00462a318af21238617528682be3831da82471bff0172ef9ef98d7e4a6a10346ffe297e87e76cc5d4b2699bf56b79d9257f1eee3c8cc24bc56012037
-  data.tar.gz: 9a9dc774d388e4276b08bbcdcce9ffd676800df7bb86b4cac34e6795fd0ee6f24ba2a57df393f7948f738a9bdafe8a1ed8073c0b91d9e6a2f9f94349a7d14fe4
+  metadata.gz: 10fe62c57fe8f2088bbe0b58feafc4199e2591cf214d39e410d1e78be3f5039187ee28ed9279f774eb02ec991bd46318a014fa324bfc57fe16c9398c51844e10
+  data.tar.gz: 9bcc4bca316a3c4eb96a00060e1f3cbc45072975a28c16248353947da1e9259121fdbf7213e3a382cd407f48a1eb0d1b3baec65a9461242f1269f376a887d291

data/lib/generators/dockerfile_generator.rb

@@ -244,6 +244,17 @@ class DockerfileGenerator < Rails::Generators::Base
       fly_attach_consul
     end
 
+    if fly_processes # therefore File.exist?('fly.toml')
+      if File.stat("fly.toml").size > 0
+        template "fly.toml.erb", "fly.toml"
+      else
+        toml = fly_make_processes(fly_processes)
+        if toml != IO.read("fly.toml")
+          File.write "fly.toml", toml
+        end
+      end
+    end
+
     if @gemfile.include?("vite_ruby")
       package = JSON.load_file("package.json")
       unless package.dig("scripts", "build")
@@ -851,6 +862,21 @@ private
     end
   end
 
+  def fly_processes
+    return unless File.exist? "fly.toml"
+    return unless using_sidekiq?
+
+    if procfile.size > 1
+      list = { "app" => "foreman start --procfile=Procfile.prod" }
+    else
+      list = { "app" => procfile.values.first }
+    end
+
+    list["sidekiq"] = "bundle exec sidekiq"
+
+    list
+  end
+
   def more_docker_ignores
     more = ""
 
@@ -902,11 +928,33 @@ private
     return unless flyctl
 
     # see if secret is already set?
-    secrets = JSON.parse(`#{flyctl} secrets list --json`)
-    return if secrets.any? { |secret| secret["Name"] == "FLY_CONSUL_URL" }
+    begin
+      secrets = JSON.parse(`#{flyctl} secrets list --json`)
+      return if secrets.any? { |secret| secret["Name"] == "FLY_CONSUL_URL" }
+    rescue
+      return # likely got an error like "Could not find App"
+    end
 
     # attach consul
-    say_status "execute", "flyctl consul attach", :green
+    say_status :execute, "flyctl consul attach", :green
     system "#{flyctl} consul attach"
   end
+
+  def fly_make_processes(list)
+    toml = File.read("fly.toml")
+
+    if toml.include? "[processes]"
+      toml.sub!(/\[processes\].*?(\n\n|\n?\z)/m, "[processes]\n" +
+        list.map { |name, cmd| "  #{name} = #{cmd.inspect}" }.join("\n") + '\1')
+    else
+      toml += "\n[processes]\n" +
+        list.map { |name, cmd| "  #{name} = #{cmd.inspect}\n" }.join
+
+      app = list.has_key?("app") ? "app" : list.keys.first
+
+      toml.sub! "[http_service]\n", "\\0  processes = [#{app.inspect}]\n"
+    end
+
+    toml
+  end
 end

data/lib/generators/templates/Dockerfile.erb

@@ -230,17 +230,16 @@ COPY <<-"EOF" /rails/Procfile.prod
 <% end -%>
 EOF
 
+<% end -%>
 # Start the server by default, this can be overwritten at runtime
 EXPOSE 3000
 <% if deploy_database == 'sqlite3' -%>
 VOLUME /data
 <% end -%>
+<% unless fly_processes -%>
+<% if procfile.size > 1 -%>
 CMD ["foreman", "start", "--procfile=Procfile.prod"]
 <% else -%>
-# Start the server by default, this can be overwritten at runtime
-EXPOSE 3000
-<% if deploy_database == 'sqlite3' -%>
-VOLUME /data
-<% end -%>
 CMD <%= procfile.values.first.split(" ").inspect %>
 <% end -%>
+<% end -%>

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

@@ -82,7 +82,7 @@ services:
 
   sidekiq:
     build: .
-    command: bin/sidekiq
+    command: bunde exec sidekiq
     environment:
       - RAILS_MASTER_KEY=$RAILS_MASTER_KEY
       - REDIS_URL=redis://redis-db:6379

data/lib/generators/templates/fly.toml.erb

@@ -0,0 +1 @@
+<%= fly_make_processes(fly_processes) -%>

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: dockerfile-rails
 version: !ruby/object:Gem::Version
-  version: 1.4.0
+  version: 1.4.1
 platform: ruby
 authors:
 - Sam Ruby
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2023-05-24 00:00:00.000000000 Z
+date: 2023-05-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -49,6 +49,7 @@ files:
 - lib/generators/templates/docker-entrypoint.erb
 - lib/generators/templates/dockerfile.yml.erb
 - lib/generators/templates/dockerignore.erb
+- lib/generators/templates/fly.toml.erb
 - lib/generators/templates/litefs.yml.erb
 - lib/generators/templates/node-version.erb
 homepage: https://github.com/fly-apps/dockerfile-rails