Jump to 2.3.6-dev and update release process

[github/wallabag/wallabag.git] / docker-compose.yml

diff --git a/docker-compose.yml b/docker-compose.yml
index 26fba8f0a805a8d01d8c603f6a1c21bc6393c9b2..3c28f2f1a5df50e2d9e7c52c7a07de62e18bc7da 100644 (file)
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -11,10 +11,12 @@ services:
         links:
             - php:php
         command: nginx -c /nginx.conf
+
     php:
         build:
             context: docker/php
             args:
+                # Set here your timezone using one of this: http://php.net/manual/en/timezones.php
                 timezone: 'Europe/Monaco'
         ports:
             - "9000:9000"
@@ -29,6 +31,7 @@ services:
             # If all DBMS are commented out, sqlite will be used as default
             # - ./docker/postgres/env
             # - ./docker/mariadb/env
+
     #postgres:
     #    image: postgres:9
     #    ports:
@@ -37,6 +40,7 @@ services:
     #        - ./docker/data/pgsql:/var/lib/postgresql/data
     #    env_file:
     #        - ./docker/postgres/env
+
     #mariadb:
     #    image: mariadb:10
     #    ports:
@@ -45,3 +49,13 @@ services:
     #        - ./docker/data/mariadb:/var/lib/mysql
     #    env_file:
     #        - ./docker/mariadb/env
+
+    rabbitmq:
+        image: rabbitmq:3-management
+        ports:
+            - "15672:15672"
+
+    redis:
+        image: redis
+        ports:
+            - "6379:6379"