Skip to content

Commit 4731a41

Browse files
committed
fixed database authentication plugin and "http2" deprecated errors
1 parent 871bc5e commit 4731a41

File tree

7 files changed

+12
-22
lines changed

7 files changed

+12
-22
lines changed

README.md

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -125,15 +125,14 @@ Copy the example environment into `.env`
125125
cp env.example .env
126126
```
127127

128-
Edit the `.env` file to change values of ```LOCAL_TIMEZONE```, ```DOMAIN_NAME```, ```DIRECTORY_PATH```, ```LETSENCRYPT_EMAIL```, ```DB_USER```, ```DB_PASSWORD```, ```DB_NAME```, ```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```.
128+
Edit the `.env` file to change values of ```LOCAL_TIMEZONE```, ```DOMAIN_NAME```, ```DIRECTORY_PATH```, ```LETSENCRYPT_EMAIL```, ```DB_USER```, ```DB_PASSWORD```, ```DB_NAME```, ```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```.
129129

130130
LOCAL_TIMEZONE=[to see local timezones](https://docs.diladele.com/docker/timezones.html)
131131

132132
DIRECTORY_PATH=```pwd``` at command line\
133133
DATABASE_IMAGE_NAME=```mariadb``` or ```mysql```\
134134
DATABASE_CONT_NAME=```mariadb```, ```mysql``` or ```custom name```\
135135
DATABASE_PACKAGE_MANAGER=```apt-get update && apt-get install -y gettext-base``` for mariadb, ```microdnf install -y gettext``` for mysql\
136-
DATABASE_AUTHENTICATION_PLUGIN=```mysql_native_password``` for mariadb, ```caching_sha2_password``` for mysql\
137136
DATABASE_ADMIN_COMMANDLINE=```mariadb-admin``` for mariadb, ```mysqladmin``` for mysql\
138137
VARNISH_VERSION=```latest``` for centos version 9+ and fedora, ```stable``` for the others
139138

@@ -147,7 +146,7 @@ change example.com to your domain name in ```./phpmyadmin/apache2/sites-availabl
147146
```
148147
cp ./database/phpmyadmin/sql/create_tables.sql.template.example ./database/phpmyadmin/sql/create_tables.sql.template
149148
```
150-
change pma_controluser, db_authentication_plugin and db_authentication_password in ```./database/phpmyadmin/sql/create_tables.sql.template``` file.
149+
change pma_controluser and db_authentication_password in ```./database/phpmyadmin/sql/create_tables.sql.template``` file.
151150

152151
### Installation
153152

database/phpmyadmin/sql/create_tables.sql.template.example

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ USE phpmyadmin;
2626
--
2727
-- CREATE USER IF NOT EXISTS for phpmyadmin database
2828
--
29-
CREATE USER IF NOT EXISTS 'pma_controluser'@'%' IDENTIFIED WITH db_authentication_plugin db_authentication_password;
29+
CREATE USER IF NOT EXISTS 'pma_controluser'@'%' IDENTIFIED BY 'db_authentication_password';
3030

3131
--
3232
-- Privileges

docker-compose.yml

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,3 @@
1-
version: '3.7'
2-
31
services:
42

53
laravel:
@@ -183,7 +181,7 @@ services:
183181
- "docker-volume-backup.stop-during-backup=true"
184182
- "docker-volume-backup.archive-pre=/bin/sh -c 'mysqldump -uroot -p${MYSQL_ROOT_PASSWORD} --all-databases > /tmp/backup/db_backup_data.sql'"
185183
- "docker-volume-backup.exec-label=database"
186-
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_unicode_ci --default-authentication-plugin=${DATABASE_AUTHENTICATION_PLUGIN}"
184+
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_unicode_ci"
187185

188186
redis:
189187
image: redis:latest

env.example

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,6 @@ DATABASE_IMAGE_NAME=which_db
2121
DATABASE_CONT_NAME=which_db
2222
DATABASE_VERSION=latest
2323
DATABASE_PACKAGE_MANAGER=db_package_manager
24-
DATABASE_AUTHENTICATION_PLUGIN=db_authentication_plugin
2524
DATABASE_ADMIN_COMMANDLINE=db_admin_commandline
2625

2726
PMA_CONTROLUSER=pma_username

install.sh

Lines changed: 4 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -221,13 +221,13 @@ echo "======================================================================="
221221
echo ""
222222
echo ""
223223
echo "======================================================================="
224-
echo "| Installing Docker Compose v2.23.3..."
224+
echo "| Installing Docker Compose v2.27.2..."
225225
echo "======================================================================="
226226
echo ""
227227
sleep 2
228228

229229
sudo mkdir -p /usr/local/lib/docker/cli-plugins
230-
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
230+
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
231231
sudo chmod +x /usr/local/lib/docker/cli-plugins/docker-compose
232232

233233
echo ""
@@ -251,6 +251,7 @@ echo ""
251251
echo "Done ✓"
252252
echo "======================================================================="
253253

254+
clear
254255
##########
255256
# Setup project variables
256257
##########
@@ -351,8 +352,7 @@ done
351352
echo "Ok."
352353

353354
which_db=""
354-
db_authentication_plugin="mysql_native_password"
355-
db_authentication_password="USING PASSWORD('"$pma_password"')"
355+
db_authentication_password=$pma_password
356356
db_package_manager="apt-get update \&\& apt-get install -y gettext-base"
357357
db_admin_commandline="mariadb-admin"
358358
PS3="Select the database: "
@@ -361,8 +361,6 @@ do
361361
which_db=$db
362362
if [ $REPLY -eq 2 ]
363363
then
364-
db_authentication_plugin="caching_sha2_password"
365-
db_authentication_password="BY '"$pma_password"'"
366364
db_package_manager="microdnf install -y gettext"
367365
db_admin_commandline="mysqladmin"
368366
fi
@@ -400,9 +398,7 @@ cp ./database/phpmyadmin/sql/create_tables.sql.template.example ./database/phpmy
400398

401399
cp env.example .env
402400

403-
sed -i 's/db_authentication_plugin/'$db_authentication_plugin'/' ./database/phpmyadmin/sql/create_tables.sql.template
404401
sed -i "s/db_authentication_password/${db_authentication_password}/" ./database/phpmyadmin/sql/create_tables.sql.template
405-
sed -i 's/db_authentication_plugin/'$db_authentication_plugin'/' .env
406402
sed -i "s|db_package_manager|${db_package_manager}|" .env
407403
sed -i 's/db_admin_commandline/'$db_admin_commandline'/' .env
408404
sed -i 's/example.com/'$domain_name'/' .env

portainer-docker-compose.yml

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,6 @@
1-
version: '3.7'
2-
31
services:
42
portainer:
5-
image: portainer/portainer-ce
3+
image: portainer/portainer-ce:latest
64
container_name: portainer
75
volumes:
86
- /var/run/docker.sock:/var/run/docker.sock
@@ -15,7 +13,7 @@ services:
1513
environment:
1614
TZ: '${LOCAL_TIMEZONE}'
1715
command: '--sslcert /etc/letsencrypt/live/${DOMAIN_NAME}/fullchain.pem --sslkey /etc/letsencrypt/live/${DOMAIN_NAME}/privkey.pem'
18-
16+
1917
volumes:
2018
portainer_data:
2119
name: portainer_data

webserver/templates/nginx.conf.template

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,8 +19,8 @@ server {
1919
}
2020

2121
server {
22-
#listen 443 ssl http2;
23-
#listen [::]:443 ipv6only=on ssl http2;
22+
#listen 443 ssl;
23+
#listen [::]:443 ipv6only=on ssl;
2424
#
2525
server_name ${NGINX_HOST} www.${NGINX_HOST};
2626
#

0 commit comments

Comments
 (0)