Merge pull request #430 from moneyadviceservice/10053_sidekiq-web-500

[DEV APPROVED] Downgrade `redis` to 3.3.5

.bowerrc

@@ -1,3 +1,4 @@
 {
-  "directory": "vendor/assets/bower_components"
+  "directory": "vendor/assets/bower_components",
+  "registry": "https://registry.bower.io"
 }

Dockerfile

@@ -26,7 +26,7 @@ WORKDIR /tmp
 COPY .ruby-version .ruby-version
 
 #Download RVM as root
-RUN \curl -#LO https://rvm.io/mpapis.asc && gpg --import mpapis.asc && \
+RUN \gpg --keyserver hkp://keys.gnupg.net --recv-keys 409B6B1796C275462A1703113804BB82D39DC0E3 7D2BAF1CF37B13E2069D6956105BD0E739499BDB && \
   \curl -sSL https://get.rvm.io | bash -s stable
 
 #Install RVM requirements

Gemfile

@@ -35,6 +35,12 @@ gem 'pg', '0.21.0'
 gem 'rails_email_validator'
 gem 'rake', '~> 11'
 gem 'ransack'
+# Adding `redis` as a direct dependency to highlight the fact that `sidekiq` in
+# version `3.3.4` has a very loose lock for `redis`, which causes the bug
+# described at: https://github.com/antirez/redis/issues/4272
+# N.B.: it will possibly need to be removed as soon as we bump `sidekiq` to the
+# latest version
+gem 'redis', '~> 3.3.5'
 gem 'rollbar'
 gem 'rubyzip'
 gem 'sass-rails'

Gemfile.lock

@@ -315,7 +315,7 @@ GEM
       activesupport (>= 3.0)
       i18n
       polyamorous (~> 1.3.2)
-    redis (4.0.1)
+    redis (3.3.5)
     redis-namespace (1.6.0)
       redis (>= 3.0.4)
     responders (2.4.0)
@@ -473,6 +473,7 @@ DEPENDENCIES
   rails_email_validator
   rake (~> 11)
   ransack
+  redis (~> 3.3.5)
   rollbar
   rspec-collection_matchers
   rspec-rails
@@ -496,4 +497,4 @@ RUBY VERSION
    ruby 2.2.2p95
 
 BUNDLED WITH
-   1.16.1
+   1.17.1