PMA fix + legacy PMA

lap-wildcard/apache-foreground.sh

@@ -56,6 +56,16 @@ echo "\$cfg['Servers'][1]['user'] = '$WEBDEV_PHPMYADMIN_DB_USER';" >> /opt/phpmy
 echo "\$cfg['Servers'][1]['password'] = '$WEBDEV_PHPMYADMIN_DB_PW';" >> /opt/phpmyadmin/config.inc.php
 echo "##END-webdev-config" >> /opt/phpmyadmin/config.inc.php
 
+# Setup phpmyadmin db config for legacy PMA
+## Remove old webdev config
+sed -i '/##START-webdev-config/,/##END-webdev-config/d' /opt/phpmyadmin_legacy/config.inc.php
+echo "##START-webdev-config" >> /opt/phpmyadmin_legacy/config.inc.php
+echo "# Override default config" >> /opt/phpmyadmin_legacy/config.inc.php
+echo "\$cfg['Servers'][1]['host'] = '$WEBDEV_PHPMYADMIN_DB_HOST';" >> /opt/phpmyadmin_legacy/config.inc.php
+echo "\$cfg['Servers'][1]['user'] = '$WEBDEV_PHPMYADMIN_DB_USER';" >> /opt/phpmyadmin_legacy/config.inc.php
+echo "\$cfg['Servers'][1]['password'] = '$WEBDEV_PHPMYADMIN_DB_PW';" >> /opt/phpmyadmin_legacy/config.inc.php
+echo "##END-webdev-config" >> /opt/phpmyadmin_legacy/config.inc.php
+
 #Setup composer github token, if provided
 if [ "$COMPOSER_GITHUB_TOKEN" != "" ]; then
 	echo "{\"github-oauth\": {\"github.com\": \"$COMPOSER_GITHUB_TOKEN\"}}" >> /root/.config/composer/auth.json
@@ -85,13 +95,22 @@ elif [ "$WEBDEV_ENABLE_PHP_72_FPM" = 1 ]; then
 	sed -i '/#phpmyadminhandlerstart/a SetHandler "proxy:unix:/run/php/php7.2-fpm.sock|fcgi://localhost"' /etc/apache2/conf-enabled/phpmyadmin.conf
 elif [ "$WEBDEV_ENABLE_PHP_71_FPM" = 1 ]; then
 	echo "==============Setting phpMyAdmin socket to 7.1 ..."
-	sed -i '/#phpmyadminhandlerstart/a SetHandler "proxy:unix:/run/php/php7.1-fpm.sock|fcgi://localhost"' /etc/apache2/conf-enabled/phpmyadmin.conf
+	a2disconf phpmyadmin.conf 
+	rm /etc/apache2/conf-enabled/phpmyadmin.conf
+	a2enconf phpmyadmin_legacy.conf
+	sed -i '/#phpmyadminhandlerstart/a SetHandler "proxy:unix:/run/php/php7.1-fpm.sock|fcgi://localhost"' /etc/apache2/conf-enabled/phpmyadmin_legacy.conf
 elif [ "$WEBDEV_ENABLE_PHP_70_FPM" = 1 ]; then
 	echo "==============Setting phpMyAdmin socket to 7.0 ..."
-	sed -i '/#phpmyadminhandlerstart/a SetHandler "proxy:unix:/run/php/php7.0-fpm.sock|fcgi://localhost"' /etc/apache2/conf-enabled/phpmyadmin.conf
+	a2disconf phpmyadmin.conf
+	rm /etc/apache2/conf-enabled/phpmyadmin.conf
+	a2enconf phpmyadmin_legacy.conf
+	sed -i '/#phpmyadminhandlerstart/a SetHandler "proxy:unix:/run/php/php7.0-fpm.sock|fcgi://localhost"' /etc/apache2/conf-enabled/phpmyadmin_legacy.conf
 elif [ "$WEBDEV_ENABLE_PHP_56_FPM" = 1 ]; then
 	echo "==============Setting phpMyAdmin socket to 5.6 ..."
-	sed -i '/#phpmyadminhandlerstart/a SetHandler "proxy:unix:/run/php/php5.6-fpm.sock|fcgi://localhost"' /etc/apache2/conf-enabled/phpmyadmin.conf
+	a2disconf phpmyadmin.conf 
+	rm /etc/apache2/conf-enabled/phpmyadmin.conf
+	a2enconf phpmyadmin_legacy.conf
+	sed -i '/#phpmyadminhandlerstart/a SetHandler "proxy:unix:/run/php/php5.6-fpm.sock|fcgi://localhost"' /etc/apache2/conf-enabled/phpmyadmin_legacy.conf
 fi
 
 if [ "$COMPOSER_DEFAULT_VERSION" = 1 ]; then

lap/Dockerfile

@@ -1,17 +1,17 @@
-FROM ubuntu:20.04
+FROM ubuntu:22.04
 MAINTAINER Jonathon Su <jonathon.su@internetrix.com.au>
 ARG DEBIAN_FRONTEND=noninteractive
 
 ### Change to default mirror to AU mirror - https://wiki.ubuntu.com/AustralianTeam/LocalAptMirrors#Australian_Mirrors
-#RUN cp /etc/apt/sources.list /etc/apt/sources.list.origin && \
-#	sed -i -e 's/http:\/\/archive./http:\/\/au.archive./g' /etc/apt/sources.list && \
-#	sed -i -e 's/http:\/\/releases./http:\/\/au.releases./g' /etc/apt/sources.list
+RUN cp /etc/apt/sources.list /etc/apt/sources.list.origin && \
+	sed -i -e 's/http:\/\/archive./http:\/\/au.archive./g' /etc/apt/sources.list && \
+	sed -i -e 's/http:\/\/releases./http:\/\/au.releases./g' /etc/apt/sources.list
 
 ### SET UP
 RUN apt-get -qq update
 
 # Supporting tools
-RUN apt-get -qqy install sudo wget telnet nano vim curl make git bzip2 zip unzip gettext-base locales cifs-utils software-properties-common dnsutils iputils-ping net-tools mailutils mariadb-client mc
+RUN apt-get -qqy install sqlite sudo wget telnet nano vim curl make git bzip2 zip unzip gettext-base locales cifs-utils software-properties-common dnsutils iputils-ping net-tools mailutils mariadb-client mc
 
 RUN echo "LANG=en_US.UTF-8\n" > /etc/default/locale && \
 	echo "en_US.UTF-8 UTF-8\n" > /etc/locale.gen && \
@@ -83,17 +83,27 @@ RUN echo "webdev is ok" > /var/www/html/index.html
 
 # Setup phpmyadmin
 ADD apache-phpmyadmin.conf /etc/apache2/conf-available/phpmyadmin.conf
+ADD apache-phpmyadmin_legacy.conf /etc/apache2/conf-available/phpmyadmin_legacy.conf
 
-RUN wget https://files.phpmyadmin.net/phpMyAdmin/5.1.0/phpMyAdmin-5.1.0-all-languages.tar.gz && \
-	tar xzf phpMyAdmin-5.1.0-all-languages.tar.gz -C /opt && \
-	rm phpMyAdmin-5.1.0-all-languages.tar.gz && \
-	mv /opt/phpMyAdmin-5.1.0-all-languages /opt/phpmyadmin && \
+RUN wget https://files.phpmyadmin.net/phpMyAdmin/5.2.0/phpMyAdmin-5.2.0-all-languages.tar.gz && \
+	tar xzf phpMyAdmin-5.2.0-all-languages.tar.gz -C /opt && \
+	rm phpMyAdmin-5.2.0-all-languages.tar.gz && \
+	mv /opt/phpMyAdmin-5.2.0-all-languages /opt/phpmyadmin && \
 	a2enconf phpmyadmin.conf
+
+RUN wget https://files.phpmyadmin.net/phpMyAdmin/4.9.10/phpMyAdmin-4.9.10-all-languages.tar.gz && \
+	tar xzf phpMyAdmin-4.9.10-all-languages.tar.gz -C /opt && \
+	rm phpMyAdmin-4.9.10-all-languages.tar.gz && \
+	mv /opt/phpMyAdmin-4.9.10-all-languages /opt/phpmyadmin_legacy
 
 # Add default phpmyadmin config
 ADD phpmyadmin.config.inc.php /opt/phpmyadmin/config.inc.php
 RUN mkdir /opt/phpmyadmin/tmp
 
+# Add default phpmyadmin config
+ADD phpmyadmin.config.inc.php /opt/phpmyadmin_legacy/config.inc.php
+RUN mkdir /opt/phpmyadmin_legacy/tmp
+
 # Composer
 # Composer 2
 RUN wget https://getcomposer.org/composer.phar && \

lap/apache-phpmyadmin_legacy.conf

@@ -0,0 +1,56 @@
+# phpMyAdmin default Apache configuration
+
+Alias /phpmyadmin /opt/phpmyadmin_legacy
+
+<Directory /opt/phpmyadmin_legacy>
+    Options FollowSymLinks ExecCGI
+
+    AllowOverride All
+	Require all granted
+
+    DirectoryIndex index.php
+
+	<FilesMatch "\.php$">
+        # DO NOT DELETE phpmyadminhandlerstart and phpmyadminhandlerend comments
+        #phpmyadminhandlerstart
+		SetHandler "proxy:unix:/run/php/php7.0-fpm.sock|fcgi://localhost"
+        #phpmyadminhandlerend
+	</FilesMatch>
+
+    <IfModule mod_php.c>
+        <IfModule mod_mime.c>
+            AddType application/x-httpd-php .php
+        </IfModule>
+        <FilesMatch ".+\.php$">
+            SetHandler application/x-httpd-php
+        </FilesMatch>
+
+        php_flag magic_quotes_gpc Off
+        php_flag track_vars On
+        php_flag register_globals Off
+        php_admin_flag allow_url_fopen On
+        php_value include_path .
+        php_admin_value upload_tmp_dir /var/lib/phpmyadmin/tmp
+        php_admin_value open_basedir /usr/share/phpmyadmin/:/etc/phpmyadmin/:/var/lib/phpmyadmin/:/usr/share/php/php-gettext/:/usr/share/javascript/:/usr/share/php/tcpdf/:/usr/share/doc/phpmyadmin/:/usr/share/php/phpseclib/
+    </IfModule>
+</Directory>
+
+# Authorize for setup
+<Directory /usr/share/phpmyadmin/setup>
+    <IfModule mod_authz_core.c>
+        <IfModule mod_authn_file.c>
+            AuthType Basic
+            AuthName "phpMyAdmin Setup"
+            AuthUserFile /etc/phpmyadmin/htpasswd.setup
+        </IfModule>
+        Require valid-user
+    </IfModule>
+</Directory>
+
+# Disallow web access to directories that don't need it
+<Directory /usr/share/phpmyadmin/libraries>
+    Require all denied
+</Directory>
+<Directory /usr/share/phpmyadmin/setup/lib>
+    Require all denied
+</Directory>