dockerfile-rails 1.4.0 → 1.4.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 5d1b0d5e237b0a8c33a3b1263d34590db8912967420863332ad0b2c8f5661e5f
-  data.tar.gz: 000fd8db20304bc2ba8623aaa1a4bd19870ec4143cacc3cb6ea31b8690510782
+  metadata.gz: b9cd11ebc9f7480d2cd29942b3dbb771ddd98377291a93aa27c70317bab0114e
+  data.tar.gz: 95611b26453984a5e51d2606321c3fdef93cf41b42a23b39f515a1e21ff97e5f
 SHA512:
-  metadata.gz: 64b8702f00462a318af21238617528682be3831da82471bff0172ef9ef98d7e4a6a10346ffe297e87e76cc5d4b2699bf56b79d9257f1eee3c8cc24bc56012037
-  data.tar.gz: 9a9dc774d388e4276b08bbcdcce9ffd676800df7bb86b4cac34e6795fd0ee6f24ba2a57df393f7948f738a9bdafe8a1ed8073c0b91d9e6a2f9f94349a7d14fe4
+  metadata.gz: 76d6de186f304dc03e775de367c0b9b17e53b8eaf2b74738fa4cc8f6323fb84e3cc235a357f8c4d0bc2c3957b8e07411e96523d6052c12a58ab8aa89963f781f
+  data.tar.gz: addd1bd0774d6ec14f92811d8ba0ff5616c089c73e72a7d06a9e5fdd2b0a68dfca490fff760d973fd7ff3c6c80e4dd755deed439165a4f43d91cbb336ec3f420

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")
@@ -501,7 +512,7 @@ private
   end
 
   def deploy_packages
-    packages = []
+    packages = %w(curl) # work with the default healthcheck strategy in MRSK
     packages += @@packages["deploy"] if @@packages["deploy"]
 
     # start with databases: sqlite3, postgres, mysql
@@ -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

@@ -10,7 +10,7 @@ ARG RUBY_VERSION=<%= RUBY_VERSION %>
 <% if options.fullstaq -%>
 FROM <%= platform %>quay.io/evl.ms/fullstaq-ruby:${RUBY_VERSION}-<%= options.jemalloc ? 'jemalloc-' : '' %>slim<% unless options.precompile == "defer" %> as base<% end %>
 <% else -%>
-FROM <%= platform %>ruby:$RUBY_VERSION-slim<% unless options.precompile == "defer" %> as base<% end %>
+FROM <%= platform %>registry.docker.com/library/ruby:$RUBY_VERSION-slim<% unless options.precompile == "defer" %> as base<% end %>
 <% end -%>
 
 <% unless options.label.empty? -%>
@@ -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: bundle 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.2
 platform: ruby
 authors:
 - Sam Ruby
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2023-05-24 00:00:00.000000000 Z
+date: 2023-06-08 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