From: Guillaume Pellerin <yomguy@parisson.com>
Date: Tue, 21 Aug 2018 12:32:27 +0000 (+0200)
Subject: Merge remote-tracking branch 'origin/master' into demo
X-Git-Url: https://git.parisson.com/?a=commitdiff_plain;h=refs%2Fheads%2Fdemo;p=telemeta.git

Merge remote-tracking branch 'origin/master' into demo
---

498cfb0940096125fafd3a59d09621e3ed501c4a
diff --cc docker-compose.yml
index 85b1fa68,b6e6909c..5d800812
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@@ -79,20 -80,12 +80,11 @@@ worker
  nginx:
    image: nginx
    ports:
 -    - "8000:80"
 +    - "8004:80"
    volumes:
-     - ./etc/nginx.conf:/etc/nginx/conf.d/default.conf
+     - ./etc/nginx/conf.d/default.conf:/etc/nginx/conf.d/default.conf
    volumes_from:
      - data
    links:
      - app
-     - phpmyadmin
  
- phpmyadmin:
-     image: nazarpc/phpmyadmin
-     ports:
-       - "1238:80"
-     links:
-       - db:mysql
-     environment:
-       - ABSOLUTE_URI=http://localhost:8000/phpmyadmin/
 -