Merge pull request #4438 from wallabag/dependabot/composer/scheb/two-factor-bundle...

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

diff --git a/docker-compose.yml b/docker-compose.yml
index 26fba8f0a805a8d01d8c603f6a1c21bc6393c9b2..34eb09560ffe4aac1d9150483b8358c755f442ff 100644 (file)
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -1,9 +1,9 @@
 version: '2'
 services:
     nginx:
-        image: nginx
+        image: nginx:alpine
         ports:
-            - "8080:80"
+            - "8000:80"
         volumes:
             - ./docker/nginx/nginx.conf:/nginx.conf
             - ./docker/logs/nginx:/var/log/nginx
@@ -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: https://php.net/manual/en/timezones.php
                 timezone: 'Europe/Monaco'
         ports:
             - "9000:9000"
@@ -29,15 +31,17 @@ services:
             # If all DBMS are commented out, sqlite will be used as default
             # - ./docker/postgres/env
             # - ./docker/mariadb/env
-    #postgres:
-    #    image: postgres:9
+
+    # postgres:
+    #    image: postgres:11-alpine
     #    ports:
     #        - "5432:5432"
     #    volumes:
     #        - ./docker/data/pgsql:/var/lib/postgresql/data
     #    env_file:
     #        - ./docker/postgres/env
-    #mariadb:
+
+    # mariadb:
     #    image: mariadb:10
     #    ports:
     #        - "3306:3306"
@@ -45,3 +49,13 @@ services:
     #        - ./docker/data/mariadb:/var/lib/mysql
     #    env_file:
     #        - ./docker/mariadb/env
+
+    # rabbitmq:
+    #     image: rabbitmq:3-management-alpine
+    #     ports:
+    #         - "15672:15672"
+
+    redis:
+        image: redis:4-alpine
+        ports:
+            - "6379:6379"