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 832c6b7c90c414951b89caeca3b1910286774e84..a0e4a64776ca954710d537c557af52a5044ca9f9 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: