Merge pull request #85 from DFE-Digital/xxx-more-redis-config

[xxx] More Redis / Sidekiq config

Dockerfile

@@ -43,7 +43,9 @@ RUN yarn install --frozen-lockfile --check-files
 COPY . .
 
 # Precompile assets
-RUN RAILS_ENV=production SECRET_KEY_BASE=required-to-run-but-not-used \
+RUN RAILS_ENV=production \
+    SECRET_KEY_BASE=required-to-run-but-not-used \
+    REDIS_URL=redis://required-to-run-but-not-used \
     bundle exec rails assets:precompile
 
 # Cleanup to save space in the production image

README.md

@@ -5,7 +5,7 @@ the Children’s Barred List.
 
 ## Setup
 
-### Prerequisites
+### Dependencies
 
 This project depends on:
 
@@ -14,6 +14,7 @@ This project depends on:
 - [NodeJS](https://nodejs.org/)
 - [Yarn](https://yarnpkg.com/)
 - [Postgres](https://www.postgresql.org/)
+- [Redis](https://redis.io/)
 
 Install dependencies using your preferred method, using `asdf` or `rbenv` or
 `nvm`. Example with `asdf`:
@@ -30,7 +31,24 @@ asdf plugin add postgres
 asdf install
 ```
 
-Setup the project:
+#### Redis
+
+You’ll need to install Redis. The way to do this is different on each operating system, but on macOS you can try the following:
+
+```bash
+brew install redis
+brew services start redis
+```
+
+If installing Redis manually, you'll need to start it in a separate terminal:
+
+```bash
+redis-server
+```
+
+### Application
+
+Setup the project (re-run after `Gemfile` or `package.json` updates, automatically restarts any running Rails server):
 
 ```bash
 bin/setup

config/environments/production.rb

@@ -53,7 +53,7 @@
   # config.cache_store = :mem_cache_store
 
   # Use a real queuing backend for Active Job (and separate queues per environment).
-  # config.active_job.queue_adapter     = :resque
+  config.active_job.queue_adapter = :sidekiq
   # config.active_job.queue_name_prefix = "check_the_childrens_barred_list_production"
 
   # Enable locale fallbacks for I18n (makes lookups for any locale fall back to

config/initializers/sidekiq.rb

@@ -1,9 +1,7 @@
 # frozen_string_literal: true
 
-Sidekiq.configure_server do |config|
-  config.redis = { url: ENV.fetch("REDIS_URL", "redis://localhost:6379/1") }
-end
+url = ENV.fetch("REDIS_URL", "redis://localhost:6379/1")
 
-Sidekiq.configure_client do |config|
-  config.redis = { url: ENV.fetch("REDIS_URL", "redis://localhost:6379/1") }
-end
+Sidekiq.configure_server { |config| config.redis = { url: } }
+
+Sidekiq.configure_client { |config| config.redis = { url: } }

terraform/aks/variables.tf

@@ -159,7 +159,8 @@ locals {
   app_secrets = merge(
     local.kv_app_secrets,
     {
-      DATABASE_URL = module.postgres.url
+      DATABASE_URL = module.postgres.url,
+      REDIS_URL    = module.redis.url,
     }
   )
 }