From 6deff4131c07be220bdee59af392d80c5b996743 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Michal=20=C4=8Ciha=C5=99?= Date: Mon, 8 Aug 2016 13:26:17 +0200 Subject: [PATCH 1/2] Document docker configuration customization MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit See https://github.com/phpmyadmin/docker/pull/42 Signed-off-by: Michal Čihař --- doc/setup.rst | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+) diff --git a/doc/setup.rst b/doc/setup.rst index cd33d13360..c6c6ee9a22 100644 --- a/doc/setup.rst +++ b/doc/setup.rst @@ -149,6 +149,18 @@ environment variables: By default, :ref:`cookie` is used, but if :envvar:`PMA_USER` and :envvar:`PMA_PASSWORD` are set, it is switched to :ref:`auth_config`. +Additionally configuration can be tweaked by :file:`/config.user.inc.php`. If +this file exists, it will be loaded after configuration generated from above +environment variables, so you can override any configuration variable. This +configuraiton can be added as a volume when invoking docker using +`-v /some/local/directory/config.user.inc.php:/config.user.inc.php` parameters. + +.. seealso:: + + See :ref:`config` for detailed description of configuration options. + +Docker Examples +--------------- To connect phpMyAdmin to given server use: @@ -174,6 +186,12 @@ You can also link the database container using Docker: docker run --name phpmyadmin -d --link mysql_db_server:db -p 8080:80 phpmyadmin/phpmyadmin +Running with additional configration: + +.. code-block:: sh + + docker run --name phpmyadmin -d --link mysql_db_server:db -p 8080:80 -v /some/local/directory/config.user.inc.php:/config.user.inc.php phpmyadmin/phpmyadmin + Using docker-compose -------------------- From 12a66952a9498fc5eca58115d9adfe85c44e01c2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Michal=20=C4=8Ciha=C5=99?= Date: Mon, 8 Aug 2016 14:34:25 +0200 Subject: [PATCH 2/2] Use long key IDs or fingerprints to point to keys MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This is safer than short IDs, where colliscion could exist. Fixes #12448 Signed-off-by: Michal Čihař --- doc/setup.rst | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/doc/setup.rst b/doc/setup.rst index c6c6ee9a22..be6fad9690 100644 --- a/doc/setup.rst +++ b/doc/setup.rst @@ -370,7 +370,7 @@ Verifying phpMyAdmin releases Since July 2015 all phpMyAdmin releases are cryptographically signed by the releasing developer, who through January 2016 was Marc Delisle. His key id is -0x81AF644A, his PGP fingerprint is: +0xFEFC65D181AF644A, his PGP fingerprint is: .. code-block:: console @@ -379,7 +379,7 @@ releasing developer, who through January 2016 was Marc Delisle. His key id is and you can get more identification information from `https://keybase.io/lem9 `_. Beginning in January 2016, the release manager is Isaac Bennetch. His key id is -0x8259BD92, and his PGP fingerprint is: +0xCE752F178259BD92, and his PGP fingerprint is: .. code-block:: console @@ -413,7 +413,7 @@ point you should do one of the following steps: .. code-block:: console - $ gpg --keyserver hkp://pgp.mit.edu --recv-keys 8259BD92 + $ gpg --keyserver hkp://pgp.mit.edu --recv-keys 3D06A59ECE730EB71B511C17CE752F178259BD92 gpg: requesting key 8259BD92 from hkp server pgp.mit.edu gpg: key 8259BD92: public key "Isaac Bennetch " imported gpg: no ultimately trusted keys found @@ -462,7 +462,7 @@ clear error regardless of the fact that the key is trusted or not: .. _Validating other keys on your public keyring: https://www.gnupg.org/gph/en/manual.html#AEN335 -.. _Isaac's key links to Linus's key: https://pgp.cs.uu.nl/mk_path.cgi?FROM=00411886&TO=8259BD92 +.. _Isaac's key links to Linus's key: https://pgp.cs.uu.nl/mk_path.cgi?FROM=ABAF11C65A2970B130ABE3C479BE3E4300411886&TO=3D06A59ECE730EB71B511C17CE752F178259BD92 .. index::