diff --git a/Gemfile.lock b/Gemfile.lock index 979f459f43..eeb4787a45 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -693,4 +693,4 @@ RUBY VERSION ruby 2.4.4p296 BUNDLED WITH - 2.1.4 + 1.17.3 diff --git a/config/skylight.yml b/config/skylight.yml index 4dc9d20a10..0cffe6b029 100644 --- a/config/skylight.yml +++ b/config/skylight.yml @@ -3,3 +3,6 @@ authentication: owy1-Y6WYTcho--YF46Mj8z0OQtYaCxHY-lkPlPZueg ignored_endpoints: - UsersController#profile +staging: # Rails environment + env: <%= ENV['SKYLIGHT_ENV'] || 'production' %> # Skylight environment + diff --git a/containers/docker-compose-production.yml b/containers/docker-compose-production.yml index aa78778893..31e9e85736 100644 --- a/containers/docker-compose-production.yml +++ b/containers/docker-compose-production.yml @@ -23,6 +23,7 @@ services: environment: - RAILS_ENV=${RAILS_ENV} - SECRET_KEY_BASE=${SECRET_KEY_BASE} + - SKYLIGHT_ENV=production - RECAPTCHA_SECRET_KEY=${RECAPTCHA_SECRET_KEY} - RECAPTCHA_SITE_KEY=${RECAPTCHA_SITE_KEY} - SERVER_ADDRESS=${SERVER_ADDRESS} diff --git a/containers/docker-compose-stable.yml b/containers/docker-compose-stable.yml index 4bd1aa2685..7129aaa5fc 100644 --- a/containers/docker-compose-stable.yml +++ b/containers/docker-compose-stable.yml @@ -22,6 +22,7 @@ services: command: /bin/bash -c "sleep 5 && /usr/local/bundle/bin/passenger start -p 4000" environment: - RAILS_ENV=${RAILS_ENV} + - SKYLIGHT_ENV=${SKYLIGHT_ENV} - SECRET_KEY_BASE=${SECRET_KEY_BASE} - RECAPTCHA_SECRET_KEY=${RECAPTCHA_SECRET_KEY} - RECAPTCHA_SITE_KEY=${RECAPTCHA_SITE_KEY} diff --git a/containers/docker-compose-unstable.yml b/containers/docker-compose-unstable.yml index b58a211748..4697991bab 100644 --- a/containers/docker-compose-unstable.yml +++ b/containers/docker-compose-unstable.yml @@ -21,6 +21,7 @@ services: build: .. command: /bin/bash -c "sleep 5 && /usr/local/bundle/bin/passenger start -p 4000" environment: + - SKYLIGHT_ENV=${SKYLIGHT_ENV} - RAILS_ENV=${RAILS_ENV} - SECRET_KEY_BASE=${SECRET_KEY_BASE} - RECAPTCHA_SECRET_KEY=${RECAPTCHA_SECRET_KEY}