Merge branch 'master' into ci-cd-bigdata-chapters

Author: fabianenardon

beginner/chapters/votingapp.md

@@ -82,7 +82,7 @@ services:
     depends_on:
       - db
     deploy:
-      replicas: 2
+      replicas: 1
       update_config:
         parallelism: 2
         delay: 10s
@@ -103,6 +103,8 @@ services:
         delay: 10s
         max_attempts: 3
         window: 120s
+      placement:
+        constraints: [node.role == manager]
 
   visualizer:
     image: manomarks/visualizer
@@ -111,6 +113,9 @@ services:
     stop_grace_period: 1m30s
     volumes:
       - "/var/run/docker.sock:/var/run/docker.sock"
+    deploy:
+      placement:
+        constraints: [node.role == manager]
 
 networks:
   frontend:

beginner/chapters/webapps.md

@@ -6,10 +6,10 @@ Great! So you have now looked at `docker run`, played with a Docker container an
 
 Let's start by taking baby-steps. First, we'll use Docker to run a static website in a container. The website is based on an existing image. We'll pull a Docker image from Docker Hub, run the container, and see how easy it is to set up a web server.
 
-The image that you are going to use is a single-page website that was already created for this demo and is available on the Docker Hub as [`seqvence/static-site`](https://hub.docker.com/r/seqvence/static-site/). You can download and run the image directly in one go using `docker run` as follows.
+The image that you are going to use is a single-page website that was already created for this demo and is available on the Docker Hub as [`dockersamples/static-site`](https://hub.docker.com/r/dockersamples/static-site/). You can download and run the image directly in one go using `docker run` as follows.
 
 ```
-$ docker run -d seqvence/static-site
+$ docker run -d dockersamples/static-site
 ```
 
 >**Note:** The current version of this image doesn't run without the `-d` flag. The `-d` flag enables **detached mode**, which detaches the running container from the terminal/shell and returns your prompt after the container starts. We are debugging the problem with this image but for now, use `-d` even for this first example.
@@ -31,7 +31,7 @@ Since we ran the container in detached mode, we don't have to launch another ter
 ```
 $ docker ps
 CONTAINER ID        IMAGE                  COMMAND                  CREATED             STATUS              PORTS               NAMES
-a7a0e504ca3e        seqvence/static-site   "/bin/sh -c 'cd /usr/"   28 seconds ago      Up 26 seconds       80/tcp, 443/tcp     stupefied_mahavira
+a7a0e504ca3e        dockersamples/static-site   "/bin/sh -c 'cd /usr/"   28 seconds ago      Up 26 seconds       80/tcp, 443/tcp     stupefied_mahavira
 ```
 
 Check out the `CONTAINER ID` column. You will need to use this `CONTAINER ID` value, a long sequence of characters, to identify the container you want to stop, and then to remove it. The example below provides the `CONTAINER ID` on our system; you should use the value that you see in your terminal.
@@ -45,7 +45,7 @@ $ docker rm   a7a0e504ca3e
 Now, let's launch a container in **detached** mode as shown below:
 
 ```
-$ docker run --name static-site -e AUTHOR="Your Name" -d -P seqvence/static-site
+$ docker run --name static-site -e AUTHOR="Your Name" -d -P dockersamples/static-site
 e61d12292d69556eabe2a44c16cbd54486b2527e2ce4f95438e504afb7b02810
 ```
 
@@ -78,7 +78,7 @@ You can now open `http://<YOUR_IPADDRESS>:[YOUR_PORT_FOR 80/tcp]` to see your si
 You can also run a second webserver at the same time, specifying a custom host port mapping to the container's webserver.
 
 ```
-$ docker run --name static-site-2 -e AUTHOR="Your Name" -d -p 8888:80 seqvence/static-site
+$ docker run --name static-site-2 -e AUTHOR="Your Name" -d -p 8888:80 dockersamples/static-site
 ```
 <img src="../images/static.png" title="static">
 
@@ -96,7 +96,7 @@ $ docker rm static-site
 Let's use a shortcut to remove the second site:
 
 ```
-$ docker rm -f static-site static-site-2
+$ docker rm -f static-site-2
 ```
 
 Run `docker ps` to make sure the containers are gone.
@@ -109,12 +109,12 @@ CONTAINER ID        IMAGE               COMMAND             CREATED
 
 In this section, let's dive deeper into what Docker images are. You will build your own image, use that image to run an application locally, and finally, push some of your own images to Docker Hub.
 
-Docker images are the basis of containers. In the previous example, you **pulled** the *seqvence/static-site* image from the registry and asked the Docker client to run a container **based** on that image. To see the list of images that are available locally on your system, run the `docker images` command.
+Docker images are the basis of containers. In the previous example, you **pulled** the *dockersamples/static-site* image from the registry and asked the Docker client to run a container **based** on that image. To see the list of images that are available locally on your system, run the `docker images` command.
 
 ```
 $ docker images
 REPOSITORY             TAG                 IMAGE ID            CREATED             SIZE
-seqvence/static-site   latest              92a386b6e686        2 hours ago        190.5 MB
+dockersamples/static-site   latest              92a386b6e686        2 hours ago        190.5 MB
 nginx                  latest              af4b3d7d5401        3 hours ago        190.5 MB
 python                 2.7                 1c32174fd534        14 hours ago        676.8 MB
 postgres               9.4                 88d845ac7a88        14 hours ago        263.6 MB

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

@@ -4,16 +4,19 @@
 
 This section describes the hardware and software needed for this workshop, and how to configure them. This workshop is designed for a BYOL (Brying Your Own Laptop) style hands-on-lab.
 
-== Hardware
+== Hardware & Software
 
-. Operating System: Mac OS X (10.10+), Windows 10 Pro+, Ubuntu 12+, CentOS 7+
-. Memory: At least 4 GB+, preferred 8 GB
+. Memory: At least 4 GB+, strongly preferred 8 GB
+. Operating System: Mac OS X (10.10.3+), Windows 10 Pro+ 64-bit, Ubuntu 12+, CentOS 7+.
++
+NOTE: An older version of the operating system may be used. The installation instructions would differ slightly in that case and are explained in the next section.
+. Amazon Web Services credentials with https://docs.docker.com/docker-for-aws/iam-permissions/[following permissions]. This is only needed for some parts of the workshop.
 
 == Install Docker
 
 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]. 
+NOTE: Docker Community Edition 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]. 
 
 === Additional components
 
@@ -23,7 +26,7 @@ Install the following additional components:
 
 === Docker Toolbox Notes
 
-Skip this section if you are not using Docker Toolbox for Mac or Windows.
+Skip this section if you are using Docker Community Edition.
 
 . *Default Docker Machine*: Docker Toolbox creates a Docker Machine named `default`. To make it easier to start/stop the containers, an entry is added into the host mapping table of your operating system. 
 +
@@ -36,7 +39,7 @@ docker-machine ip default
 This will provide the IP address associated with the Docker Machine created by Toolbox.
 +
 Edit `/etc/hosts` (Mac OS) or `C:\Windows\System32\drivers\etc\hosts` (Windows) and add:
-
++
 [source, text]
 ----
 <IP ADDRESS>  dockerhost

developer-tools/java/chapters/ch03-build-image.adoc

@@ -43,10 +43,16 @@ This image uses `ubuntu` as the base image. `CMD` command defines the command th
 
 Build the image using the command:
 
+[source, text]
+----
   docker image build . -t helloworld
+----
 
 `.` in this command is the context for `docker image build`. `-t` adds a tag to the image.
 
+
+The following output is shown:
+
 [source, text]
 ----
 Sending build context to Docker daemon 2.048 kB

developer-tools/java/chapters/ch04-run-container.adoc

@@ -126,7 +126,7 @@ If you want the container to accept incoming connections, you will need to provi
 
 [source, text]
 ----
-docker container stop `docker conatiner ps | grep wildfly | awk '{print $1}'`
+docker container stop `docker container ps | grep wildfly | awk '{print $1}'`
 ----
 
 Restart the container as:

developer-tools/java/chapters/ch05-compose.adoc

@@ -63,7 +63,7 @@ In this Compose file:
 . Image name for each service defined using `image` attribute
 . The `arungupta/couchbase:travel` image starts Couchbase server, configures it using http://developer.couchbase.com/documentation/server/current/rest-api/rest-endpoints-all.html[Couchbase REST API], and loads a sample bucket
 . The `arungupta/couchbase-javaee:travel` image starts WildFly and deploys application WAR file built from https://github.com/arun-gupta/couchbase-javaee. Clone that project if you want to build your own image.
-. `envrionment` attribute defines environment variables accessible by the application deployed in WildFly. `COUCHBASE_URI` refers to the database service. This is used in the application code as shown at https://github.com/arun-gupta/couchbase-javaee/blob/master/src/main/java/org/couchbase/sample/javaee/Database.java.
+. `environment` attribute defines environment variables accessible by the application deployed in WildFly. `COUCHBASE_URI` refers to the database service. This is used in the application code as shown at https://github.com/arun-gupta/couchbase-javaee/blob/master/src/main/java/org/couchbase/sample/javaee/Database.java.
 . Port forwarding is achieved using `ports` attribute
 . `depends_on` attribute allows to express dependency between services. In this case, Couchbase will be started before WildFly. Application-level health are still user's responsibility.
 

developer-tools/java/chapters/ch10-monitoring.adoc

@@ -220,13 +220,14 @@ https://github.com/google/cadvisor[cAdvisor] (Container Advisor) provides resour
 . Run `cAdvisor`
 +
 ```
-docker run \
-  -d \
-  --name=cadvisor \
-  -p 8080:8080 \
+docker container run \
+  --volume=/:/rootfs:ro \
   --volume=/var/run:/var/run:rw \
   --volume=/sys:/sys:ro \
   --volume=/var/lib/docker/:/var/lib/docker:ro \
+  --publish=8080:8080 \
+  --detach=true \
+  --name=cadvisor \
   google/cadvisor:latest
 ```
 +

windows/windows-containers/MultiContainerApp.md

@@ -1,6 +1,6 @@
 ## Multi-Container Applications
 
-This tutorial will walk you through using the sample Music Store application with Windows containers. The Music Store application is a standard .NET sample application, available in the [aspnet GitHub repository](https://github.com/aspnet/MusicStore "Music Store application"). We've [forked it](https://github.com/friism/MusicStore "link to forked version of Music Store App") to use Windows Containers.
+This tutorial will walk you through using the sample Music Store application with Windows containers. The Music Store application is a standard .NET sample application, available in the [aspnet GitHub repository](https://github.com/aspnet/MusicStore "Music Store application"). We've [forked it](https://github.com/dockersamples/dotnet-musicstore "link to forked version of Music Store App") to use Windows Containers.
 
 ## Using docker-compose on Windows
 Docker Compose is a great way develop complex multi-container consisting of databases, queues and web frontends.
@@ -14,7 +14,7 @@ Invoke-WebRequest https://github.com/docker/compose/releases/download/1.11.1/doc
 To try out Compose on Windows, clone a variant of the ASP.NET Core MVC MusicStore app, backed by a SQL Server Express 2016 database.
 
 ```
-git clone https://github.com/friism/Musicstore
+git clone https://github.com/dockersamples/dotnet-musicstore
 ...
 cd Musicstore
 docker-compose -f .\docker-compose.windows.yml build