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

diff --git a/.env.production.sample b/.env.production.sample
index 3460328819fded58b3d073ce957078374cdfd456..070aa0c3a4f40ece672a0a1ba9e01f0c9ea22f46 100644 (file)
--- a/.env.production.sample
+++ b/.env.production.sample
@@ -1,5 +1,11 @@
 # Service dependencies
 REDIS_HOST=redis
+REDIS_PORT=6379
+DB_HOST=db
+DB_USER=postgres
+DB_NAME=postgres
+DB_PASS=
+DB_PORT=5432
 
 # Federation
 LOCAL_DOMAIN=example.com

diff --git a/Dockerfile b/Dockerfile
index 7b8fdc16042c576aab59dfb32740f4ec8aa93a56..bb4c70d87cae645bcb96f3e530ebb96596248a52 100644 (file)
--- a/Dockerfile
+++ b/Dockerfile
@@ -14,4 +14,4 @@ RUN bundle install --deployment --without test --without development
 
 ADD . /mastodon
 
-VOLUME ['/mastodon/public/system']
+VOLUME ["/mastodon/public/system", "/mastodon/public/assets"]

diff --git a/README.md b/README.md
index f02e5cddd759933f8a5a00c9a655b3d82a0c2bac..a1f7b2e27b3fbb0fd0b2f2bfba8553bf8ffe6963 100644 (file)
--- a/README.md
+++ b/README.md
@@ -48,3 +48,9 @@ And finally
 As usual, the first thing you would need to do would be to run migrations:
 
     docker-compose run web rake db:migrate
+
+And since the instance running in the container will be running in production mode, you need to pre-compile assets:
+
+    docker-compose run web rake assets:precompile
+
+The container has two volumes, for the assets and for user uploads. The default docker-compose.yml maps them to the repository's `public/assets` and `public/system` directories, you may wish to put them somewhere else. Likewise, the PostgreSQL and Redis images have data containers that you may wish to map somewhere where you know how to find them and back them up.

diff --git a/config/database.yml b/config/database.yml
index 8914ab16d9f3c982c2c7843212655e66f73b51f8..259244e6f462b92ccf421965f4621074d37a3b68 100644 (file)
--- a/config/database.yml
+++ b/config/database.yml
@@ -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 %>

diff --git a/config/environments/production.rb b/config/environments/production.rb
index b0236d09e375335fd882baf58ceac792b44e2f4c..1f08fad5af6c506530335bc2a3df5b89f7c65b87 100644 (file)
--- a/config/environments/production.rb
+++ b/config/environments/production.rb
@@ -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.

diff --git a/docker-compose.yml b/docker-compose.yml
index 20fb500b87b409db318d394f2fe956fec2085b07..ed29808b05e88d9b130d0982781dfc9a5a5d7791 100644 (file)
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -12,4 +12,7 @@ services:
     depends_on:
       - db
       - redis
+    volumes:
+      - ./public/assets:/mastodon/public/assets
+      - ./public/system:/mastodon/public/system
     env_file: .env.production