File tree Expand file tree Collapse file tree 4 files changed +12
-9
lines changed
Expand file tree Collapse file tree 4 files changed +12
-9
lines changed Original file line number Diff line number Diff line change 3030 ./
3131
3232test :
33- cd ./tests/ && IMAGE=$(REPO ) :$(TAG ) NAME=$(NAME ) ./run.sh
33+ # cd ./tests/ && IMAGE=$(REPO):$(TAG) NAME=$(NAME) ./run.sh
3434# @todo automate tests for mariadb/postgres via phantomjs/selenium
35- # cd ./tests/mariadb && IMAGE=$(REPO):$(TAG) ./run.sh
35+ cd ./tests/mariadb && IMAGE=$(REPO):$(TAG) ./run.sh
3636# cd ./tests/postgres && IMAGE=$(REPO):$(TAG) ./run.sh
3737
3838push :
Original file line number Diff line number Diff line change @@ -24,13 +24,13 @@ Plugin loader scripts used from [TimWolla/docker-adminer](https://github.com/Tim
2424
2525## Environment Variables
2626
27- | Variable | Default Value | Description |
28- | ------------------------ | ------------- | -------------------------------------------- |
29- | ` ADMINER_DEFAULT_DB_DRIVER ` | ` server ` | ` server ` means MySQL , ` pgsql ` for PostgreSQL |
30- | ` ADMINER_DEFAULT_DB_HOST ` | | |
31- | ` ADMINER_DEFAULT_DB_NAME ` | | |
32- | ` ADMINER_DESIGN ` | | Adminer theme, e.g. ` nette ` |
33- | ` ADMINER_PLUGINS ` | | Separated by space, e.g. ` tables-filter tinymce ` |
27+ | Variable | Default Value | Description |
28+ | --------------------------- | ------------- | ------------------------------------------------------- |
29+ | ` ADMINER_DEFAULT_DB_DRIVER ` | ` server ` | ` server ` is the same as ` mysql ` , ` pgsql ` for PostgreSQL |
30+ | ` ADMINER_DEFAULT_DB_HOST ` | | |
31+ | ` ADMINER_DEFAULT_DB_NAME ` | | |
32+ | ` ADMINER_DESIGN ` | | Adminer theme, e.g. ` nette ` |
33+ | ` ADMINER_PLUGINS ` | | Separated by space, e.g. ` tables-filter tinymce ` |
3434
3535See [ wodby/php] ( https://github.com/wodby/php ) for all variables
3636
Original file line number Diff line number Diff line change @@ -19,6 +19,8 @@ function _callParent($function, $args)
1919 $ defaultDbHost = $ _ENV ['ADMINER_DEFAULT_DB_HOST ' ] ?: '' ;
2020 $ defaultDb = $ _ENV ['ADMINER_DEFAULT_DB_NAME ' ] ?: '' ;
2121
22+ $ defaultDbDriver = $ defaultDbDriver == 'mysql ' ? 'server ' : $ defaultDbDriver ;
23+
2224 echo str_replace (
2325 [
2426 'name="auth[server]" value="" title="hostname[:port]" ' ,
Original file line number Diff line number Diff line change @@ -14,6 +14,7 @@ services:
1414 depends_on :
1515 - mariadb
1616 environment :
17+ ADMINER_DEFAULT_DB_DRIVER : mysql
1718 ADMINER_DEFAULT_DB_HOST : mariadb
1819 ADMINER_DEFAULT_DB_NAME : adminer
1920 ADMINER_DESIGN : nette
You can’t perform that action at this time.
0 commit comments