From 4f0e9b1208895f0d95a92062aff42f4f10898839 Mon Sep 17 00:00:00 2001 From: Alex Kriuchykhin Date: Thu, 20 Feb 2025 14:36:32 +0100 Subject: [PATCH] Remove Heroku specific whacamole and rails_12factor gems [SCI-11588] (#8259) --- Gemfile | 2 -- Gemfile.lock | 8 -------- Procfile | 1 - config/whacamole.rb | 14 -------------- 4 files changed, 25 deletions(-) delete mode 100644 config/whacamole.rb diff --git a/Gemfile b/Gemfile index 8a6691fdb..ba3779298 100644 --- a/Gemfile +++ b/Gemfile @@ -136,8 +136,6 @@ end group :production do gem 'puma' - gem 'rails_12factor' - gem 'whacamole' end # Windows does not include zoneinfo files, so bundle the tzinfo-data gem diff --git a/Gemfile.lock b/Gemfile.lock index ff77b8b06..d581f8524 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -586,15 +586,10 @@ GEM rails-html-sanitizer (1.6.1) loofah (~> 2.21) nokogiri (>= 1.15.7, != 1.16.7, != 1.16.6, != 1.16.5, != 1.16.4, != 1.16.3, != 1.16.2, != 1.16.1, != 1.16.0.rc1, != 1.16.0) - rails_12factor (0.0.3) - rails_serve_static_assets - rails_stdout_logging rails_autolink (1.1.8) actionview (> 3.1) activesupport (> 3.1) railties (> 3.1) - rails_serve_static_assets (0.0.5) - rails_stdout_logging (0.0.5) railties (7.0.8.7) actionpack (= 7.0.8.7) activesupport (= 7.0.8.7) @@ -760,7 +755,6 @@ GEM websocket-driver (0.7.6) websocket-extensions (>= 0.1.0) websocket-extensions (0.1.5) - whacamole (1.2.0) wicked_pdf (2.7.0) activesupport xpath (3.2.0) @@ -853,7 +847,6 @@ DEPENDENCIES rack-cors rails (~> 7.0.8) rails-controller-testing - rails_12factor rails_autolink (~> 1.1, >= 1.1.6) recaptcha rgl @@ -883,7 +876,6 @@ DEPENDENCIES underscore-rails view_component webmock - whacamole wicked_pdf zip-zip diff --git a/Procfile b/Procfile index b38f6a636..f787d4ed7 100644 --- a/Procfile +++ b/Procfile @@ -1,3 +1,2 @@ web: bundle exec puma -C config/puma.rb worker: bundle exec rake jobs:work -whacamole: bundle exec whacamole -c ./config/whacamole.rb diff --git a/config/whacamole.rb b/config/whacamole.rb deleted file mode 100644 index 09daddca1..000000000 --- a/config/whacamole.rb +++ /dev/null @@ -1,14 +0,0 @@ -# https://github.com/arches/whacamole -# -# Steps to setup this on your heroku instance, this will affect only the worker -# -# 1) set the env variables (api token: > heroku auth:token) -# 2) > heroku labs:enable log-runtime-metrics --app YOUR_APP_NAME -# 3) > heroku ps:scale whacamole=1 --app YOUR_APP_NAME - -Whacamole.configure(ENV['HEROKU_APP_NAME']) do |config| - config.api_token = ENV['HEROKU_API_TOKEN'] - config.dynos = %w{worker} - config.restart_threshold = ENV['WHACAMOLE_DYNO_RESTART_THRESHOLD'].to_i - config.restart_window = ENV['WHACAMOLE_DYNO_RESTART_TIME_IN_SEC'].to_i -end