docker
/
docs
mirror of https://github.com/docker/docs.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

merged conflicting commits 

Signed-off-by: Nathan Hsieh <hsieh.nathan@gmail.com>
This commit is contained in:
Nathan Hsieh 2014-10-08 13:44:21 -07:00
parent 0d5daa4a8f
commit 8ceb213b3e
1 changed files with 1 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
docs/sources/userguide/usingdocker.md
View File

@ -114,8 +114,7 @@ We've specified an image: `training/webapp`. This image is a
pre-built image we've created that contains a simple Python Flask web pre-built image we've created that contains a simple Python Flask web
application. application.
Lastly, we've specified a command for our container to run: `python app.py`. Lastly, we've specified a command for our container to run: `python app.py`. This launches our web application.
This launches our web application.
> **Note:** > **Note:**
> You can see more detail on the `docker run` command in the [command > You can see more detail on the `docker run` command in the [command