From e34ed3a382f238cf55afec6e377b7be9b21f237d Mon Sep 17 00:00:00 2001
From: startxfr <clarue@startx.fr>
Date: Mon, 7 Dec 2015 10:30:43 +0100
Subject: finishing application phpmyadmin and adding docker-compose-images
 demo file with all services used together

---
 Applications/phpmyadmin/config.inc.php          | 12 ++++++------
 Applications/phpmyadmin/docker-compose-demo.yml |  2 +-
 2 files changed, 7 insertions(+), 7 deletions(-)

(limited to 'Applications')

diff --git a/Applications/phpmyadmin/config.inc.php b/Applications/phpmyadmin/config.inc.php
index 6d46fcc..2c2f991 100644
--- a/Applications/phpmyadmin/config.inc.php
+++ b/Applications/phpmyadmin/config.inc.php
@@ -25,21 +25,21 @@ $i = 0;
 /**
  * First server
  */
-if(getenv('DB_ENV_MYSQL_USER') != '') {
+if(getenv('MARIADB_ENV_MYSQL_USER') != '') {
     $i++;
     $cfg['Servers'][$i]['extension'] = 'mysqli';
     $cfg['Servers'][$i]['host'] = 'db';
     $cfg['Servers'][$i]['controlhost'] = '';
-    $cfg['Servers'][$i]['controluser'] = getenv('DB_ENV_MYSQL_USER');
-    $cfg['Servers'][$i]['controlpass'] = getenv('DB_ENV_MYSQL_PASSWORD');
+    $cfg['Servers'][$i]['controluser'] = getenv('MARIADB_ENV_MYSQL_USER');
+    $cfg['Servers'][$i]['controlpass'] = getenv('MARIADB_ENV_MYSQL_PASSWORD');
 }
-if(getenv('DB2_ENV_MYSQL_USER') != '') {
+if(getenv('MARIADB2_ENV_MYSQL_USER') != '') {
     $i++;
     $cfg['Servers'][$i]['extension'] = 'mysqli';
     $cfg['Servers'][$i]['host'] = 'db2';
     $cfg['Servers'][$i]['controlhost'] = '';
-    $cfg['Servers'][$i]['controluser'] = getenv('DB2_ENV_MYSQL_USER');
-    $cfg['Servers'][$i]['controlpass'] = getenv('DB2_ENV_MYSQL_PASSWORD');
+    $cfg['Servers'][$i]['controluser'] = getenv('MARIADB2_ENV_MYSQL_USER');
+    $cfg['Servers'][$i]['controlpass'] = getenv('MARIADB2_ENV_MYSQL_PASSWORD');
 }
 /**
  * phpMyAdmin configuration storage settings.
diff --git a/Applications/phpmyadmin/docker-compose-demo.yml b/Applications/phpmyadmin/docker-compose-demo.yml
index 8ba0c2c..ee816e7 100644
--- a/Applications/phpmyadmin/docker-compose-demo.yml
+++ b/Applications/phpmyadmin/docker-compose-demo.yml
@@ -4,7 +4,7 @@ demo_pma:
   ports:
     - "81:80"
   links:
-    - demo_pma_db:db
+    - demo_pma_db:mariadb
   environment:
     CONTAINER_TYPE: "application"
     CONTAINER_SERVICE: "phpmyadmin"
-- 
cgit v1.2.1