Use just one configuration file

We can generate correct values inside it, no need for magic handling
more of the files.

Signed-off-by: Michal Čihař <michal@cihar.com>
This commit is contained in:
Michal Čihař
2015-12-14 13:36:47 +01:00
parent 85397a6416
commit 7d566641b4
4 changed files with 7 additions and 17 deletions
+1 -1
View File
@@ -7,7 +7,7 @@ RUN curl --location https://www.phpmyadmin.net/downloads/phpMyAdmin-latest-all-l
&& mv phpMyAdmin* /www \
&& rm -rf /www/js/jquery/src/ /www/examples /www/po/
COPY config.inc.linked.php config.inc.arbitrary.php /www/
COPY config.inc.php /www/
COPY run.sh /run.sh
RUN chmod u+rwx /run.sh
-8
View File
@@ -1,8 +0,0 @@
<?php
require('./config.secret.inc.php');
$cfg['AllowArbitraryServer'] = true;
$cfg['UploadDir'] = '';
$cfg['SaveDir'] = '';
+6
View File
@@ -2,6 +2,12 @@
require('./config.secret.inc.php');
/* Arbitrary server connection */
if (isset($_ENV['PMA_ARBITRARY']) && $_ENV['PMA_ARBITRARY'] === '1') {
$cfg['AllowArbitraryServer'] = true;
}
/* First server */
$i = 0;
$i++;
$cfg['Servers'][$i]['auth_type'] = 'cookie';
-8
View File
@@ -1,14 +1,6 @@
#!/bin/sh
set -x
# use arbitrary server
if [ "$PMA_ARBITRARY" ]
then
cp /www/config.inc.arbitrary.php /www/config.inc.php
else
cp /www/config.inc.linked.php /www/config.inc.php
fi
if [ ! -f /www/config.secret.inc.php ] ; then
cat > /www/config.secret.inc.php <<EOT
<?php