Use puma in production

ZeusWPI · Nov 9, 2024 · 30fd3a4 · 30fd3a4
1 parent e6fa03e
commit 30fd3a4
Show file tree

Hide file tree

Showing 5 changed files with 2 additions and 35 deletions.
diff --git a/Gemfile b/Gemfile
@@ -12,9 +12,6 @@ gem 'propshaft'
 # Use postgresql as the database for Active Record
 gem 'pg', '~> 1.5'
 
-# Use unicorn in production
-gem 'unicorn', '~> 6.1'
-
 # Bundle and process CSS [https://github.com/rails/cssbundling-rails]
 gem 'cssbundling-rails'
 

diff --git a/Gemfile.lock b/Gemfile.lock
@@ -155,7 +155,6 @@ GEM
       activesupport (>= 5.0.0)
     json (2.7.5)
     jwt (2.7.1)
-    kgio (2.11.4)
     language_server-protocol (3.17.0.3)
     logger (1.6.1)
     loofah (2.23.1)
@@ -248,7 +247,6 @@ GEM
       thor (~> 1.0, >= 1.2.2)
       zeitwerk (~> 2.6)
     rainbow (3.1.1)
-    raindrops (0.20.1)
     rake (13.2.1)
     rdoc (6.7.0)
       psych (>= 4.0.0)
@@ -305,9 +303,6 @@ GEM
     tzinfo (2.0.6)
       concurrent-ruby (~> 1.0)
     unicode-display_width (2.6.0)
-    unicorn (6.1.0)
-      kgio (~> 2.6)
-      raindrops (~> 0.7)
     uri (1.0.1)
     useragent (0.16.10)
     web-console (4.2.1)
@@ -352,7 +347,6 @@ DEPENDENCIES
   sentry-ruby
   solid_queue
   tzinfo-data
-  unicorn (~> 6.1)
   web-console
   webdrivers
 

diff --git a/config/puma.rb b/config/puma.rb
@@ -28,7 +28,7 @@
 
 # Allow puma to be restarted by `bin/rails restart` command.
 plugin :tmp_restart
-plugin :solid_queue
+plugin :solid_queue if ENV['SOLID_QUEUE_IN_PUMA']
 
 # Only use a pidfile when requested
 pidfile ENV['PIDFILE'] if ENV['PIDFILE']
diff --git a/config/unicorn.rb b/config/unicorn.rb
diff --git a/server.dockerfile b/server.dockerfile
@@ -14,4 +14,4 @@ RUN bundle
 
 RUN bundle exec rails assets:precompile
 
-CMD bundle exec rails db:prepare && bundle exec unicorn -c config/unicorn.rb
+CMD bundle exec rails db:prepare && bundle exec rails server
Original file line number	Diff line number	Diff line change
Expand Up		@@ -14,4 +14,4 @@ RUN bundle

		RUN bundle exec rails assets:precompile

		CMD bundle exec rails db:prepare && bundle exec unicorn -c config/unicorn.rb
		CMD bundle exec rails db:prepare && bundle exec rails server