From 2e5c66ccb4e37ed0bc31fdac9e96669cf8227f6c Mon Sep 17 00:00:00 2001
From: Rik Veenboer <rik.veenboer@gmail.com>
Date: Sat, 5 Dec 2015 22:58:09 +0100
Subject: [PATCH] Fix phpmyadmin installation script

---
 build/Makefile              |  6 +++---
 build/make/base.mk          |  6 +++---
 build/scripts/phpmyadmin.sh | 33 ++++++++++++++++++++++++++++++++-
 build/scripts/utilities.sh  |  2 +-
 4 files changed, 39 insertions(+), 8 deletions(-)

diff --git a/build/Makefile b/build/Makefile
index 924b4c5..4067e6d 100644
--- a/build/Makefile
+++ b/build/Makefile
@@ -2,7 +2,7 @@ RANDOM = $(shell bash -c 'echo $$RANDOM')
 HOME = $(DOCKER_HOME)
 BASE = $(HOME)/build
 FILE = $(BASE)/Dockerfile
-TMP = /opt/tmp
+TMP = /build/tmp
 FROM = ubuntu:trusty
 INTERFACE = eth0
 MODE = normal
@@ -38,14 +38,14 @@ endef
 all: build bin service clean
 
 build: prepare base
+	$(call script,cleanup)
 	@echo 'RUN chmod +x /opt/init.d/*' >> ${FILE}
 	@echo 'CMD ["/opt/init"]' >> ${FILE}
-	@echo ENV MODE $(MODE) >> ${FILE}
-	$(call script,cleanup)
 	@docker build -t $(NAME):$(VERSION) $(ARGS) ${BASE}
 
 prepare:
 	@echo FROM $(FROM) > ${FILE}
+	@echo ENV MODE $(MODE) >> ${FILE}
 	$(call add,config,/build/config)
 	$(call add,init,/opt/init)
 	$(call script,prepare)
diff --git a/build/make/base.mk b/build/make/base.mk
index 19ee7d9..5cf52d2 100644
--- a/build/make/base.mk
+++ b/build/make/base.mk
@@ -1,5 +1,5 @@
-base: syslog sshd hosts
+base: cron syslog sshd hosts
+	$(call script,utilities)
 	$(call script,init)
 	$(call script,runit)
-	$(call script,logrotate)
-	$(call script,utilities)
\ No newline at end of file
+	$(call script,logrotate)
\ No newline at end of file
diff --git a/build/scripts/phpmyadmin.sh b/build/scripts/phpmyadmin.sh
index 8fc48e1..b7a911b 100644
--- a/build/scripts/phpmyadmin.sh
+++ b/build/scripts/phpmyadmin.sh
@@ -1 +1,32 @@
-#!/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
+#!/bin/bash
+set -e
+source /build/config
+set -x
+
+## phpMyAdmin
+export_env PMA_VERSION 4.5.2
+export_env PMA_CONFIG /var/www/config.inc.php
+cd /opt
+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
diff --git a/build/scripts/utilities.sh b/build/scripts/utilities.sh
index d9570a6..6a14cf4 100644
--- a/build/scripts/utilities.sh
+++ b/build/scripts/utilities.sh
@@ -4,7 +4,7 @@ source /build/config
 set -x
 
 ## Often used tools
-apt_get_install_permanent curl python-pip git
+apt_get_install_permanent wget curl python-pip git
 apt_get_install_temporary inetutils-ping telnet
 
 ## Often used python modules