add phpmyadmin link

diff --git a/app/deploy/nginx-app.conf b/app/deploy/nginx-app.conf
index ecafdd04546b1d1fb83ffaca1d6243985b1b9b43..3dc4489174a80f3e390d6367b472ea1b3dc4b4de 100644 (file)
--- 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 9e9e8dd5de84355f52acb460480b3bc958a7c4ba..84a3cd068dd82150aa22b646dc3faad3e526455c 100644 (file)
--- 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 9274976d90ba44c62deb46bcf5be69982617abc8..db808781ec542f93af7d4be788b75a8cd1bddb1b 160000 (submodule)
--- a/telemeta/pages
+++ b/telemeta/pages
@@ -1 +1 @@
-Subproject commit 9274976d90ba44c62deb46bcf5be69982617abc8
+Subproject commit db808781ec542f93af7d4be788b75a8cd1bddb1b