Merge remote-tracking branch 'upstream/master'

Author: sixeyed

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'
   }
 };
 ```

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/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.
 

beginner/chapters/votingapp.md

@@ -133,7 +133,7 @@ Creating service vote_worker
 Creating service vote_redis
 Creating service vote_db
 ```
-to verify your stack has deployed, use `docker stack services`
+to verify your stack has deployed, use `docker stack services vote`
 ```
 docker stack services vote
 ID            NAME         MODE        REPLICAS  IMAGE

beginner/chapters/webapps.md

@@ -459,7 +459,11 @@ Here's a quick summary of the few basic commands we used in our Dockerfile.
   CMD ["/bin/bash", "echo", "Hello World"]
 ```
 
-* `EXPOSE` opens ports in your image to allow communication to the outside world when it runs in a container.
+* `EXPOSE` creates a hint for users of an image which ports provide services. It is included in the information which
+ can be retrieved via `$ docker inspect <container-id>`.     
+
+>**Note:** The `EXPOSE` command does not actually make any ports accessible to the host! Instead, this requires 
+publishing ports by means of the `-p` flag when using `$ docker run`.  
 
 * `PUSH` pushes your image to Docker Hub, or alternately to a [private registry](TODO: add URL)
 

developer-tools/java-debugging/Eclipse-README.md

@@ -154,13 +154,28 @@ Try to log into the application. Look at the value for password in the Eclipse v
 
 In this MVC application the UserController uses the findByLogin method in the UserServiceImpl class which uses the findByUsername method to retrieve the information from the database. It then checks to see if the password from the form matches the user password. Since the password from the login form is not scrambled using ROT13, it does not match the user password and you cannot log into the application.
 
-To fix this, apply ROT13 to the password by adding
+To fix this, apply ROT13 to the password by adding an import near the top of the file
 
 ```
-import com.docker.UserSignup.utit.Rot13
+import com.docker.UserSignup.util.Rot13
+```
+
+and replace the contents of `findByLogin` with
 
-String passwd = Rot13.rot13(password);
 ```
+public boolean findByLogin(String userName, String password) {  
+    User usr = userRepository.findByUserName(userName);
+
+    String passwd = Rot13.rot13(password);
+
+    if(usr != null && usr.getPassword().equals(passwd)) {
+        return true;
+    }
+
+    return false;
+}
+```
+
 ![](images/eclipse_debug_UserServiceImpl_code.png)
 
 Set a breakpoint in UserServiceImpl on the findByLogin method. Log in again and look at the values for the breakpoint. The 'passwd' variable is `z0ol` which matches the password for the user moby.

developer-tools/java/chapters/appa-common-commands.adoc

@@ -17,19 +17,19 @@ Here is the list of commonly used Docker commands:
 | Remove all images | `docker image rm $(docker image ls -aq)`
 2+^s| Containers
 | Run a container | `docker container run`
-| List of running containers | `docker container ps`
-| List of all containers | `docker container ps -a`
+| List of running containers | `docker container ls`
+| List of all containers | `docker container ls -a`
 | Stop a container | `docker container stop ${CID}`
-| Stop all running containers | `docker container stop $(docker container ps -q)`
-| List all exited containers with status 1 | `docker container ps -a --filter "exited=1"`
+| Stop all running containers | `docker container stop $(docker container ls -q)`
+| List all exited containers with status 1 | `docker container ls -a --filter "exited=1"`
 | Remove a container | `docker container rm ${CID}`
-| Remove container by a regular expression | `docker container ps -a \| grep wildfly \| awk '{print $1}' \| xargs docker container rm -f`
-| Remove all exited containers | `docker container rm -f $(docker container ps -a \| grep Exit \| awk '{ print $1 }')`
-| Remove all containers | `docker container rm $(docker container ps -aq)`
+| Remove container by a regular expression | `docker container ls -a \| grep wildfly \| awk '{print $1}' \| xargs docker container rm -f`
+| Remove all exited containers | `docker container rm -f $(docker container ls -a \| grep Exit \| awk '{ print $1 }')`
+| Remove all containers | `docker container rm $(docker container ls -aq)`
 | Find IP address of the container | `docker container inspect --format '{{ .NetworkSettings.IPAddress }}' ${CID}`
 | Attach to a container | `docker container attach ${CID}`
 | Open a shell in to a container | `docker container 	exec -it ${CID} bash`
-| Get container id for an image by a regular expression | `docker container ps \| grep wildfly \| awk '{print $1}'`
+| Get container id for an image by a regular expression | `docker container ls \| grep wildfly \| awk '{print $1}'`
 |==================
 
 === Exit code status

developer-tools/java/chapters/ch01-setup.adoc

@@ -11,18 +11,10 @@ This section describes the hardware and software needed for this workshop, and h
 
 == Install Docker
 
-Docker runs natively on Mac, Windows and Linux. Follow the instructions to install Docker:
-
-. https://docs.docker.com/docker-for-mac/[Mac]
-. https://docs.docker.com/docker-for-windows/[Windows]
-. https://docs.docker.com/engine/installation/linux/centos/[Centos]
-. https://docs.docker.com/engine/installation/linux/debian/[Debian]
-. https://docs.docker.com/engine/installation/linux/ubuntulinux/[Ubuntu]
+Docker runs natively on Mac, Windows and Linux. This lab will use https://www.docker.com/community-edition[Docker Community Edition]. Follow the https://www.docker.com/community-edition[instructions] to install Docker.
 
 NOTE: Docker for Mac and Windows have requirements for a fairly recent operating system version. If your machine does not meet these requirements, then you need to install https://www.docker.com/products/docker-toolbox[Docker Toolbox]. 
 
-Complete set of operating systems are listed at http://docs.docker.com/engine/installation/[Install Docker Engine].
-
 === Additional components
 
 Install the following additional components: