Renaming + adding first draft of exercise 6

Signed-off-by: Silvin Lubecki <[email protected]>
segaura · Dec 2, 2018 · 46a71a8 · 46a71a8
1 parent 8ef17a4
commit 46a71a8
Show file tree

Hide file tree

Showing 19 changed files with 69 additions and 5 deletions.
diff --git a/README.md b/README.md
@@ -1,2 +1,18 @@
-# dap-workshop-dceu18
-Docker Application Package Workshop for DockerCon Europe 2018
+# Docker Application Package Workshop for DockerCon Europe 2018
+
+Welcome to the Docker Application Package workshop. We prepared for you 6 exercises to discover and master `docker-app` and the Application Package.
+
+* [Exercise 1](exercises/exercise_1/README.md): Set up your environment
+* [Exercise 2](exercises/exercise_2/README.md): Write and Deploy a Compose file
+* [Exercise 3](exercises/exercise_3/README.md): Discover Docker Application Package
+* [Exercise 4](exercises/exercise_4/README.md): Configure your application with parameters
+* [Exercise 5](exercises/exercise_5/README.md): Install with docker-app
+* [Exercise 6](exercises/exercise_6/README.md): Share your application
+
+**Feel free to ask any question during this workshop.**
+
+Some useful references:
+* [Docker Application Package](https://github.com/docker/app) github repository
+* [Compose](https://github.com/docker/compose) github repository
+
+PR are welcomed!
diff --git a/exercises/exercise 1/README.md → exercises/exercise_1/README.md b/exercises/exercise 1/README.md → exercises/exercise_1/README.md
@@ -90,6 +90,8 @@ Status: Downloaded newer image for dapworkshop/workshop:latest
 
 Now the workshop can really start!
 
+## How to save your work
+
 **You may want to set a reminder to save your exercises locally before leaving the workshop. We will remind you at the end as well.**.
 
 For those using PWD, you can copy/paste the `SSH` address and use it to `SCP` (Secure File Copy through SSH) all your files:

diff --git a/exercises/exercise 1/confirmation.png → exercises/exercise_1/confirmation.png b/exercises/exercise 1/confirmation.png → exercises/exercise_1/confirmation.png
diff --git a/exercises/exercise 1/dockerhub-login.png → exercises/exercise_1/dockerhub-login.png b/exercises/exercise 1/dockerhub-login.png → exercises/exercise_1/dockerhub-login.png
diff --git a/exercises/exercise 1/pwd-create-instance.png → exercises/exercise_1/pwd-create-instance.png b/exercises/exercise 1/pwd-create-instance.png → exercises/exercise_1/pwd-create-instance.png
diff --git a/exercises/exercise 1/pwd-login.png → exercises/exercise_1/pwd-login.png b/exercises/exercise 1/pwd-login.png → exercises/exercise_1/pwd-login.png
diff --git a/exercises/exercise 1/pwd-start.png → exercises/exercise_1/pwd-start.png b/exercises/exercise 1/pwd-start.png → exercises/exercise_1/pwd-start.png
diff --git a/exercises/exercise 1/pwd.png → exercises/exercise_1/pwd.png b/exercises/exercise 1/pwd.png → exercises/exercise_1/pwd.png
diff --git a/exercises/exercise 1/sign-in.png → exercises/exercise_1/sign-in.png b/exercises/exercise 1/sign-in.png → exercises/exercise_1/sign-in.png
diff --git a/exercises/exercise 1/ssh.png → exercises/exercise_1/ssh.png b/exercises/exercise 1/ssh.png → exercises/exercise_1/ssh.png
diff --git a/exercises/exercise 2/README.md → exercises/exercise_2/README.md b/exercises/exercise 2/README.md → exercises/exercise_2/README.md
@@ -23,6 +23,17 @@ $ touch docker-compose.yml
 ```
 ![editor](editor.png)
 
+You should have a file like the following:
+```yaml
+version: '3.7'
+services:
+  hello:
+    image: hashicorp/http-echo:latest
+    command: ["-text", "Hello DockerCon", "-listen",":8080"]
+    ports:
+     - 8080:8080
+```
+
 ## Deploy your Compose file
 
 Now that we have a compose file, we need to deploy it. There are two ways to do this:

diff --git a/exercises/exercise 2/docker-compose.yml → exercises/exercise_2/docker-compose.yml b/exercises/exercise 2/docker-compose.yml → exercises/exercise_2/docker-compose.yml
diff --git a/exercises/exercise 2/editor-button.png → exercises/exercise_2/editor-button.png b/exercises/exercise 2/editor-button.png → exercises/exercise_2/editor-button.png
diff --git a/exercises/exercise 2/editor.png → exercises/exercise_2/editor.png b/exercises/exercise 2/editor.png → exercises/exercise_2/editor.png
diff --git a/exercises/exercise 2/open-port.png → exercises/exercise_2/open-port.png b/exercises/exercise 2/open-port.png → exercises/exercise_2/open-port.png
diff --git a/exercises/exercise 3/README.md → exercises/exercise_3/README.md b/exercises/exercise 3/README.md → exercises/exercise_3/README.md
@@ -1,4 +1,4 @@
-# Exercise - Docker Application Package Introduction
+# Exercise - Discover Docker Application Package
 
 > **Time**: Approximately 10 minutes
 

diff --git a/exercises/exercise 4/README.md → exercises/exercise_4/README.md b/exercises/exercise 4/README.md → exercises/exercise_4/README.md
@@ -1,4 +1,4 @@
-# Exercise - Parameters
+# Exercise - Configure your application with parameters
 
 > **Time**: Approximately 15 minutes
 

diff --git a/exercises/exercise 5/README.md → exercises/exercise_5/README.md b/exercises/exercise 5/README.md → exercises/exercise_5/README.md
@@ -1,4 +1,4 @@
-# Exercise - Deploy with docker-app
+# Exercise - Install with docker-app
 
 With this exerise you will learn how to deploy an application package using `docker-app`.
 

diff --git a/exercises/exercise_6/README.md b/exercises/exercise_6/README.md
@@ -0,0 +1,35 @@
+# Exercise - Share your application
+
+With this exercise you will learn how to share your application.
+
+Using the commands `push` and `pull`, you can share your bundle on any public or private registry.
+
+`docker-app` will create a manifest and push the `bundle.json` with it. It will also push the invocation image and reference it from the manifest. This is a totally valid way to create an image, compatible with the OCI reference, and then with all the registries (`docker hub`, `docker registry` or the enterprise `docker trust registry`).
+
+## `push` and `pull`
+
+```sh
+$ docker-app push --help
+
+Usage:  docker-app push [<app-name>] [flags]
+
+Push the application to a registry
+
+Options:
+      --insecure           Use insecure registry, without SSL
+      --namespace string   Namespace to use (default: namespace in metadata)
+      --repo string        Name of the remote repository (default: <app-name>.dockerapp)
+  -t, --tag string         Tag to use (default: version in metadata)
+```
+**NOTE** about the namespace: it is defined as a registry hostname+ the organisation or the user.
+* `--namespace=localhost:5000/myuser` to target a registry run locally
+* `--namespace=my.private.registry/myteam` to target a remote registry
+* `--namespace=myteam` to target the DockerHub
+
+
+
+## inspect
+
+## install
+
+## Summary