remove staging environment + force STORAGE_PROVIDER=local in Docker production test

README.md

@@ -67,6 +67,7 @@ In order to configure the application you can use the following ENV variables:
 
 | ENV | Description | Default |
 | --- | --- | --- |
+| `ADMINS` | Space separated list of emails for the superadmins (ie: `admin@timeoverflow.org` | |
 | `ALLOWED_HOSTS` | Put here the list of hosts allowed to access the application. Separate with spaces, for instance: `www.timeoverflow.org timeoverflow.org` | `localhost` |
 | `RAILS_ENV` | Define the rails environment (not necessary to setup unless you have some special requirements) | `production` |
 | `SECRET_KEY_BASE` | Secret key for the application, generate a new one with the command `rails secret` | |
@@ -96,8 +97,6 @@ In order to configure the application you can use the following ENV variables:
 | `AWS_SECRET_ACCESS_KEY` | AWS secret access key (only if `STORAGE_PROVIDER` is `amazon`) | |
 | `AWS_BUCKET` | AWS bucket name (only if `STORAGE_PROVIDER` is `amazon`) | |
 | `AWS_REGION` | AWS region (only if `STORAGE_PROVIDER` is `amazon`) | |
-| `ADMINS` | Space separated list of emails for the superadmins (ie: `admin@timeoverflow.org` | | 
-
 
 ## Contributions
 

config/application.rb

@@ -19,10 +19,6 @@ module Timeoverflow
     # This tells Rails to serve error pages from the app itself, rather than using static error pages in public/
     config.exceptions_app = self.routes
 
-    # Activate the Skylight agent in staging. You need to provision the
-    # SKYLIGHT_AUTHENTICATION env var for this to work.
-    config.skylight.environments += ["staging"]
-
     # ActiveJob configuration
     config.active_job.queue_adapter = :sidekiq
 

config/database.yml

@@ -7,8 +7,6 @@ defaults: &defaults
   port: <%= ENV.fetch("DATABASE_PORT") { "5432" } %>
   template: 'template0'
   encoding: unicode
-  # For details on connection pooling, see rails configuration guide
-  # http://guides.rubyonrails.org/configuring.html#database-pooling
 
 development:
   <<: *defaults
@@ -20,10 +18,6 @@ test:
   host: localhost
   password: <%= ENV['DATABASE_PASSWORD'] || ENV["POSTGRES_PASSWORD"] %>
 
-staging:
-  <<: *defaults
-  database: <%= ENV.fetch('DATABASE_NAME', 'timeoverflow_staging') %>
-
 production:
   <<: *defaults
   <%= "url: #{ENV['DATABASE_URL']}" if ENV['DATABASE_URL'].present? %>

config/environments/staging.rb

@@ -1,2 +0,0 @@
-# Use same settings we use for production
-require_relative "production"

config/secrets.yml

@@ -4,8 +4,5 @@ development:
 test:
   secret_key_base: fde628fa241d74a55d7b0fc8fe1b650091e296d6a4d1e51beba3bfa2ed5c143801c28aaadf318aaefc4423bca781f9715441298052b4f704a8c44f97968feb00
 
-staging:
-  secret_key_base: <%= ENV['SECRET_TOKEN'] %>
-
 production:
   secret_key_base: <%= ENV['SECRET_TOKEN'] %>

docker-compose.yml

@@ -13,6 +13,7 @@ services:
       - RAILS_LOG_LEVEL=debug
       - REDIS_URL=redis://redis:6379/0
       - ADMINS=admin@timeoverflow.org
+      - STORAGE_PROVIDER=local
     ports:
       - 3000:3000
     depends_on:
@@ -30,6 +31,7 @@ services:
       - RAILS_LOG_LEVEL=debug
       - REDIS_URL=redis://redis:6379/0
       - ADMINS=admin@timeoverflow.org
+      - STORAGE_PROVIDER=local
       - RUN_SIDEKIQ=true
     depends_on:
       - db