Fixing the docker container setup (with assets compilation &co)

This commit is contained in:
Eugen Rochko
2016-03-16 12:57:01 +01:00
parent 2c374cd97c
commit 48d66a2055
6 changed files with 23 additions and 7 deletions

View File

@ -17,7 +17,8 @@ test:
production:
<<: *default
database: postgres
username: postgres
password:
host: db
database: <%= ENV['DB_NAME'] || 'mastodon_production' %>
username: <%= ENV['DB_USER'] || 'mastodon' %>
password: <%= ENV['DB_PASS'] || '' %>
host: <%= ENV['DB_HOST'] || 'localhost' %>
port: <%= ENV['DB_PORT'] || 5432 %>

View File

@ -22,7 +22,7 @@ Rails.application.configure do
# Disable serving static files from the `/public` folder by default since
# Apache or NGINX already handles this.
config.serve_static_files = ENV['RAILS_SERVE_STATIC_FILES'].present?
config.serve_static_files = true
# Compress JavaScripts and CSS.
config.assets.js_compressor = :uglifier
@ -42,7 +42,7 @@ Rails.application.configure do
# config.action_dispatch.x_sendfile_header = 'X-Accel-Redirect' # for NGINX
# Force all access to the app over SSL, use Strict-Transport-Security, and use secure cookies.
# config.force_ssl = true
config.force_ssl = ENV['LOCAL_HTTPS'] == 'true'
# Use the lowest log level to ensure availability of diagnostic information
# when problems arise.