From 11316350064f2ece0f83237506cbb83d676e7a04 Mon Sep 17 00:00:00 2001
From: Bridget Kromhout <bridget@kromhout.org>
Date: Tue, 10 Apr 2018 11:52:52 -0500
Subject: [PATCH 1/2] Stalling for time during download

---
 slides/common/sampleapp.md | 114 ++++++++++++++++++-------------------
 1 file changed, 57 insertions(+), 57 deletions(-)

diff --git a/slides/common/sampleapp.md b/slides/common/sampleapp.md
index cb159378..03a93b58 100644
--- a/slides/common/sampleapp.md
+++ b/slides/common/sampleapp.md
@@ -1,4 +1,59 @@
-# Our sample application
+# Getting our sample application source code
+
+- We will clone the GitHub repository onto our `node1`
+
+- The repository also contains scripts and tools that we will use through the workshop
+
+.exercise[
+
+<!--
+```bash
+if [ -d container.training ]; then
+  mv container.training container.training.$$
+fi
+```
+-->
+
+- Clone the repository on `node1`:
+  ```bash
+  git clone git://github.com/jpetazzo/container.training
+  ```
+
+]
+
+(You can also fork the repository on GitHub and clone your fork if you prefer that.)
+
+---
+
+## Downloading and running the application
+
+Let's start this before we look around, as downloading will take a little time...
+
+.exercise[
+
+- Go to the `dockercoins` directory, in the cloned repo:
+  ```bash
+  cd ~/container.training/dockercoins
+  ```
+
+- Use Compose to build and run all containers:
+  ```bash
+  docker-compose up
+  ```
+
+<!--
+```longwait units of work done```
+-->
+
+]
+
+Compose tells Docker to build all container images (pulling
+the corresponding base images), then starts all containers,
+and displays aggregated logs.
+
+---
+
+# More detail on our sample application
 
 - Visit the GitHub repository with all the materials of this workshop:
   <br/>https://github.com/jpetazzo/container.training
@@ -120,61 +175,6 @@ class: extra-details
 
 ---
 
-## Getting the application source code
-
-- We will clone the GitHub repository
-
-- The repository also contains scripts and tools that we will use through the workshop
-
-.exercise[
-
-<!--
-```bash
-if [ -d container.training ]; then
-  mv container.training container.training.$$
-fi
-```
--->
-
-- Clone the repository on `node1`:
-  ```bash
-  git clone git://github.com/jpetazzo/container.training
-  ```
-
-]
-
-(You can also fork the repository on GitHub and clone your fork if you prefer that.)
-
----
-
-# Running the application
-
-Without further ado, let's start our application.
-
-.exercise[
-
-- Go to the `dockercoins` directory, in the cloned repo:
-  ```bash
-  cd ~/container.training/dockercoins
-  ```
-
-- Use Compose to build and run all containers:
-  ```bash
-  docker-compose up
-  ```
-
-<!--
-```longwait units of work done```
--->
-
-]
-
-Compose tells Docker to build all container images (pulling
-the corresponding base images), then starts all containers,
-and displays aggregated logs.
-
----
-
 ## Our application at work
 
 - On the left-hand side, the "rainbow strip" shows the container names
@@ -299,5 +299,5 @@ class: extra-details
 
 Some containers exit immediately, others take longer.
 
-The containers that do not handle `SIGTERM` end up being killed after a 10s timeout.
+The containers that do not handle `SIGTERM` end up being killed after a 10s timeout. If we are very impatient, we can hit `^C` a second time!
 

From ba44603d0f38f14b2b737d5b205490da1d57de6d Mon Sep 17 00:00:00 2001
From: Bridget Kromhout <bridget@kromhout.org>
Date: Wed, 11 Apr 2018 06:53:01 -0500
Subject: [PATCH 2/2] Correcting title and slide section division

---
 slides/common/sampleapp.md | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/slides/common/sampleapp.md b/slides/common/sampleapp.md
index 03a93b58..a6cc03af 100644
--- a/slides/common/sampleapp.md
+++ b/slides/common/sampleapp.md
@@ -1,4 +1,4 @@
-# Getting our sample application source code
+# Our sample application
 
 - We will clone the GitHub repository onto our `node1`
 
@@ -53,7 +53,7 @@ and displays aggregated logs.
 
 ---
 
-# More detail on our sample application
+## More detail on our sample application
 
 - Visit the GitHub repository with all the materials of this workshop:
   <br/>https://github.com/jpetazzo/container.training