summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorstartxfr <clarue@startx.fr>2015-12-07 03:05:46 +0100
committerstartxfr <clarue@startx.fr>2015-12-07 03:05:46 +0100
commit306b73c26b19bb3e032a763a9007f5d444bddadf (patch)
tree7d8ffd3ec93d1ef5527a0e1d2c3fc41bdea3a5af
parent15d8c51d28fa2245886b732df5373eedb2dde0cf (diff)
downloadphpmyadmin-306b73c26b19bb3e032a763a9007f5d444bddadf.tar.gz
phpmyadmin-306b73c26b19bb3e032a763a9007f5d444bddadf.tar.bz2
phpmyadmin-306b73c26b19bb3e032a763a9007f5d444bddadf.tar.xz
phpmyadmin-306b73c26b19bb3e032a763a9007f5d444bddadf.zip
finish phpmyadmin for latest flavour
-rw-r--r--Applications/phpmyadmin/config.inc.php32
-rw-r--r--Applications/phpmyadmin/config.php13
-rw-r--r--Applications/phpmyadmin/docker-compose-demo.yml2
-rw-r--r--Applications/phpmyadmin/docker-compose.yml20
-rw-r--r--docker-compose.yml8
5 files changed, 26 insertions, 49 deletions
diff --git a/Applications/phpmyadmin/config.inc.php b/Applications/phpmyadmin/config.inc.php
index 5c73c2e..6d46fcc 100644
--- a/Applications/phpmyadmin/config.inc.php
+++ b/Applications/phpmyadmin/config.inc.php
@@ -1,4 +1,5 @@
<?php
+
/* vim: set expandtab sw=4 ts=4 sts=4: */
/**
* phpMyAdmin sample configuration, you can use it as base for
@@ -9,12 +10,12 @@
*
* @package PhpMyAdmin
*/
-
/**
* This is needed for cookie based authentication to encrypt password in
* cookie
*/
-$cfg['blowfish_secret'] = ''; /* YOU MUST FILL IN THIS FOR COOKIE AUTH! */
+$cfg['blowfish_secret'] = 'SECRET'; /* YOU MUST FILL IN THIS FOR COOKIE AUTH! */
+$cfg['PmaNoRelation_DisableWarning'] = true;
/**
* Servers configuration
@@ -24,19 +25,25 @@ $i = 0;
/**
* First server
*/
-$i++;
-/* Authentication type */
-$cfg['Servers'][$i]['auth_type'] = 'cookie';
-/* Server parameters */
-$cfg['Servers'][$i]['host'] = 'localhost';
-$cfg['Servers'][$i]['connect_type'] = 'tcp';
-$cfg['Servers'][$i]['compress'] = false;
-$cfg['Servers'][$i]['AllowNoPassword'] = false;
-
+if(getenv('DB_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');
+}
+if(getenv('DB2_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');
+}
/**
* phpMyAdmin configuration storage settings.
*/
-
/* User used to manipulate with storage */
// $cfg['Servers'][$i]['controlhost'] = '';
// $cfg['Servers'][$i]['controlport'] = '';
@@ -70,7 +77,6 @@ $cfg['Servers'][$i]['AllowNoPassword'] = false;
/**
* End of servers configuration
*/
-
/**
* Directories for saving/loading files from server
*/
diff --git a/Applications/phpmyadmin/config.php b/Applications/phpmyadmin/config.php
deleted file mode 100644
index 20e4276..0000000
--- a/Applications/phpmyadmin/config.php
+++ /dev/null
@@ -1,13 +0,0 @@
-<?php
-// fichier qui provient du container startx/app-pma
-$cfg['blowfish_secret'] = 'SECRET';
-$cfg['PmaNoRelation_DisableWarning'] = true;
-$i = 0;
-$i++;
-$cfg['Servers'][$i]['extension'] = 'mysqli';
-$cfg['Servers'][$i]['host'] = 'mariadb';
-$cfg['Servers'][$i]['controlhost'] = '';
-$cfg['Servers'][$i]['controluser'] = 'root';
-$cfg['Servers'][$i]['controlpass'] = 'secretdemerde';
-
-?>
diff --git a/Applications/phpmyadmin/docker-compose-demo.yml b/Applications/phpmyadmin/docker-compose-demo.yml
index c4b9401..8ba0c2c 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_db:db
+ - demo_pma_db:db
environment:
CONTAINER_TYPE: "application"
CONTAINER_SERVICE: "phpmyadmin"
diff --git a/Applications/phpmyadmin/docker-compose.yml b/Applications/phpmyadmin/docker-compose.yml
index 7f2f747..550cd2c 100644
--- a/Applications/phpmyadmin/docker-compose.yml
+++ b/Applications/phpmyadmin/docker-compose.yml
@@ -8,27 +8,11 @@ server:
ports:
- "9215:80"
- "9216:443"
- links:
- - demo_db:db
environment:
CONTAINER_TYPE: "application"
CONTAINER_SERVICE: "phpmyadmin"
CONTAINER_INSTANCE: "application-phpmyadmin"
SERVER_NAME: "localhost"
volumes:
- - "/tmp/container/logs/phpmyadmin:/data/logs/apache_php"
- - "/tmp/container/phpmyadmin:/data/apache_php"
-
-demo_db:
- image: startx/sv-mariadb
- container_name: "service-mariadb"
- expose:
- - "3306"
- environment:
- CONTAINER_TYPE: "service"
- CONTAINER_SERVICE: "mariadb"
- CONTAINER_INSTANCE: "service-mariadb"
- MYSQL_ROOT_PASSWORD: "secretdemerde"
- MYSQL_USER: "user-test"
- MYSQL_PASSWORD: "pwd-test"
- MYSQL_DATABASE: "db_test" \ No newline at end of file
+ - "/tmp/container/logs/phpmyadmin:/data/logs/apache"
+ - "/tmp/container/phpmyadmin:/data/apache" \ No newline at end of file
diff --git a/docker-compose.yml b/docker-compose.yml
index 7062fc9..6114b31 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -43,10 +43,10 @@ fedora_sv_memcache:
file: Services/memcache/docker-compose.yml
service: server
-#fedora_app_pma:
-# build: Applications/phpmyadmin/
-# container_name: "application-phpmyadmin"
-#
+fedora_app_pma:
+ build: Applications/phpmyadmin/
+ container_name: "application-phpmyadmin"
+
#fedora_app_rockmongo:
# build: Applications/rockmongo/
# container_name: "application-rockmongo" \ No newline at end of file