From 5b928b91381f5c14c5aced29f786b3e5b3c3f821 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Michal=20=C4=8Ciha=C5=99?= Date: Mon, 8 Feb 2016 11:07:41 +0100 Subject: [PATCH] Adjust Docker documentation to match current code MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit The port has been changed from 8080 to 80 in https://github.com/phpmyadmin/docker/pull/19 Signed-off-by: Michal Čihař --- doc/setup.rst | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/doc/setup.rst b/doc/setup.rst index 9c79c15ac0..88e30cb08d 100644 --- a/doc/setup.rst +++ b/doc/setup.rst @@ -112,7 +112,7 @@ download it using: docker pull phpmyadmin/phpmyadmin -The phpMyAdmin will be executed on port 8080. It supports several ways of +The phpMyAdmin will be executed on port 80. It supports several ways of configuring link to the database server, which you can configure using environment variables: @@ -154,25 +154,25 @@ To connect phpMyAdmin to given server use: .. code-block:: sh - docker run --name myadmin -d -e PMA_HOST=dbhost -p 8080:8080 phpmyadmin/phpmyadmin + docker run --name myadmin -d -e PMA_HOST=dbhost -p 8080:80 phpmyadmin/phpmyadmin To connect phpMyAdmin to more servers use: .. code-block:: sh - docker run --name myadmin -d -e PMA_HOSTS=dbhost1,dbhost2,dbhost3 -p 8080:8080 phpmyadmin/phpmyadmin + docker run --name myadmin -d -e PMA_HOSTS=dbhost1,dbhost2,dbhost3 -p 8080:80 phpmyadmin/phpmyadmin To use arbitrary server option: .. code-block:: sh - docker run --name myadmin -d --link mysql_db_server:db -p 8080:8080 -e PMA_ARBITRARY=1 phpmyadmin/phpmyadmin + docker run --name myadmin -d --link mysql_db_server:db -p 8080:80 -e PMA_ARBITRARY=1 phpmyadmin/phpmyadmin You can also link the database container using Docker: .. code-block:: sh - docker run --name phpmyadmin -d --link mysql_db_server:db -p 8080:8080 phpmyadmin/phpmyadmin + docker run --name phpmyadmin -d --link mysql_db_server:db -p 8080:80 phpmyadmin/phpmyadmin Using docker-compose --------------------