19 Commits
Author SHA1 Message Date
J0WIandIsaac Bennetch 78e3cb7aba Refactor Dockerfile to support multiple variants and drop supervisord (#200)
* Refactor Dockerfile to support multiple variants and drop supervisord
* Rename run.sh to docker-entrypoint.sh
* Update tests for apache conatiner
* Fix tests in conatiner
* Fix database startup
* Update Makefile to build all variants
* Update phpMyAdmin to 4.8.4
* Rebase on top of v4.8.5
2019-03-29 03:48:30 -04:00
Michal Čihař f581555bcf Move all configuration to /etc
* configuration is now in /etc
* reorder commands for better Docker layer caching

Signed-off-by: Michal Čihař <michal@cihar.com>
2016-11-28 10:19:52 +01:00
Michal Čihař cd02b8d305 Move config.user.inc.php to /www
It needs to be stored in a location allowed by open_basedir.

Fixes #73

Signed-off-by: Michal Čihař <michal@cihar.com>
2016-10-18 12:09:58 +02:00
Andrea Sosso 07afa363d7 Adding PMA_VERBOSE and PMA_VERBOSES environment variables 2016-10-04 15:25:13 +02:00
Michal Čihař fc12c997ef Allow to specify verbose names
Fixes #54

Signed-off-by: Michal Čihař <michal@cihar.com>
2016-09-22 09:55:02 +02:00
Michal Čihař 9e0529c6f5 Revert "Remove PMA_ABSOLUTE_URI as it is no longer needed with 4.6"
This reverts commit 812590e038.

Fixes #40

Please note that the setting will take no effect till phpMyAdmin 4.6.5.

Signed-off-by: Michal Čihař <michal@cihar.com>
2016-08-17 15:43:28 +02:00
Michal Čihař a5dfdfe993 Move user configuration and simplify it's setup
- move it to root directory to make it easier to use as volume

Signed-off-by: Michal Čihař <michal@cihar.com>
2016-08-08 13:09:32 +02:00
Douglas Wagner 4cadf08f00 Updated for installing config.userdef.inc.php hook to update PHPMYADMIN custom user setttings without modifying/overriding the config.inc.php file. 2016-07-11 12:49:04 -05:00
Michal Čihař 812590e038 Remove PMA_ABSOLUTE_URI as it is no longer needed with 4.6
Signed-off-by: Michal Čihař <michal@cihar.com>
2016-06-10 13:49:55 +02:00
Lorenz Brun 3c336a7816 Added to list of environment variables 2016-01-09 02:09:29 +01:00
Lorenz Brun 1ac16c0daf Allows to set the user-facing URL, fixes #12 2016-01-09 02:06:01 +01:00
Sullivan SENECHAL 261a9107e2 Allow empty password 2015-12-15 13:46:03 +01:00
Michal Čihař c6b5962723 Ensure we get the environment in most cases
It turns out that PHP versions differ in passing Unix environment, let's
fallback to getenv to fix that.

Fixes #10

Signed-off-by: Michal Čihař <michal@cihar.com>
2015-12-15 10:43:17 +01:00
Michal Čihař 8f0181616e Allow to sepcify more db servers
Fixes #7

Signed-off-by: Michal Čihař <michal@cihar.com>
2015-12-14 14:01:19 +01:00
Michal Čihař e6ba64cd5f Fix typo in config file
Signed-off-by: Michal Čihař <michal@cihar.com>
2015-12-14 13:49:36 +01:00
Michal Čihař b0a8bc0bec Add support for config auth method
Fixes #8

Signed-off-by: Michal Čihař <michal@cihar.com>
2015-12-14 13:39:31 +01:00
Michal Čihař 7d566641b4 Use just one configuration file
We can generate correct values inside it, no need for magic handling
more of the files.

Signed-off-by: Michal Čihař <michal@cihar.com>
2015-12-14 13:36:47 +01:00
Sebastian Mendel cd7cc22fd8 add support for arbitrary servers 2015-12-04 13:02:28 +01:00
ZhiFeng Hu 063cecc62b Update Dockerfile
Signed-off-by: ZhiFeng Hu <hufeng1987@gmail.com>
2015-11-06 10:27:39 +08:00