Ref #369 - Remove apache specific settings from non apache entrypoints

Author: williamdes

docker-entrypoint.sh

@@ -28,12 +28,14 @@ if [ ! -z "${PMA_USER_CONFIG_BASE64}" ]; then
     echo "${PMA_USER_CONFIG_BASE64}" | base64 -d > /etc/phpmyadmin/config.user.inc.php
 fi
 
+# start: Apache specific settings
 if [ -n "${APACHE_PORT+x}" ]; then
     echo "Setting apache port to ${APACHE_PORT}."
     sed -i "s/VirtualHost \*:80/VirtualHost \*:${APACHE_PORT}/" /etc/apache2/sites-enabled/000-default.conf
     sed -i "s/Listen 80/Listen ${APACHE_PORT}/" /etc/apache2/ports.conf
     apachectl configtest
 fi
+# end: Apache specific settings
 
 get_docker_secret() {
     local env_var="${1}"

update.sh

@@ -35,4 +35,7 @@ for variant in apache fpm fpm-alpine; do
 		s/%%VARIANT%%/'"$variant"'/;
 		s/%%CMD%%/'"${cmd[$variant]}"'/;
 	' "$variant/Dockerfile"
+	if [ "$variant" != "apache" ]; then
+		sed -i "/^# start: Apache specific settings$/,/^# end: Apache specific settings$/d" "$variant/docker-entrypoint.sh"
+	fi
 done