Skip to content

Commit adf9118

Browse files
committed
Merge #401 - Add back a /sessions volume for sessions persistence
2 parents a6c091b + 0730e51 commit adf9118

File tree

6 files changed

+39
-0
lines changed

6 files changed

+39
-0
lines changed

CHANGELOG.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,7 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/).
99
- Add `TZ` env var to change PHP `date.timezone` (#133)
1010
- Update to PHP 8.2 (#411)
1111
- Add back a `/sessions` volume for sessions persistence (#399)
12+
- Support adding custom configurations in `/etc/phpmyadmin/conf.d` (#401)
1213

1314
## [5.2.1] - 2023-02-08
1415

README.md

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -136,6 +136,16 @@ See the following links for config file information:
136136
* https://docs.phpmyadmin.net/en/latest/config.html#config
137137
* https://docs.phpmyadmin.net/en/latest/setup.html
138138

139+
## Adding custom configuration in `/etc/phpmyadmin/conf.d`
140+
141+
you can also consider storing your custom configuration files in the folder `/etc/phpmyadmin/conf.d`, which is very suitable for managing multiple phpMyAdmin configuration files for different hosts,Then you can create `server-1.php`, `server-2.php`, or any file name you want, and store them in the conf.d directory mounted on the host.
142+
143+
On the `docker run` line like this:
144+
145+
```sh
146+
docker run --name phpmyadmin -d --link mysql_db_server:db -p 8080:80 -v /some/local/directory/conf.d:/etc/phpmyadmin/conf.d:ro phpmyadmin:latest
147+
```
148+
139149
## Usage behind a reverse proxy
140150

141151
Set the variable ``PMA_ABSOLUTE_URI`` to the fully-qualified path (``https://pma.example.net/``) where the reverse proxy makes phpMyAdmin available.

apache/config.inc.php

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -159,3 +159,10 @@
159159
if (file_exists('/etc/phpmyadmin/config.user.inc.php')) {
160160
include '/etc/phpmyadmin/config.user.inc.php';
161161
}
162+
163+
/* Support additional configurations */
164+
if (is_dir('/etc/phpmyadmin/conf.d/')) {
165+
foreach (glob('/etc/phpmyadmin/conf.d/*.php') as $filename) {
166+
include $filename;
167+
}
168+
}

config.inc.php

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -159,3 +159,10 @@
159159
if (file_exists('/etc/phpmyadmin/config.user.inc.php')) {
160160
include '/etc/phpmyadmin/config.user.inc.php';
161161
}
162+
163+
/* Support additional configurations */
164+
if (is_dir('/etc/phpmyadmin/conf.d/')) {
165+
foreach (glob('/etc/phpmyadmin/conf.d/*.php') as $filename) {
166+
include $filename;
167+
}
168+
}

fpm-alpine/config.inc.php

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -159,3 +159,10 @@
159159
if (file_exists('/etc/phpmyadmin/config.user.inc.php')) {
160160
include '/etc/phpmyadmin/config.user.inc.php';
161161
}
162+
163+
/* Support additional configurations */
164+
if (is_dir('/etc/phpmyadmin/conf.d/')) {
165+
foreach (glob('/etc/phpmyadmin/conf.d/*.php') as $filename) {
166+
include $filename;
167+
}
168+
}

fpm/config.inc.php

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -159,3 +159,10 @@
159159
if (file_exists('/etc/phpmyadmin/config.user.inc.php')) {
160160
include '/etc/phpmyadmin/config.user.inc.php';
161161
}
162+
163+
/* Support additional configurations */
164+
if (is_dir('/etc/phpmyadmin/conf.d/')) {
165+
foreach (glob('/etc/phpmyadmin/conf.d/*.php') as $filename) {
166+
include $filename;
167+
}
168+
}

0 commit comments

Comments
 (0)