From e925a3eeda1bf4b75233c91df81fa3e150e002b5 Mon Sep 17 00:00:00 2001
From: Rik Veenboer <rik.veenboer@gmail.com>
Date: Sat, 5 Dec 2015 19:57:50 +0000
Subject: [PATCH] Update phpmyadmin container to new source file location

---
 build/scripts/phpmyadmin.sh | 32 +-------------------------------
 1 file changed, 1 insertion(+), 31 deletions(-)

diff --git a/build/scripts/phpmyadmin.sh b/build/scripts/phpmyadmin.sh
index 2d6a79e..8fc48e1 100644
--- a/build/scripts/phpmyadmin.sh
+++ b/build/scripts/phpmyadmin.sh
@@ -1,31 +1 @@
-#!/bin/bash
-set -e
-source /build/config
-set -x
-
-## phpMyAdmin
-export_env PMA_VERSION 4.3.6
-export_env PMA_CONFIG /var/www/config.inc.php
-cd /opt
-wget http://sourceforge.net/projects/phpmyadmin/files/phpMyAdmin/$PMA_VERSION/phpMyAdmin-$PMA_VERSION-all-languages.tar.gz -O phpMyAdmin-$PMA_VERSION.tar.gz
-tar xzf phpMyAdmin-$PMA_VERSION.tar.gz
-mv phpMyAdmin-$PMA_VERSION-* phpMyAdmin-$PMA_VERSION
-rm -r /var/www
-ln -s /opt/phpMyAdmin-$PMA_VERSION /var/www
-
-## Remove installation files
-if [ $MODE == "minimal" ]; then
-    rm phpMyAdmin-$PMA_VERSION.tar.gz
-fi
-
-## Configuration
-cat << EOF > $PMA_CONFIG
-<?php
-\$cfg['blowfish_secret'] = 'random';
-\$cfg['Servers'][1]['auth_type'] = 'cookie';
-\$cfg['Servers'][1]['connect_type'] = 'tcp';
-\$cfg['Servers'][1]['host'] = 'mysql';
-\$cfg['Servers'][1]['compress'] = false;
-\$cfg['Servers'][1]['extension'] = 'mysqli';
-\$cfg['Servers'][1]['AllowNoPassword'] = true;
-EOF
\ No newline at end of file
+#!/bin/bash
set -e
source /build/config
set -x

## phpMyAdmin
#export_env PMA_VERSION 4.3.6
export_env PMA_VERSION 4.5.2
export_env PMA_CONFIG /var/www/config.inc.php
cd /opt
#wget http://sourceforge.net/projects/phpmyadmin/files/phpMyAdmin/$PMA_VERSION/phpMyAdmin-$PMA_VERSION-all-languages.tar.gz -O phpMyAdmin-$PMA_VERSION.tar.gz
wget https://files.phpmyadmin.net/phpMyAdmin/$PMA_VERSION/phpMyAdmin-$PMA_VERSION-all-languages.tar.gz
tar xzf phpMyAdmin-$PMA_VERSION-all-languages.tar.gz
mkdir phpMyAdmin-$PMA_VERSION
mv phpMyAdmin-$PMA_VERSION-* phpMyAdmin-$PMA_VERSION
rm -r /var/www
ln -s /opt/phpMyAdmin-$PMA_VERSION /var/www

## Remove installation files
if [ $MODE == "minimal" ]; then
    rm phpMyAdmin-$PMA_VERSION.tar.gz
fi

## Configuration
cat << EOF > $PMA_CONFIG
<?php
\$cfg['blowfish_secret'] = 'random';
\$cfg['Servers'][1]['auth_type'] = 'cookie';
\$cfg['Servers'][1]['connect_type'] = 'tcp';
\$cfg['Servers'][1]['host'] = 'mysql';
\$cfg['Servers'][1]['compress'] = false;
\$cfg['Servers'][1]['extension'] = 'mysqli';
\$cfg['Servers'][1]['AllowNoPassword'] = true;
EOF
\ No newline at end of file