issu docker#225

Author: spara

.github/ISSUE_TEMPLATE

@@ -0,0 +1,45 @@
+** PLEASE ONLY USE THIS ISSUE TRACKER TO SUBMIT ISSUES WITH THE DOCKER LABS TUTORIAL CONTENT **
+
+* If you have a bug working with Docker itself, not related to these labs, please file the bug on the [Docker repo](https://github.com/docker/docker) *
+* If you would like general support figuring out how to do something with Docker, please use the Docker Slack channel. If you're not on that channel, sign up for the [Docker Community](http://dockr.ly/MeetUp) and you'll get an invite. *
+* Or go to the [Docker Forums](https://forums.docker.com/) *
+
+Please provide the following information so we can assess the issue you're having
+
+**Which lab is it that you're having issues with?**
+
+<!--
+Title or URL of the lab
+-->
+**Description**
+
+<!--
+Briefly describe the problem you are having in a few paragraphs.
+-->
+
+**Steps to reproduce the issue, if relevant:**
+1.
+2.
+3.
+
+**Describe the results you received:**
+
+
+**Describe the results you expected:**
+
+
+**Additional information you deem important (e.g. issue happens only occasionally):**
+
+**Output of `docker version`:**
+
+```
+(paste your output here)
+```
+
+**Output of `docker info`:**
+
+```
+(paste your output here)
+```
+
+**Additional environment details (AWS, Docker for Mac, Docker for Windows, VirtualBox, physical, etc.):**

.gitignore

@@ -1 +1,2 @@
 .vscode/
+.DS_Store

12factor/03_configuration.md

@@ -10,7 +10,7 @@ In _config/connections.js_, we define the _mongo_ connection and use MONGO_URL e
 module.exports.connections = {
   mongo: {
      adapter: 'sails-mongo',
-     url: process.env.MONGO_URL'
+     url: 'process.env.MONGO_URL'
   }
 };
 ```

12factor/05_build_release_run.md

@@ -50,7 +50,7 @@ There are several options to inject the configuration in the build, among them
 We'll go for the second option and define a docker-compose file where the MONGO_URL will be set with the value of the execution environment
 
 ```
-version: '2'
+version: '3'
 services:
   mongo:
     image: mongo:3.2

12factor/06_processes.md

@@ -32,7 +32,7 @@ Once done, the app needs to be rebuilt `docker build -t message-app:v0.2 .`
 **REDIS_HOST** needs to be added to the docker-compose file as the new release will run against this kv store.
 
 ```
-version: '2'
+version: '3'
 services:
   mongo:
     image: mongo:3.2

12factor/07_port_binding.md

@@ -11,7 +11,7 @@ The host has the responsibility to route the request to the correct application
 Docker already handles that for us, as we can see in the docker-compose file. The **app** container exposes port 80 internally and the host maps it against its port 8000.
 
 ```
-version: '2'
+version: '3'
 services:
   mongo:
     image: mongo:3.2

12factor/08_concurrency.md

@@ -7,7 +7,7 @@ The app can be seen as a set of processes of different types
 * worker
 * cron
 
-Each process needs to be able to scale horizontally, it can have it's own internal multiplexing.
+Each process needs to be able to scale horizontally, it can have its own internal multiplexing.
 
 ## What does that mean for our application ?
 

README.md

@@ -3,7 +3,7 @@
 This repo contains [Docker](https://docker.com) labs and tutorials authored both by Docker, and by members of the community. We welcome contributions and want to grow the repo.
 
 #### Docker tutorials:
-* [Docker for beginners] (beginner/readme.md)
+* [Docker for beginners](beginner/readme.md)
 * [Docker Swarm Mode](swarm-mode/README.md)
 * [Configuring developer tools and programming languages](developer-tools/README.md)
   * Java
@@ -20,7 +20,7 @@ This repo contains [Docker](https://docker.com) labs and tutorials authored both
 
 #### Community tutorials
 * [Docker Tutorials from the Community](https://github.com/docker/community/tree/master/Docker-Meetup-Content) - links to a different repository
-* [Advanced Docker orchestration workshop] (https://github.com/docker/labs/tree/master/Docker-Orchestration) - links to a different repository
+* [Advanced Docker orchestration workshop](https://github.com/docker/labs/tree/master/Docker-Orchestration) - links to a different repository
 
 For more information on Docker, see the Official [Docker documentation](https://docs.docker.com).
 

beginner/chapters/alpine.md

@@ -30,7 +30,13 @@ drwxr-xr-x    5 root     root          4096 Mar  2 16:20 lib
 ......
 ......
 ```
-What happened? Behind the scenes, a lot of stuff happened. When you call `run`, the Docker client finds the image (alpine in this case), creates the container and then runs a command in that container. When you run `docker run alpine`, you provided a command (`ls -l`), so Docker started the command specified and you saw the listing.
+What happened? Behind the scenes, a lot of stuff happened. When you call `run`, 
+1. The Docker client contacts the Docker daemon
+2. The Docker daemon dowloads the image (alpine in this case) from Docker Hub
+3. The Docker daemon creates the container and then runs a command in that container. 
+4. The Docker daemon streams the output of the command to the Docker client
+
+When you run `docker run alpine`, you provided a command (`ls -l`), so Docker started the command specified and you saw the listing.
 
 Let's try something more exciting.
 

beginner/chapters/setup.md

@@ -8,7 +8,7 @@ Getting all the tooling setup on your computer can be a daunting task, but getti
 
 The *getting started* guide on Docker has detailed instructions for setting up Docker on [Mac](https://docs.docker.com/docker-for-mac/), [Linux](https://docs.docker.com/engine/installation/linux/) and [Windows](https://docs.docker.com/docker-for-windows/).
 
-*If you're using Docker for Windows* make sure you have [shared your drive](https://docs.docker.com/docker-for-windows/#/shared-drives).
+*If you're using Docker for Windows* make sure you have [shared your drive](https://docs.docker.com/docker-for-windows/#shared-drives).
 
 *Important note* If you're using an older version of Windows or MacOS you may need to use [Docker Machine](https://docs.docker.com/machine/overview/) instead.