From da9f20a131cf1d66b777415182144d9bc987d38a Mon Sep 17 00:00:00 2001 From: Jan Tuomi Date: Wed, 1 Mar 2017 18:31:00 +0200 Subject: [PATCH] Change docker installation instructions --- readme.md | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/readme.md b/readme.md index ea49675..cb0c52b 100644 --- a/readme.md +++ b/readme.md @@ -21,11 +21,12 @@ git checkout develop ### Installing Docker -Install docker and docker-compose. On Ubuntu this can be done with +Install docker and docker-compose. On Ubuntu you can install ocker from the repositories but docker-compose must be installed separately. ```BASH -sudo apt-get install docker docker-compose +sudo apt-get install docker ``` +Navigate to [docker-compose releases](https://github.com/docker/compose/releases) for install information. ### Configuring db image @@ -36,7 +37,7 @@ sudo docker-compose up db Then configure following with another shell window ```BASH sudo docker exec -ti bash # image name can be found with sudo docker ps (probably web20_db_1) -mysql -u root -p # then enter root password which can be found in docker-compose.yml +mysql -u root -p # then enter root password ("toor" by default) which can be found in docker-compose.yml ``` ```SQL