Skip to content

Commit ba0974e

Browse files
committed
added a deploy script and terminology section
1 parent 01967bf commit ba0974e

File tree

3 files changed

+36
-4
lines changed

3 files changed

+36
-4
lines changed

README.md

Lines changed: 14 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -49,6 +49,7 @@ This document contains a series of several sections, each of which explains a pa
4949
- [Setting up your computer](#setup)
5050
- [1.0 Playing with Busybox](#busybox)
5151
- [1.1 Docker Run](#dockerrun)
52+
- [1.2 Terminology](#terminology)
5253
- [Additional Resources](#resources)
5354
- [References](#references)
5455

@@ -107,7 +108,7 @@ ___________
107108

108109
<a href="#table-of-contents" class="top" id="preface">Top</a>
109110
<a id="busybox"></a>
110-
## Playing with Busybox
111+
## 1.0 Playing with Busybox
111112
Now that we have everything setup, it's time to get our hands dirty. In this section, we are going to run a [Busybox](https://en.wikipedia.org/wiki/BusyBox) (a lightweight linux distribution) container on our system and get a taste of the `docker run` command.
112113

113114
To get started, let's run the following in our terminal
@@ -164,14 +165,25 @@ Running the `run` command with the `-it` flags attaches us to an interactive tty
164165

165166
> **Danger Zone**: If you're feeling particularly adventureous you can try `rm -rf bin` in the container. Make sure you run this command in the container and **not** in your laptop. Doing this will not make any other commands like `ls`, `echo` work. Once everything stop working you can exit the container and then run it back up again with the `docker run -it busybox sh` command. Since docker creates a new container everytime, everything should start working back again.
166167
167-
The `docker run` command is going to be command you'll be using the most so it makes sense to explore it in more detail.
168+
So that was a whirlwind tour of the mighty `docker run` command which would most likely be the command you'll most often. Hence it makes sense to spend some time getting comfortable with it. To find out more about `run`, use `docker run --help` to see a list of all flags it supports. As we proceed further, we'll see a few more variants of `docker run`.
169+
170+
<a id="terminology"></a>
171+
### 1.2 Terminology
172+
In the last section, we used a lot of docker-specific jargon which might be confusing to some. So before we go further, let me clarify some terminology that is used frequently in the docker ecosystem.
173+
174+
- *Images* - The blueprints of our application. Form the basis of containers.
175+
- *Containers* - Created from docker images and run the actual application.
176+
- *Docker Daemon* - The background service running on the host that manages building, running and distributing docker containers
177+
- *Docker Client* - The command line tool that allows the user to interact with the daemon.
178+
- *Docker hub* - A [registry](https://hub.docker.com/explore/) of docker images.
168179

169180

170181
___________
171182
<a href="#table-of-contents" class="top" id="preface">Top</a>
172183
<a id="resources"></a>
173184
## Additional Resources
174185
- [Hello Docker Workshop](http://docker.atbaker.me/)
186+
- [Building a microservice with Node.js and Docker](https://www.youtube.com/watch?v=PJ95WY2DqXo)
175187

176188
<a href="#table-of-contents" class="top" id="preface">Top</a>
177189
<a id="references"></a>

deploy

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,8 @@
1+
#!/bin/bash
2+
3+
git checkout gh-pages
4+
git merge master -m "merging master"
5+
git push origin gh-pages
6+
git checkout master
7+
8+
echo "Deployed on http://prakhar.me/docker-curriculum"

index.html

Lines changed: 14 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -361,6 +361,7 @@ <h2 id="table-of-contents">Table of Contents</h2>
361361
</li>
362362
<li><a href="#busybox">1.0 Playing with Busybox</a><ul>
363363
<li><a href="#dockerrun">1.1 Docker Run</a></li>
364+
<li><a href="#terminology">1.2 Terminology</a></li>
364365
</ul>
365366
</li>
366367
<li><a href="#resources">Additional Resources</a></li>
@@ -411,7 +412,7 @@ <h5 id="java">Java</h5>
411412
<hr />
412413
<p><a href="#table-of-contents" class="top" id="preface">Top</a>
413414
<a id="busybox"></a></p>
414-
<h2 id="playing-with-busybox">Playing with Busybox</h2>
415+
<h2 id="10-playing-with-busybox">1.0 Playing with Busybox</h2>
415416
<p>Now that we have everything setup, it's time to get our hands dirty. In this section, we are going to run a <a href="https://en.wikipedia.org/wiki/BusyBox">Busybox</a> (a lightweight linux distribution) container on our system and get a taste of the <code>docker run</code> command.</p>
416417
<p>To get started, let's run the following in our terminal </p>
417418
<pre><code>$ docker pull busybox
@@ -463,13 +464,24 @@ <h3 id="11-docker-run">1.1 Docker Run</h3>
463464
<blockquote>
464465
<p><strong>Danger Zone</strong>: If you're feeling particularly adventureous you can try <code>rm -rf bin</code> in the container. Make sure you run this command in the container and <strong>not</strong> in your laptop. Doing this will not make any other commands like <code>ls</code>, <code>echo</code> work. Once everything stop working you can exit the container and then run it back up again with the <code>docker run -it busybox sh</code> command. Since docker creates a new container everytime, everything should start working back again.</p>
465466
</blockquote>
466-
<p>The <code>docker run</code> command is going to be command you'll be using the most so it makes sense to explore it in more detail.</p>
467+
<p>So that was a whirlwind tour of the mighty <code>docker run</code> command which would most likely be the command you'll most often. Hence it makes sense to spend some time getting comfortable with it. To find out more about <code>run</code>, use <code>docker run --help</code> to see a list of all flags it supports. As we proceed further, we'll see a few more variants of <code>docker run</code>.</p>
468+
<p><a id="terminology"></a></p>
469+
<h3 id="12-terminology">1.2 Terminology</h3>
470+
<p>In the last section, we used a lot of docker-specific jargon which might be confusing to some. So before we go further, let me clarify some terminology that is used frequently in the docker ecosystem.</p>
471+
<ul>
472+
<li><em>Images</em> - The blueprints of our application. Form the basis of containers.</li>
473+
<li><em>Containers</em> - Created from docker images and run the actual application.</li>
474+
<li><em>Docker Daemon</em> - The background service running on the host that manages building, running and distributing docker containers</li>
475+
<li><em>Docker Client</em> - The command line tool that allows the user to interact with the daemon.</li>
476+
<li><em>Docker hub</em> - A <a href="https://hub.docker.com/explore/">registry</a> of docker images. </li>
477+
</ul>
467478
<hr />
468479
<p><a href="#table-of-contents" class="top" id="preface">Top</a>
469480
<a id="resources"></a></p>
470481
<h2 id="additional-resources">Additional Resources</h2>
471482
<ul>
472483
<li><a href="http://docker.atbaker.me/">Hello Docker Workshop</a></li>
484+
<li><a href="https://www.youtube.com/watch?v=PJ95WY2DqXo">Building a microservice with Node.js and Docker</a></li>
473485
</ul>
474486
<p><a href="#table-of-contents" class="top" id="preface">Top</a>
475487
<a id="references"></a></p>

0 commit comments

Comments
 (0)