Skip to content

Commit ff4fac2

Browse files
committed
Merge pull request #2 from Resseguie/typo-fixes
simple typo fixes
2 parents 6e314fc + cab0d69 commit ff4fac2

File tree

5 files changed

+8
-9
lines changed

5 files changed

+8
-9
lines changed

public/building-images-with-dockerfiles.md

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -105,6 +105,5 @@ Notice that in this example we're running the Flask app directly when we start t
105105
Dockerfiles provide a relatively simple way to create a base image. And, because you can use the FROM command to chain Dockerfiles together into increasingly complex images, you can do quite a lot, even with Docker's (refreshingly!) minimal command set. But, if you already have an existing IA tool (and you should!), such as [Chef](http://www.getchef.com/), [Puppet](http://puppetlabs.com/), [Ansible](http://www.ansible.com/home), [Salt](http://www.saltstack.com/), it's very unlikely you could or even should rewrite everything. So, if you're in this situation what can you do?
106106

107107

108-
109108
I HAVE NO IDEA! I NEED TO RESEARCH THIS MORE, BUT I THINK YOU CAN USE A TOOL LIKE [Packer](http://www.packer.io/). MAYBE I CAN CONVINCE Jeroen Janssens to do something with [his Ansible stuff](https://github.com/jeroenjanssens/data-science-at-the-command-line/tree/master/dst/build)
110109

public/docker-images.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -59,6 +59,6 @@ Each line in the history corresponds to a commit of the image's filesystem. The
5959

6060
There are a couple of key things to understand about the layers in a docker images:
6161

62-
* They can be reused. Docker keeps track of all the layers you've pulled. So, if two images happen to have a layer in common (for example, if two images are built form the same base box), Docker will reuse the common parts, and only pull the diffs.
62+
* They can be reused. Docker keeps track of all the layers you've pulled. So, if two images happen to have a layer in common (for example, if two images are built from the same base box), Docker will reuse the common parts, and only pull the diffs.
6363
* The layers are always additive, which can lead to really big sizes if you're not careful. For example, if you download a large file, make a commit, delete the file, and then make another commit, that large file will still be present in the layer history. We'll come back to this idea again, so don't worry if it doesn't make too much sense right now. Just remember that layers are always additive.
6464

public/dockerhub.md

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -12,15 +12,15 @@ There are two key ways to interact with the Docker Hub:
1212
* The Web interface, where you can register, manage image metadata (description, etc), add or remove collaborators, and so forth. This is similar to GitHub.
1313
* The docker command line tool, where you can pull, push, or search for images. This is similar to git.
1414

15-
There are a number of features specific Docker. One of the most interesting, [trusted builds](http://blog.docker.com/2013/11/introducing-trusted-builds/), allow you to create signed images based on a Dockerfile in GitHub or BitBucket. As with a CI/CD tool, the trusted build is triggered by a post commit hook on your repo so that your image will also be up to date with your codebase. In addition, the image is flagged with a "trusted build" badge so that you can verity its source.
15+
There are a number of features specific to Docker. One of the most interesting, [trusted builds](http://blog.docker.com/2013/11/introducing-trusted-builds/), allow you to create signed images based on a Dockerfile in GitHub or BitBucket. As with a CI/CD tool, the trusted build is triggered by a post commit hook on your repo so that your image will also be up to date with your codebase. In addition, the image is flagged with a "trusted build" badge so that you can verity its source.
1616

1717
## Create an account
1818

19-
The first to using Docker hub is to sign up, which you can do on their [Signup page](https://hub.docker.com/account/signup/). You'll be asked for an email address, username, and a password. Once you login, you'll see a project dashboard that's similar to other hosting sites:
19+
The first step to using Docker Hub is to sign up, which you can do on their [Signup page](https://hub.docker.com/account/signup/). You'll be asked for an email address, username, and a password. Once you log in, you'll see a project dashboard that's similar to other hosting sites:
2020

2121
<img src="images/docker-hub.png"/>
2222

23-
Once you've set up your account, you use the `docker login` command from your terminal so that you can pull and push images from your account. (Note that you can also register with this command, as well, if you want to not use the site.) Once you login, your docker will store your credentials in a file called `.dockercfg` in your home directory.
23+
Once you've set up your account, you use the `docker login` command from your terminal so that you can pull and push images from your account. (Note that you can also register with this command, as well, if you want to not use the site.) Once you log in, Docker will store your credentials in a file called `.dockercfg` in your home directory.
2424

2525
## Searching for images
2626

@@ -82,14 +82,14 @@ As discussed in the chapter on images, you can also pull only the layers of the
8282

8383
## Pushing an Image
8484

85-
Let's try to push an image to the hub. Unlike the previous `search` and `pull` commands, you must be logged in to push. If you're not already logged in, Docker will prompt you for your credentials
85+
Let's try to push an image to the Hub. Unlike the previous `search` and `pull` commands, you must be logged in to push. If you're not already logged in, Docker will prompt you for your credentials
8686

8787
```
8888
$ docker push simple_flask:latest
8989
2014/09/03 12:42:10 You cannot push a "root" repository. Please rename your repository in <user>/<repo> (ex: odewahn/simple_flask:latest)
9090
```
9191

92-
This rather self-explanatory error occurs because we didn't specify a username when we created the image. To push to the Docker Hub, though, you must specify a username. (Unless you're luck enough to be making Docker's official images, in which case you probably don't need this book!). So, let's add our username using the `docker tag` command:
92+
This rather self-explanatory error occurs because we didn't specify a username when we created the image. To push to the Docker Hub, though, you must specify a username. (Unless you're lucky enough to be making Docker's official images, in which case you probably don't need this book!) So, let's add our username using the `docker tag` command:
9393

9494
```
9595
$ docker tag simple_flask odewahn/simple_flask

public/example.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ Now that we've got the basics, let's make something a tiny bit more realistic: a
99
* Start a new container based on our image
1010
* Access our app using a browser
1111

12-
Again, the point here is not to show the best way to set up an environment, but instead to illustrate the Docker commands and what they do. I'll code development environments in more detail later.
12+
Again, the point here is not to show the best way to set up an environment, but instead to illustrate the Docker commands and what they do. I'll cover development environments in more detail later.
1313

1414
## Start the "simple\_flask" container
1515

public/ipython-notebook.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@ $ boot2docker stop
4242

4343
## Start a container
4444

45-
Once you've got the image built, you're almost there. Change int the directory that contains your notebooks and run this command. *NB: you need Docker 1.3+ on a Mac or Linux for this to work* :
45+
Once you've got the image built, you're almost there. Change into the directory that contains your notebooks and run this command. *NB: you need Docker 1.3+ on a Mac or Linux for this to work* :
4646

4747
```
4848
docker run -it \

0 commit comments

Comments
 (0)