aboutsummaryrefslogtreecommitdiffhomepage
path: root/docker-compose.yml
diff options
context:
space:
mode:
authorJeremy Benoist <j0k3r@users.noreply.github.com>2016-09-19 07:15:40 +0200
committerGitHub <noreply@github.com>2016-09-19 07:15:40 +0200
commitda18a4682f124b02278860d23ac1d59dee995277 (patch)
treeeabbe9da7203eea41e0cb0ec3c26b9b6599cf58f /docker-compose.yml
parent0ed8ce55b5caf2c88e8330afa83abef6c4aac9a4 (diff)
parent59b97fae996d8307b9d957d210d46200f6d206bf (diff)
downloadwallabag-da18a4682f124b02278860d23ac1d59dee995277.tar.gz
wallabag-da18a4682f124b02278860d23ac1d59dee995277.tar.zst
wallabag-da18a4682f124b02278860d23ac1d59dee995277.zip
Merge pull request #1941 from wallabag/v2-asynchronous-jobs
Use asynchronous jobs for imports
Diffstat (limited to 'docker-compose.yml')
-rw-r--r--docker-compose.yml13
1 files changed, 13 insertions, 0 deletions
diff --git a/docker-compose.yml b/docker-compose.yml
index 50d8c546..3c28f2f1 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -11,6 +11,7 @@ services:
11 links: 11 links:
12 - php:php 12 - php:php
13 command: nginx -c /nginx.conf 13 command: nginx -c /nginx.conf
14
14 php: 15 php:
15 build: 16 build:
16 context: docker/php 17 context: docker/php
@@ -30,6 +31,7 @@ services:
30 # If all DBMS are commented out, sqlite will be used as default 31 # If all DBMS are commented out, sqlite will be used as default
31 # - ./docker/postgres/env 32 # - ./docker/postgres/env
32 # - ./docker/mariadb/env 33 # - ./docker/mariadb/env
34
33 #postgres: 35 #postgres:
34 # image: postgres:9 36 # image: postgres:9
35 # ports: 37 # ports:
@@ -38,6 +40,7 @@ services:
38 # - ./docker/data/pgsql:/var/lib/postgresql/data 40 # - ./docker/data/pgsql:/var/lib/postgresql/data
39 # env_file: 41 # env_file:
40 # - ./docker/postgres/env 42 # - ./docker/postgres/env
43
41 #mariadb: 44 #mariadb:
42 # image: mariadb:10 45 # image: mariadb:10
43 # ports: 46 # ports:
@@ -46,3 +49,13 @@ services:
46 # - ./docker/data/mariadb:/var/lib/mysql 49 # - ./docker/data/mariadb:/var/lib/mysql
47 # env_file: 50 # env_file:
48 # - ./docker/mariadb/env 51 # - ./docker/mariadb/env
52
53 rabbitmq:
54 image: rabbitmq:3-management
55 ports:
56 - "15672:15672"
57
58 redis:
59 image: redis
60 ports:
61 - "6379:6379"