merged conflicting commits

Signed-off-by: Nathan Hsieh <hsieh.nathan@gmail.com>
Upstream-commit: 8ceb213b3e86973c795ec87a724c7dc7a794d57e
Component: engine
This commit is contained in:
Nathan Hsieh
2014-10-08 13:44:21 -07:00
parent 980621d0d7
commit 34b246475b

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
application.
Lastly, we've specified a command for our container to run: `python app.py`.
This launches our web application.
Lastly, we've specified a command for our container to run: `python app.py`. This launches our web application.
> **Note:**
> You can see more detail on the `docker run` command in the [command