fix: Changen MariaDB root pwd var name

images/nextcloud/docker-entrypoint.sh

@@ -22,7 +22,7 @@ if [ ! -z $LDAP_BIND_PWD_FILE -a -f $LDAP_BIND_PWD_FILE ]; then
 fi
 # set DB root password from secret
 if [ ! -z $MARIADB_ROOT_PWD_FILE -a -f $MARIADB_ROOT_PWD_FILE ]; then
-    MARIADB_ROOT_PWD=`cat $MARIADB_ROOT_PWD_FILE`;
+    MARIADB_ROOT_PASSWORD=`cat $MARIADB_ROOT_PWD_FILE`;
 fi
 # set password salt from secret
 if [ ! -z $NEXTCLOUD_SALT_FILE -a -f $NEXTCLOUD_SALT_FILE ]; then
@@ -70,33 +70,33 @@ function check_result {
 sleep 60 # to avoid hitting it while the first start for setting root pwd
 R=111
 while [ $R -eq 111 ]; do
-    mysql -u root -p${MARIADB_ROOT_PWD} -h ${DB_HOST} -e "SHOW DATABASES"  2> /dev/null;
+    mysql -u root -p${MARIADB_ROOT_PASSWORD} -h ${DB_HOST} -e "SHOW DATABASES"  2> /dev/null;
     R=$?;
 done
 
 # check if DB exists
-DB_EXISTS=$(mysql -u root -p${MARIADB_ROOT_PWD} -h ${DB_HOST} -e "SHOW DATABASES" 2> /dev/null | grep ${NEXTCLOUD_DB_NAME})
+DB_EXISTS=$(mysql -u root -p${MARIADB_ROOT_PASSWORD} -h ${DB_HOST} -e "SHOW DATABASES" 2> /dev/null | grep ${NEXTCLOUD_DB_NAME})
 echo "DB exists: ${DB_EXISTS}"
 
 if [ -z "${DB_EXISTS}" ]; then
     echo "Creating Database"
-    #mysql -u root -p${MARIADB_ROOT_PWD} -h ${DB_HOST} -e "DROP DATABASE IF EXISTS ${NEXTCLOUD_DB_NAME};"
+    #mysql -u root -p${MARIADB_ROOT_PASSWORD} -h ${DB_HOST} -e "DROP DATABASE IF EXISTS ${NEXTCLOUD_DB_NAME};"
     #check_result $? "Dropping DB"
-    mysql -u root -p${MARIADB_ROOT_PWD} -h ${DB_HOST} -e "CREATE DATABASE ${NEXTCLOUD_DB_NAME};"
+    mysql -u root -p${MARIADB_ROOT_PASSWORD} -h ${DB_HOST} -e "CREATE DATABASE ${NEXTCLOUD_DB_NAME};"
     check_result $? "Creating DB"
 fi
 
 echo "Creating User"
 # 'IF EXISTS' for DROP USER is available from MariaDB 10.1.3 only
-mysql -u root -p${MARIADB_ROOT_PWD} -h ${DB_HOST} -e "DROP USER ${NEXTCLOUD_DB_USER};" || echo "It seems it didn't exist"
-mysql -u root -p${MARIADB_ROOT_PWD} -h ${DB_HOST} -e "CREATE USER ${NEXTCLOUD_DB_USER} IDENTIFIED BY '${NEXTCLOUD_DB_PWD}';"
+mysql -u root -p${MARIADB_ROOT_PASSWORD} -h ${DB_HOST} -e "DROP USER ${NEXTCLOUD_DB_USER};" || echo "It seems it didn't exist"
+mysql -u root -p${MARIADB_ROOT_PASSWORD} -h ${DB_HOST} -e "CREATE USER ${NEXTCLOUD_DB_USER} IDENTIFIED BY '${NEXTCLOUD_DB_PWD}';"
 check_result $? "Creating User"
-mysql -u root -p${MARIADB_ROOT_PWD} -h ${DB_HOST} -e "GRANT ALL ON ${NEXTCLOUD_DB_NAME}.* TO ${NEXTCLOUD_DB_USER};"
+mysql -u root -p${MARIADB_ROOT_PASSWORD} -h ${DB_HOST} -e "GRANT ALL ON ${NEXTCLOUD_DB_NAME}.* TO ${NEXTCLOUD_DB_USER};"
 check_result $? "Granting permissions"
-mysql -u root -p${MARIADB_ROOT_PWD} -h ${DB_HOST} -e "FLUSH PRIVILEGES;"
+mysql -u root -p${MARIADB_ROOT_PASSWORD} -h ${DB_HOST} -e "FLUSH PRIVILEGES;"
 check_result $? "Flushing privileges"
 
-unset MARIADB_ROOT_PWD
+unset MARIADB_ROOT_PASSWORD
 
 # DB Backup
 if [ ! -z "${DB_EXISTS}" -a ! -z "${NEXTCLOUD_DB_BACKUP}" -a -f "${NEXTCLOUD_DB_BACKUP}" ]; then

setup.sh

@@ -254,8 +254,8 @@ cp pihole.env.template pihole.env
 chmod 600 *.env
 
 # Passwords
-echo MARIADB_ROOT_PWD=$db_pwd >> mariadb.env
-echo MARIADB_ROOT_PWD=$db_pwd >> nextcloud.env
+echo MARIADB_ROOT_PASSWORD=$db_pwd >> mariadb.env
+echo MARIADB_ROOT_PASSWORD=$db_pwd >> nextcloud.env
 
 echo LDAP_ADMIN_PWD=$ldap_pwd >> openldap.env
 echo LDAP_MAIL_PWD=$ldap_mail_pwd >> openldap.env