Skip to content

Commit 4b316f4

Browse files
committed
fixed database authentication plugin and "http2" deprecated errors
1 parent 00a6e2b commit 4b316f4

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
@@ -123,15 +123,14 @@ Copy the example environment into `.env`
123123
cp env.example .env
124124
```
125125

126-
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```.
126+
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```.
127127

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

130130
DIRECTORY_PATH=```pwd``` at command line\
131131
DATABASE_IMAGE_NAME=```mariadb``` or ```mysql```\
132132
DATABASE_CONT_NAME=```mariadb```, ```mysql``` or ```custom name```\
133133
DATABASE_PACKAGE_MANAGER=```apt-get update && apt-get install -y gettext-base``` for mariadb, ```microdnf install -y gettext``` for mysql\
134-
DATABASE_AUTHENTICATION_PLUGIN=```mysql_native_password``` for mariadb, ```caching_sha2_password``` for mysql\
135134
DATABASE_ADMIN_COMMANDLINE=```mariadb-admin``` for mariadb, ```mysqladmin``` for mysql
136135

137136
and
@@ -144,7 +143,7 @@ change example.com to your domain name in ```./phpmyadmin/apache2/sites-availabl
144143
```
145144
cp ./database/phpmyadmin/sql/create_tables.sql.template.example ./database/phpmyadmin/sql/create_tables.sql.template
146145
```
147-
change pma_controluser, db_authentication_plugin and db_authentication_password in ```./database/phpmyadmin/sql/create_tables.sql.template``` file.
146+
change pma_controluser and db_authentication_password in ```./database/phpmyadmin/sql/create_tables.sql.template``` file.
148147

149148
### Installation
150149

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
rails:
@@ -175,7 +173,7 @@ services:
175173
- "docker-volume-backup.stop-during-backup=true"
176174
- "docker-volume-backup.archive-pre=/bin/sh -c 'mysqldump -uroot -p${MYSQL_ROOT_PASSWORD} --all-databases > /tmp/backup/db_backup_data.sql'"
177175
- "docker-volume-backup.exec-label=database"
178-
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}"
176+
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"
179177

180178
redis:
181179
image: redis:latest

env.example

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

2625
PMA_CONTROLUSER=pma_username

install.sh

Lines changed: 4 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -231,13 +231,13 @@ echo "======================================================================="
231231
echo ""
232232
echo ""
233233
echo "======================================================================="
234-
echo "| Installing Docker Compose v2.23.3..."
234+
echo "| Installing Docker Compose v2.27.2..."
235235
echo "======================================================================="
236236
echo ""
237237
sleep 2
238238

239239
sudo mkdir -p /usr/local/lib/docker/cli-plugins
240-
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
240+
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
241241
sudo chmod +x /usr/local/lib/docker/cli-plugins/docker-compose
242242

243243
echo ""
@@ -261,6 +261,7 @@ echo ""
261261
echo "Done ✓"
262262
echo "======================================================================="
263263

264+
clear
264265
##########
265266
# Setup project variables
266267
##########
@@ -361,8 +362,7 @@ done
361362
echo "Ok."
362363

363364
which_db=""
364-
db_authentication_plugin="mysql_native_password"
365-
db_authentication_password="USING PASSWORD('"$pma_password"')"
365+
db_authentication_password=$pma_password
366366
db_package_manager="apt-get update \&\& apt-get install -y gettext-base"
367367
db_admin_commandline="mariadb-admin"
368368
PS3="Select the database: "
@@ -371,8 +371,6 @@ do
371371
which_db=$db
372372
if [ $REPLY -eq 2 ]
373373
then
374-
db_authentication_plugin="caching_sha2_password"
375-
db_authentication_password="BY '"$pma_password"'"
376374
db_package_manager="microdnf install -y gettext"
377375
db_admin_commandline="mysqladmin"
378376
fi
@@ -410,9 +408,7 @@ cp ./database/phpmyadmin/sql/create_tables.sql.template.example ./database/phpmy
410408

411409
cp env.example .env
412410

413-
sed -i 's/db_authentication_plugin/'$db_authentication_plugin'/' ./database/phpmyadmin/sql/create_tables.sql.template
414411
sed -i "s/db_authentication_password/${db_authentication_password}/" ./database/phpmyadmin/sql/create_tables.sql.template
415-
sed -i 's/db_authentication_plugin/'$db_authentication_plugin'/' .env
416412
sed -i "s|db_package_manager|${db_package_manager}|" .env
417413
sed -i 's/db_admin_commandline/'$db_admin_commandline'/' .env
418414
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)