Merge pull request docker#291 from arun-gupta/dockercon

Dockercon
trapier · Jun 9, 2017 · d05486e · d05486e
2 parents 07a80e3 + bed4b8b
commit d05486e
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 0 deletions.
diff --git a/developer-tools/java/chapters/ch01-setup.adoc b/developer-tools/java/chapters/ch01-setup.adoc
@@ -20,6 +20,8 @@ NOTE: Docker Community Edition have requirements for a fairly recent operating s
 
 === Additional components
 
+If Docker is installed using Docker Community Edition or Docker Toolbox, then this section is not required.
+
 Install the following additional components:
 
 . https://docs.docker.com/compose/install/[Docker Compose]
@@ -59,6 +61,8 @@ Download the file from https://raw.githubusercontent.com/docker/labs/master/deve
 docker-compose -f docker-compose-pull-images.yml pull --parallel
 ```
 
+NOTE: `--parallel` switch will not work for Docker Compose version prior to 1.12. If you are using an older version then remove the `--parallel` switch.
+
 NOTE: For Linux, `docker-compose` and `docker` commands need `sudo` access. So prefix all commands with `sudo`.
 
 === Other Software

diff --git a/developer-tools/java/chapters/ch03-build-image.adoc b/developer-tools/java/chapters/ch03-build-image.adoc
@@ -257,6 +257,8 @@ b3b0e4> Hello World!
 
 This is similar output when running the Java application using `java` CLI or the Docker container using `docker run` command.
 
+The container is running in the foreground. Use `Ctrl` + `C` to interrupt the container and return back to terminal.
+
 Only one change was required in the project to enable Docker packaging and running. A Maven profile is added in `pom.xml`:
 
 [source, text]