Skip to content

Commit 1e08728

Browse files
londoncallingMano Marks
authored and
Mano Marks
committed
edits for links, formatting, flow of tutorial (docker#41)
Signed-off-by: Victoria Bialas <victoria.bialas@docker.com>
1 parent b248cd8 commit 1e08728

File tree

2 files changed

+13
-9
lines changed

2 files changed

+13
-9
lines changed

beginner/chapters/alpine.md

+2-2
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ To get started, let's run the following in our terminal:
66
$ docker pull alpine
77
```
88

9-
> Note: Depending on how you've installed docker on your system, you might see a `permission denied` error after running the above command. If you're on a Mac, [verify your installation](https://docs.docker.com/mac/step_one/). If you're on Linux, you may need to prefix your `docker` commands with `sudo`. Alternatively you can [create a docker group](http://docs.docker.com/engine/installation/ubuntulinux/#create-a-docker-group) to get rid of this issue.
9+
> **Note:** Depending on how you've installed docker on your system, you might see a `permission denied` error after running the above command. Try the commands from the Getting Started tutorial to [verify your installation](https://docs.docker.com/engine/getstarted/step_one/#/step-3-verify-your-installation). If you're on Linux, you may need to prefix your `docker` commands with `sudo`. Alternatively you can [create a docker group](https://docs.docker.com/engine/installation/linux/ubuntulinux/#/create-a-docker-group) to get rid of this issue.
1010
1111
The `pull` command fetches the alpine **image** from the **Docker registry** and saves it in our system. You can use the `docker images` command to see a list of all images on your system.
1212
```
@@ -93,7 +93,7 @@ That concludes a whirlwind tour of the `docker run` command which would most lik
9393
In the last section, you saw a lot of Docker-specific jargon which might be confusing to some. So before you go further, let's clarify some terminology that is used frequently in the Docker ecosystem.
9494

9595
- *Images* - The Filesystem and configuration of our application which are used to create containers. To find out more about a Docker image, run `docker inspect alpine`. In the demo above, you used the `docker pull` command to download the **alpine** image. When you executed the command `docker run hello-world`, it also did a `docker pull` behind the scenes to download the **hello-world** image.
96-
- *Containers* - Created using Docker images and run the actual application. You created a container using `docker run` which you did using the alpine image that you downloaded. A list of running containers can be seen using the `docker ps` command.
96+
- *Containers* - Running instances of Docker images &mdash; containers runs the actual applications. A container includes an application and all of its dependencies. It shares the kernel with other containers, and runs as an isolated process in user space on the host OS. You created a container using `docker run` which you did using the alpine image that you downloaded. A list of running containers can be seen using the `docker ps` command.
9797
- *Docker daemon* - The background service running on the host that manages building, running and distributing Docker containers.
9898
- *Docker client* - The command line tool that allows the user to interact with the Docker daemon.
9999
- *Docker Hub* - A [registry](https://hub.docker.com/explore/) of Docker images. You can think of the registry as a directory of all available Docker images. You'll be using this later in this tutorial.

beginner/chapters/webapps.md

+11-7
Original file line numberDiff line numberDiff line change
@@ -1,19 +1,23 @@
11
## 2.0 Webapps with Docker
2-
Great! So you have now looked at `docker run`, played with a docker container and also got a hang of some terminology. Armed with all this knowledge, you are now ready to get to the real-stuff i.e. deploying web applications with Docker.
2+
Great! So you have now looked at `docker run`, played with a docker container and also got the hang of some terminology. Armed with all this knowledge, you are now ready to get to the real-stuff i.e. deploying web applications with Docker.
33

44
### 2.1 Static Sites
5-
_Code for this section is in this repo in the [static-site directory](https://github.com/docker/labs/tree/master/beginner/static-site)_
6-
Let's start by taking baby-steps. The first thing we're going to look at is how you can run a dead-simple static website. You're going to pull a docker image from the docker hub, run the container and see how easy it so to set up a webserver.
5+
>**Note:** Code for this section is in this repo in the [static-site directory](https://github.com/docker/labs/tree/master/beginner/static-site).
6+
7+
Let's start by taking baby-steps. First, we'll use Docker to run a dead-simple static website. You're going to pull a Docker image from the Docker Hub, run the container and see how easy it is to set up a web server.
78

89
The image that you are going to use is a single-page website that was already created for this demo and is available on the Docker Hub as [`seqvence/static-site`](https://hub.docker.com/r/seqvence/static-site/). You can download and run the image directly in one go using `docker run`.
910

1011
```
1112
$ docker run seqvence/static-site
1213
```
13-
Since the image doesn't exist on your Docker host, the Docker daemon will first fetch the image from the registry and then run the image.
14-
Okay, now that the server is running, do you see the website? What port is it running on? And more importantly, how do you access the container directly from our host machine?
14+
Since the image doesn't exist on your Docker host, the Docker daemon first fetches the image from the registry and then runs the image.
15+
16+
* Okay, now that the server is running, do you see the website?
17+
* What port is it running on?
18+
* And more importantly, how do you access the container directly from our host machine?
1519

16-
In this case, the client didn't tell the Docker Engine to publish any of the ports so you need to re-run the `docker run` command. We'll take the oportunity to publish ports and pass your name to the container to customize the message displayed. While we are at it, you should also find a way so that our terminal is not attached to the running container. So that you can happily close your terminal and keep the container running. This is called the **detached** mode.
20+
In this case, the client didn't tell the Docker Engine to publish any of the ports, so you need to re-run the `docker run` command. We'll take the oportunity to publish ports and pass your name to the container to customize the message displayed. While we are at it, you should also find a way so that our terminal is not attached to the running container. So that you can happily close your terminal and keep the container running. This is called the **detached** mode.
1721

1822
Before we look at the **detached** mode, we should first find out a way to stop the container that you have just launched.
1923

@@ -235,7 +239,7 @@ But first we will install the Python pip package to the alpine linux distributio
235239
RUN apk add --update py-pip
236240
```
237241

238-
Next, let us add the files that make up the Flask Application.
242+
Next, let's add the files that make up the Flask Application.
239243

240244

241245
Install all Python requirements for our app to run. This will be accomplished by adding the lines:

0 commit comments

Comments
 (0)