Skip to content

Commit

Permalink
Updating beginner tutorial
Browse files Browse the repository at this point in the history
Removing a few confusing elements from the setup, adding some additional stuff to the compose section on networking and file versions.
  • Loading branch information
ManoMarks committed Nov 10, 2016
1 parent 14dd581 commit 5db1174
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 9 deletions.
8 changes: 1 addition & 7 deletions beginner/chapters/alpine.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
## 1.0 Running your first container
Now that you have everything setup, it's time to get our hands dirty. In this section, you are going to run a [Alpine Linux](http://www.alpinelinux.org/) container (a lightweight linux distribution) on our system and get a taste of the `docker run` command.
Now that you have everything setup, it's time to get our hands dirty. In this section, you are going to run an [Alpine Linux](http://www.alpinelinux.org/) container (a lightweight linux distribution) on your system and get a taste of the `docker run` command.

To get started, let's run the following in our terminal:
```
Expand Down Expand Up @@ -40,12 +40,6 @@ hello from alpine
```
OK, that's some actual output. In this case, the Docker client dutifully ran the `echo` command in our alpine container and then exited it. If you've noticed, all of that happened pretty quickly. Imagine booting up a virtual machine, running a command and then killing it. Now you know why they say containers are fast!

Try another command.
```
$ docker run alpine uptime
00:16:48 up 1:48, 0 users, load average: 0.00, 0.01, 0.04
```

Try another command.
```
$ docker run alpine /bin/sh
Expand Down
4 changes: 2 additions & 2 deletions beginner/chapters/votingapp.md
Original file line number Diff line number Diff line change
Expand Up @@ -109,9 +109,9 @@ This Compose file defines
- A .NET based worker app based on a .NET image
- A Postgres container based on a postgres image
Note that three of the containers are built from Dockerfiles, while the other two are images on Docker Hub. To learn more about how they're built, you can examine each of the Dockerfiles in the three directories: `vote`, `result`, `worker`.
Note that three of the containers are built from Dockerfiles, while the other two are images on Docker Hub. To learn more about how they're built, you can examine each of the Dockerfiles in the three directories: `vote`, `result`, `worker`. Also note that there's a version number at the top. The current version of the Compose file is 2.

The Compose file also defines two networks, front-tier and back-tier. Each container is placed on one or two networks. Once on those networks, they can access other services on that network in code just by using the name of the service. To learn more about networking check out the [Networking with Compose documentation](https://docs.docker.com/compose/networking/).
The Compose file also defines two networks, front-tier and back-tier. Each container is placed on one or two networks. Once on those networks, they can access other services on that network in code just by using the name of the service. Services can be on any number of networks. Services are isolated on their network. Services are only able to discover each other by name if they are on the same network. To learn more about networking check out the [Networking with Compose documentation](https://docs.docker.com/compose/networking/).

To launch your app navigate to the example-voting-app directory and run the following command:

Expand Down

0 comments on commit 5db1174

Please sign in to comment.