From: Guillaume Pellerin <guillaume.pellerin@ircam.fr>
Date: Mon, 21 Dec 2015 11:53:15 +0000 (+0100)
Subject: add phpmyadmin link
X-Git-Tag: 1.6b~7^2~33
X-Git-Url: https://git.parisson.com/?a=commitdiff_plain;h=916356466070d435bd2bf4cc8e2bc422c841a372;p=telemeta.git

add phpmyadmin link
---

diff --git a/app/deploy/nginx-app.conf b/app/deploy/nginx-app.conf
index ecafdd04..3dc44891 100644
--- a/app/deploy/nginx-app.conf
+++ b/app/deploy/nginx-app.conf
@@ -22,7 +22,7 @@ server {
 
        # phpmyadmin
        location /phpmyadmin {
-               proxy_pass http://localhost:10000/;
+               proxy_pass http://phpmyadmin:80/;
        }
 
        location / {
diff --git a/docker-compose.yml b/docker-compose.yml
index 832c6b7c..a0e4a647 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -86,11 +86,10 @@ nginx:
     - media
   links:
     - app
+    - phpmyadmin
 
 phpmyadmin:
     image: nazarpc/phpmyadmin
-    ports:
-      - 10000:80
     links:
       - db
     environment: