[phpMyAdmin Git] [phpmyadmin/docker] 4cadf0: Updated for installing config.userdef.inc.php hook...

[Michal Čihař]

  Branch: refs/heads/master
  Home:   https://github.com/phpmyadmin/docker
  Commit: 4cadf08f00ed79feb309a0cdfc80ff99614199cf
      https://github.com/phpmyadmin/docker/commit/4cadf08f00ed79feb309a0cdfc80ff99614199cf
  Author: Douglas Wagner <dwagner at rgare.net>
  Date:   2016-07-11 (Mon, 11 Jul 2016)

  Changed paths:
    M README.md
    M config.inc.php
    M run.sh

  Log Message:
  -----------
  Updated for installing config.userdef.inc.php hook to update PHPMYADMIN custom user setttings without modifying/overriding the config.inc.php file.


  Commit: f67529f585671143e18f32fa2e1e7bd6811b4818
      https://github.com/phpmyadmin/docker/commit/f67529f585671143e18f32fa2e1e7bd6811b4818
  Author: Michal Čihař <michal at cihar.com>
  Date:   2016-08-08 (Mon, 08 Aug 2016)

  Changed paths:
    M README.md
    M config.inc.php
    M run.sh

  Log Message:
  -----------
  Merge remote-tracking branch 'origin/pull/42'


  Commit: a5dfdfe993046e5a009eda03ace4ac20b0a84fde
      https://github.com/phpmyadmin/docker/commit/a5dfdfe993046e5a009eda03ace4ac20b0a84fde
  Author: Michal Čihař <michal at cihar.com>
  Date:   2016-08-08 (Mon, 08 Aug 2016)

  Changed paths:
    M README.md
    M config.inc.php
    M run.sh

  Log Message:
  -----------
  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 at cihar.com>


Compare: https://github.com/phpmyadmin/docker/compare/e6bc219529cc...a5dfdfe99304