From a715df3431c29d0c647940c114128580e1d719ee Mon Sep 17 00:00:00 2001 From: Daniel Date: Wed, 15 Nov 2017 08:10:14 -0600 Subject: [PATCH] fix the warning of secret_key for devise --- Dockerfile | 3 +++ Gemfile | 2 +- config/initializers/devise.rb | 2 +- 3 files changed, 5 insertions(+), 2 deletions(-) diff --git a/Dockerfile b/Dockerfile index 9d47c6d9b..adfc146f4 100644 --- a/Dockerfile +++ b/Dockerfile @@ -6,6 +6,7 @@ RUN apt-get update -qq && apt-get install -y build-essential libpq-dev postgresq + # Define where our application will live inside the image ENV RAILS_ROOT /var/www/consul @@ -22,6 +23,8 @@ COPY Gemfile Gemfile COPY Gemfile.lock Gemfile.lock +COPY Gemfile_custom Gemfile_custom + # Prevent bundler warnings; ensure that the bundler version executed is >= that which created Gemfile.lock RUN gem install bundler diff --git a/Gemfile b/Gemfile index da8c87841..ed3337438 100644 --- a/Gemfile +++ b/Gemfile @@ -93,4 +93,4 @@ group :development do end #this is crashing with the Dockerfile -#eval_gemfile './Gemfile_custom' +eval_gemfile './Gemfile_custom' diff --git a/config/initializers/devise.rb b/config/initializers/devise.rb index a0b6ac249..6acce5068 100644 --- a/config/initializers/devise.rb +++ b/config/initializers/devise.rb @@ -6,7 +6,7 @@ Devise.setup do |config| # confirmation, reset password and unlock tokens in the database. # Devise will use the `secret_key_base` on Rails 4+ applications as its `secret_key` # by default. You can change it below and use your own secret key. - # config.secret_key = Rails.application.secrets.secret_key_base + config.secret_key = Rails.application.secrets.secret_key_base # ==> Mailer Configuration # Configure the e-mail address which will be shown in Devise::Mailer,