fixed database authentication plugin error

damalis · damalis · commit 9111a161a4e2 · 2024-07-07T12:36:58.000+03:00
diff --git a/README.md b/README.md
@@ -125,15 +125,14 @@ Copy the example environment into `.env`
 cp env.example .env
 ```
 
-Edit the `.env` file to change values of ```LOCAL_TIMEZONE```, ```DOMAIN_NAME```, ```DIRECTORY_PATH```, ```LETSENCRYPT_EMAIL```, ```DB_USER```, ```DB_PASSWORD```, ```DB_NAME```, ```DB_TABLE_PREFIX```, ```MYSQL_ROOT_PASSWORD```, ```DATABASE_IMAGE_NAME```, ```DATABASE_CONT_NAME```, ```DATABASE_PACKAGE_MANAGER```, ```DATABASE_AUTHENTICATION_PLUGIN```, ```DATABASE_ADMIN_COMMANDLINE```, ```PMA_CONTROLUSER```, ```PMA_CONTROLPASS```, ```PMA_HTPASSWD_USERNAME``` and ```PMA_HTPASSWD_PASSWORD```.
+Edit the `.env` file to change values of ```LOCAL_TIMEZONE```, ```DOMAIN_NAME```, ```DIRECTORY_PATH```, ```LETSENCRYPT_EMAIL```, ```DB_USER```, ```DB_PASSWORD```, ```DB_NAME```, ```DB_TABLE_PREFIX```, ```MYSQL_ROOT_PASSWORD```, ```DATABASE_IMAGE_NAME```, ```DATABASE_CONT_NAME```, ```DATABASE_PACKAGE_MANAGER```, ```DATABASE_ADMIN_COMMANDLINE```, ```PMA_CONTROLUSER```, ```PMA_CONTROLPASS```, ```PMA_HTPASSWD_USERNAME``` and ```PMA_HTPASSWD_PASSWORD```.
 
 LOCAL_TIMEZONE=[to see local timezones](https://docs.diladele.com/docker/timezones.html)
 
 DIRECTORY_PATH=```pwd``` at command line\
 DATABASE_IMAGE_NAME=```mariadb``` or ```mysql```\
 DATABASE_CONT_NAME=```mariadb```, ```mysql``` or ```custom name```\
 DATABASE_PACKAGE_MANAGER=```apt-get update && apt-get install -y gettext-base``` for mariadb, ```microdnf install -y gettext``` for mysql\
-DATABASE_AUTHENTICATION_PLUGIN=```mysql_native_password``` for mariadb, ```caching_sha2_password``` for mysql\
 DATABASE_ADMIN_COMMANDLINE=```mariadb-admin``` for mariadb, ```mysqladmin``` for mysql
 
 and
@@ -146,7 +145,7 @@ change example.com to your domain name in ```./phpmyadmin/apache2/sites-availabl
 ```
 cp ./database/phpmyadmin/sql/create_tables.sql.template.example ./database/phpmyadmin/sql/create_tables.sql.template
 ```
-change pma_controluser, db_authentication_plugin and db_authentication_password in ```./database/phpmyadmin/sql/create_tables.sql.template``` file.
+change pma_controluser and db_authentication_password in ```./database/phpmyadmin/sql/create_tables.sql.template``` file.
 
 ### Installation
 
diff --git a/database/phpmyadmin/sql/create_tables.sql.template.example b/database/phpmyadmin/sql/create_tables.sql.template.example
@@ -26,7 +26,7 @@ USE phpmyadmin;
 --
 -- CREATE USER IF NOT EXISTS for phpmyadmin database
 --
-CREATE USER IF NOT EXISTS 'pma_controluser'@'%' IDENTIFIED WITH db_authentication_plugin db_authentication_password;
+CREATE USER IF NOT EXISTS 'pma_controluser'@'%' IDENTIFIED BY 'db_authentication_password';
 
 --
 -- Privileges
diff --git a/docker-compose.yml b/docker-compose.yml
@@ -1,5 +1,3 @@
-version: '3.7'
-
 services:
 
     prestashop:
@@ -37,7 +35,7 @@ services:
         labels:
             - 'docker-volume-backup.stop-during-backup=true'
         command: >
-            bash -c "apt-get update && sh /tmp/packagecheck.sh 'libonig-dev libmcrypt-dev unzip' && curl -sSL https://github.com/mlocati/docker-php-extension-installer/releases/latest/download/install-php-extensions -o - | sh -s gd iconv intl mysqli pdo_mysql soap zip bcmath opcache imagick memcached && if pecl install -p -- mcrypt; then pecl install -o -f mcrypt && rm -rf /tmp/pear && docker-php-ext-enable mcrypt; fi && curl -sS https://getcomposer.org/installer | php && mv composer.phar /usr/local/bin/composer && 
+            bash -c "apt-get update && sh /tmp/packagecheck.sh 'libonig-dev libmcrypt-dev zip unzip' && curl -sSL https://github.com/mlocati/docker-php-extension-installer/releases/latest/download/install-php-extensions -o - | sh -s gd iconv intl mysqli pdo_mysql soap zip bcmath opcache imagick memcached && if pecl install -p -- mcrypt; then pecl install -o -f mcrypt && rm -rf /tmp/pear && docker-php-ext-enable mcrypt; fi && curl -sS https://getcomposer.org/installer | php && mv composer.phar /usr/local/bin/composer && 
             if [ ! -f \"${WEBSERVER_DOC_ROOT}/config/settings.inc.php\" ]; then rm -f ${WEBSERVER_DOC_ROOT}/README.md && composer create-project prestashop/prestashop ${WEBSERVER_DOC_ROOT} && cd ${WEBSERVER_DOC_ROOT} && chown www-data:www-data -R . && runuser -g www-data -u www-data -- php ./install-dev/index_cli.php --domain=${DOMAIN_NAME} --db_server=database --db_name=${DB_NAME} --db_user=${DB_USER} --db_password=${DB_PASSWORD} --email=${LETSENCRYPT_EMAIL} --password=${PMA_HTPASSWD_PASSWORD} --prefix=${DB_TABLE_PREFIX} --firstname=admin --lastname=admin --newsletter=0 --send_email=0 --ssl=1 && 
             mkdir -p /var/www/.npm && chown -R www-data:www-data /var/www/.npm && export NVM_DIR=/usr/local/nvm && mkdir -p $$NVM_DIR && curl -o- https://raw.githubusercontent.com/nvm-sh/nvm/v0.39.7/install.sh | bash && . $$NVM_DIR/nvm.sh && export NODE_VERSION=16.20.1 && nvm install $$NODE_VERSION && nvm alias default $$NODE_VERSION && nvm use default && export NODE_PATH=$$NVM_DIR/versions/node/v$$NODE_VERSION/bin && export PATH=$$PATH:$$NODE_PATH && chmod +x tools/assets/build.sh && runuser -g www-data -u www-data -- /usr/bin/make assets; else composer update --working-dir=${WEBSERVER_DOC_ROOT}; fi; 
             grep -qe 'date.timezone = ${LOCAL_TIMEZONE}' ${PHP_INI_DIR_PREFIX}/php/conf.d/security.ini || echo 'date.timezone = ${LOCAL_TIMEZONE}' >> ${PHP_INI_DIR_PREFIX}/php/conf.d/security.ini; php-fpm"
@@ -178,7 +176,7 @@ services:
             - "docker-volume-backup.stop-during-backup=true"
             - "docker-volume-backup.archive-pre=/bin/sh -c 'mysqldump -uroot -p${MYSQL_ROOT_PASSWORD} --all-databases > /tmp/backup/db_backup_data.sql'"
             - "docker-volume-backup.exec-label=database"
-        command: bash -c "${DATABASE_PACKAGE_MANAGER} && export PMA_CONTROLUSER=${PMA_CONTROLUSER} export PMA_CONTROLPASS=${PMA_CONTROLPASS} && envsubst '$$PMA_CONTROLUSER,$$PMA_CONTROLPASS' < /docker-entrypoint-initdb.d/create_tables.sql.template > /docker-entrypoint-initdb.d/create_tables.sql && docker-entrypoint.sh --character-set-server=utf8mb4 --collation-server=utf8mb4_general_ci --default-authentication-plugin=${DATABASE_AUTHENTICATION_PLUGIN}"
+        command: bash -c "${DATABASE_PACKAGE_MANAGER} && export PMA_CONTROLUSER=${PMA_CONTROLUSER} export PMA_CONTROLPASS=${PMA_CONTROLPASS} && envsubst '$$PMA_CONTROLUSER,$$PMA_CONTROLPASS' < /docker-entrypoint-initdb.d/create_tables.sql.template > /docker-entrypoint-initdb.d/create_tables.sql && docker-entrypoint.sh --character-set-server=utf8mb4 --collation-server=utf8mb4_general_ci"
     
     backup:
         image: offen/docker-volume-backup:latest
diff --git a/env.example b/env.example
@@ -22,7 +22,6 @@ DATABASE_IMAGE_NAME=which_db
 DATABASE_CONT_NAME=which_db
 DATABASE_VERSION=latest
 DATABASE_PACKAGE_MANAGER=db_package_manager
-DATABASE_AUTHENTICATION_PLUGIN=db_authentication_plugin
 DATABASE_ADMIN_COMMANDLINE=db_admin_commandline
 
 PMA_CONTROLUSER=pma_username
diff --git a/install.sh b/install.sh
@@ -231,13 +231,13 @@ echo "======================================================================="
 echo ""
 echo ""
 echo "======================================================================="
-echo "| Installing Docker Compose v2.23.3..."
+echo "| Installing Docker Compose v2.27.2..."
 echo "======================================================================="
 echo ""
 sleep 2
 
 sudo mkdir -p /usr/local/lib/docker/cli-plugins
-sudo curl -SL "https://github.com/docker/compose/releases/download/v2.23.3/docker-compose-$(uname -s)-$(uname -m)" -o /usr/local/lib/docker/cli-plugins/docker-compose
+sudo curl -SL "https://github.com/docker/compose/releases/download/v2.27.2/docker-compose-$(uname -s)-$(uname -m)" -o /usr/local/lib/docker/cli-plugins/docker-compose
 sudo chmod +x /usr/local/lib/docker/cli-plugins/docker-compose
 
 echo ""
@@ -261,6 +261,7 @@ echo ""
 echo "Done ✓"
 echo "======================================================================="
 
+clear
 ##########
 # Setup project variables
 ##########
@@ -373,8 +374,7 @@ done
 echo "Ok."
 
 which_db=""
-db_authentication_plugin="mysql_native_password"
-db_authentication_password="USING PASSWORD('"$pma_password"')"
+db_authentication_password=$pma_password
 db_package_manager="apt-get update \&\& apt-get install -y gettext-base"
 db_admin_commandline="mariadb-admin"
 PS3="Select the database: "
@@ -383,8 +383,6 @@ do
 	which_db=$db
 	if [ $REPLY -eq 2 ]
 	then
-		db_authentication_plugin="caching_sha2_password"
-		db_authentication_password="BY '"$pma_password"'"
 		db_package_manager="microdnf install -y gettext"
 		db_admin_commandline="mysqladmin"
 	fi
@@ -422,9 +420,7 @@ cp ./database/phpmyadmin/sql/create_tables.sql.template.example ./database/phpmy
 
 cp env.example .env
 
-sed -i 's/db_authentication_plugin/'$db_authentication_plugin'/' ./database/phpmyadmin/sql/create_tables.sql.template
 sed -i "s/db_authentication_password/${db_authentication_password}/" ./database/phpmyadmin/sql/create_tables.sql.template
-sed -i 's/db_authentication_plugin/'$db_authentication_plugin'/' .env
 sed -i "s|db_package_manager|${db_package_manager}|" .env
 sed -i 's/db_admin_commandline/'$db_admin_commandline'/' .env
 sed -i 's/example.com/'$domain_name'/' .env
diff --git a/portainer-docker-compose.yml b/portainer-docker-compose.yml
@@ -1,8 +1,6 @@
-version: '3.7'
- 
 services:
     portainer:
-        image: portainer/portainer-ce
+        image: portainer/portainer-ce:latest
         container_name: portainer
         volumes:
             - /var/run/docker.sock:/var/run/docker.sock
@@ -15,7 +13,7 @@ services:
         environment:
             TZ: '${LOCAL_TIMEZONE}'
         command: '--sslcert /etc/letsencrypt/live/${DOMAIN_NAME}/fullchain.pem --sslkey /etc/letsencrypt/live/${DOMAIN_NAME}/privkey.pem'
-    
+
 volumes:
     portainer_data:
         name: portainer_data
