diff options
| author | Florent Peyraud | 2018-02-16 14:23:48 +0100 |
|---|---|---|
| committer | Florent Peyraud | 2018-02-16 14:23:48 +0100 |
| commit | 63d162bbe7018e00dadc57b911d742fe8b2b0149 (patch) | |
| tree | 52927f81b4856b11cf93376cbb5e49a4189b9ffc | |
| parent | 5e9a6e6ddee00393ba29a22ed76fdc067cfedf98 (diff) | |
| download | chouette-core-63d162bbe7018e00dadc57b911d742fe8b2b0149.tar.bz2 | |
default sidekiq redis URL to localhost for devs, and make Docker image defaut envvar value to redis host
| -rw-r--r-- | Dockerfile | 2 | ||||
| -rw-r--r-- | config/initializers/sidekiq.rb | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/Dockerfile b/Dockerfile index 8e370ffb8..e484de431 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,6 +1,6 @@ FROM debian:stable-slim -ENV RAILS_ENV=production RAILS_SERVE_STATIC_FILES=true RAILS_LOG_TO_STDOUT=true +ENV RAILS_ENV=production RAILS_SERVE_STATIC_FILES=true RAILS_LOG_TO_STDOUT=true SIDEKIQ_REDIS_URL=redis://redis:6379/12 RUN apt-get update && \ apt-get install -y --no-install-recommends ruby2.3 && \ diff --git a/config/initializers/sidekiq.rb b/config/initializers/sidekiq.rb index bc60dbe20..724aaecc5 100644 --- a/config/initializers/sidekiq.rb +++ b/config/initializers/sidekiq.rb @@ -7,9 +7,9 @@ Sidekiq.configure_server do |config| pendings.map { |sync| sync.failed({error: 'Failed by Sidekiq reboot', processing_time: 0}) } end end - config.redis = { url: ENV.fetch('SIDEKIQ_REDIS_URL', 'redis://redis:6379/12') } + config.redis = { url: ENV.fetch('SIDEKIQ_REDIS_URL', 'redis://localhost:6379/12') } end Sidekiq.configure_client do |config| - config.redis = { url: ENV.fetch('SIDEKIQ_REDIS_URL', 'redis://redis:6379/12') } + config.redis = { url: ENV.fetch('SIDEKIQ_REDIS_URL', 'redis://localhost:6379/12') } end |