1 files changed, 15 insertions, 18 deletions

diff --git a/Applications/phpmyadmin/config.inc.php b/Applications/phpmyadmin/config.inc.php
index b629781..46d5e70 100644
--- a/Applications/phpmyadmin/config.inc.php
+++ b/Applications/phpmyadmin/config.inc.php
@@ -9,9 +9,6 @@
  *
  * @package PhpMyAdmin
  */
-phpinfo (INFO_ENVIRONMENT);
-var_dump($_SERVER);
-exit;
 /**
  * This is needed for cookie based authentication to encrypt password in
  * cookie. Needs to be 32 chars long.
@@ -27,38 +24,38 @@ $i = 0;
 /**
  * First server
  */
-if(getenv('MARIADB_ENV_MYSQL_USER') != '') {
+if(getenv('MARIADB_SERVICE_USER') != '') {
 $i++;
     $cfg['Servers'][$i]['extension'] = 'mysqli';
     $cfg['Servers'][$i]['auth_type'] = 'config';
-    $cfg['Servers'][$i]['host'] = getenv('MARIADB_PORT_3306_TCP_ADDR');
-    $cfg['Servers'][$i]['port'] = getenv('MARIADB_PORT_3306_TCP_PORT');
-    $cfg['Servers'][$i]['user'] = getenv('MARIADB_ENV_MYSQL_USER');
-    $cfg['Servers'][$i]['password'] = getenv('MARIADB_ENV_MYSQL_PASSWORD');
+    $cfg['Servers'][$i]['host'] = getenv('MARIADB_SERVICE_HOST');
+    $cfg['Servers'][$i]['port'] = getenv('MARIADB_SERVICE_PORT');
+    $cfg['Servers'][$i]['user'] = getenv('MARIADB_SERVICE_USER');
+    $cfg['Servers'][$i]['password'] = getenv('MARIADB_SERVICE_PWD');
     $cfg['Servers'][$i]['compress'] = false;
     $cfg['Servers'][$i]['AllowNoPassword'] = false;
 }
 
-if(getenv('MARIADB2_ENV_MYSQL_USER') != '') {
+if(getenv('MARIADB2_SERVICE_USER') != '') {
     $i++;
     $cfg['Servers'][$i]['extension'] = 'mysqli';
     $cfg['Servers'][$i]['auth_type'] = 'config';
-    $cfg['Servers'][$i]['host'] = getenv('MARIADB2_PORT_3306_TCP_ADDR');
-    $cfg['Servers'][$i]['port'] = getenv('MARIADB2_PORT_3306_TCP_PORT');
-    $cfg['Servers'][$i]['user'] = getenv('MARIADB2_ENV_MYSQL_USER');
-    $cfg['Servers'][$i]['password'] = getenv('MARIADB2_ENV_MYSQL_PASSWORD');
+    $cfg['Servers'][$i]['host'] = getenv('MARIADB2_SERVICE_HOST');
+    $cfg['Servers'][$i]['port'] = getenv('MARIADB2_SERVICE_PORT');
+    $cfg['Servers'][$i]['user'] = getenv('MARIADB2_SERVICE_USER');
+    $cfg['Servers'][$i]['password'] = getenv('MARIADB2_SERVICE_PWD');
     $cfg['Servers'][$i]['compress'] = false;
     $cfg['Servers'][$i]['AllowNoPassword'] = false;
 }
 
-if(getenv('DB_ENV_MYSQL_USER') != '') {
+if(getenv('DB_SERVICE_USER') != '') {
     $i++;
     $cfg['Servers'][$i]['extension'] = 'mysqli';
     $cfg['Servers'][$i]['auth_type'] = 'config';
-    $cfg['Servers'][$i]['host'] = getenv('DB_PORT_3306_TCP_ADDR');
-    $cfg['Servers'][$i]['port'] = getenv('DB_PORT_3306_TCP_PORT');
-    $cfg['Servers'][$i]['user'] = getenv('DB_ENV_MYSQL_USER');
-    $cfg['Servers'][$i]['password'] = getenv('DB_ENV_MYSQL_PASSWORD');
+    $cfg['Servers'][$i]['host'] = getenv('DB_SERVICE_HOST');
+    $cfg['Servers'][$i]['port'] = getenv('DB_SERVICE_PORT');
+    $cfg['Servers'][$i]['user'] = getenv('DB_SERVICE_USER');
+    $cfg['Servers'][$i]['password'] = getenv('DB_SERVICE_PWD');
     $cfg['Servers'][$i]['compress'] = false;
     $cfg['Servers'][$i]['AllowNoPassword'] = false;
 }