aboutsummaryrefslogtreecommitdiffhomepage
path: root/docker-compose.yml
diff options
context:
space:
mode:
authorJeremy Benoist <jeremy.benoist@gmail.com>2019-06-19 14:54:38 +0200
committerJeremy Benoist <jeremy.benoist@gmail.com>2019-06-19 14:54:38 +0200
commit2a61e13fae4e71c804e96caefd3fdb46f09a81db (patch)
treeb424699c636777b1b83f2143ba1c40b8610b2cad /docker-compose.yml
parent3ed30d3415842de43bed332e2228d5b2157472cc (diff)
downloadwallabag-2a61e13fae4e71c804e96caefd3fdb46f09a81db.tar.gz
wallabag-2a61e13fae4e71c804e96caefd3fdb46f09a81db.tar.zst
wallabag-2a61e13fae4e71c804e96caefd3fdb46f09a81db.zip
Improve CONTRIBUTING guide
Also: - update the docker-compose to use Alpine image (lighter) - update the PHP Dockerfile to use Imagick instead of GD (for GIF support when downloading images) and add support for SQLite
Diffstat (limited to 'docker-compose.yml')
-rw-r--r--docker-compose.yml20
1 files changed, 10 insertions, 10 deletions
diff --git a/docker-compose.yml b/docker-compose.yml
index 3c28f2f1..0f8f0970 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -1,9 +1,9 @@
1version: '2' 1version: '2'
2services: 2services:
3 nginx: 3 nginx:
4 image: nginx 4 image: nginx:alpine
5 ports: 5 ports:
6 - "8080:80" 6 - "8000:80"
7 volumes: 7 volumes:
8 - ./docker/nginx/nginx.conf:/nginx.conf 8 - ./docker/nginx/nginx.conf:/nginx.conf
9 - ./docker/logs/nginx:/var/log/nginx 9 - ./docker/logs/nginx:/var/log/nginx
@@ -32,8 +32,8 @@ services:
32 # - ./docker/postgres/env 32 # - ./docker/postgres/env
33 # - ./docker/mariadb/env 33 # - ./docker/mariadb/env
34 34
35 #postgres: 35 # postgres:
36 # image: postgres:9 36 # image: postgres:11-alpine
37 # ports: 37 # ports:
38 # - "5432:5432" 38 # - "5432:5432"
39 # volumes: 39 # volumes:
@@ -41,7 +41,7 @@ services:
41 # env_file: 41 # env_file:
42 # - ./docker/postgres/env 42 # - ./docker/postgres/env
43 43
44 #mariadb: 44 # mariadb:
45 # image: mariadb:10 45 # image: mariadb:10
46 # ports: 46 # ports:
47 # - "3306:3306" 47 # - "3306:3306"
@@ -50,12 +50,12 @@ services:
50 # env_file: 50 # env_file:
51 # - ./docker/mariadb/env 51 # - ./docker/mariadb/env
52 52
53 rabbitmq: 53 # rabbitmq:
54 image: rabbitmq:3-management 54 # image: rabbitmq:3-management-alpine
55 ports: 55 # ports:
56 - "15672:15672" 56 # - "15672:15672"
57 57
58 redis: 58 redis:
59 image: redis 59 image: redis:4-alpine
60 ports: 60 ports:
61 - "6379:6379" 61 - "6379:6379"