From: Guillaume Pellerin <guillaume.pellerin@ircam.fr>
Date: Mon, 21 Dec 2015 11:53:15 +0000 (+0100)
Subject: add phpmyadmin link
X-Git-Url: https://git.parisson.com/?a=commitdiff_plain;h=5b8a8e167502de23c36e4fab7115db18b6a1ebab;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 9e9e8dd5..84a3cd06 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:
diff --git a/telemeta/pages b/telemeta/pages
index 9274976d..db808781 160000
--- a/telemeta/pages
+++ b/telemeta/pages
@@ -1 +1 @@
-Subproject commit 9274976d90ba44c62deb46bcf5be69982617abc8
+Subproject commit db808781ec542f93af7d4be788b75a8cd1bddb1b