about summary refs log tree commit diff
path: root/docker-compose.yml
diff options
context:
space:
mode:
authorValentin Ouvrard <valentin210594@gmail.com>2017-04-12 01:04:56 +1100
committerEugen <eugen@zeonfederated.com>2017-04-11 16:04:56 +0200
commitb723ee73fc7d74fd5908eb09a8f6b98e73597c2b (patch)
tree162474ab53edf8cf592858f2423a809f6acc06fd /docker-compose.yml
parentc35bda05511dd9a1397113852ae93b5ed7942635 (diff)
Add (commented) volume in docker-compose && Mitigating the HTTPoxy Vulnerability (#1253)
* enable commented volume in docker-compose.yml

* Disable unworking Nginx root directory && Mitigating the HTTPoxy Vulnerability

* add my instance to the list

* enable GZIP on nginx.conf

* readd root /home/mastodon/live/public;
Diffstat (limited to 'docker-compose.yml')
-rw-r--r--docker-compose.yml11
1 files changed, 11 insertions, 0 deletions
diff --git a/docker-compose.yml b/docker-compose.yml
index d6ba66dde..910bf8cfe 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -1,11 +1,20 @@
 version: '2'
 services:
+
   db:
     restart: always
     image: postgres:alpine
+### Uncomment to enable DB persistance
+#    volumes:
+#      - ./postgres:/var/lib/postgresql/data
+
   redis:
     restart: always
     image: redis:alpine
+### Uncomment to enable REDIS persistance
+#    volumes:
+#      - ./redis:/data
+
   web:
     restart: always
     build: .
@@ -19,6 +28,7 @@ services:
     volumes:
       - ./public/assets:/mastodon/public/assets
       - ./public/system:/mastodon/public/system
+
   streaming:
     restart: always
     build: .
@@ -29,6 +39,7 @@ services:
     depends_on:
       - db
       - redis
+
   sidekiq:
     restart: always
     build: .