From b4b22ff47b9a6bc29183d0123138bdd403678fa3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=A9r=C3=B4me=20Petazzoni?= Date: Sun, 15 Oct 2017 23:01:46 +0200 Subject: [PATCH] Add `chat` variable to workshop YML files --- docs/concepts-k8s.md | 8 +++++--- docs/dockercon.yml | 2 ++ docs/kube.yml | 2 ++ docs/markmaker.py | 3 +-- docs/prereqs-k8s.md | 4 ++-- docs/prereqs.md | 4 ++-- docs/selfpaced.yml | 2 ++ docs/workshop.yml | 46 -------------------------------------------- 8 files changed, 16 insertions(+), 55 deletions(-) delete mode 100644 docs/workshop.yml diff --git a/docs/concepts-k8s.md b/docs/concepts-k8s.md index d97c8360..c69a74a0 100644 --- a/docs/concepts-k8s.md +++ b/docs/concepts-k8s.md @@ -112,7 +112,7 @@ class: pic
(that's an implementation detail) -- `etcd` can be run on separate machines (first schema) or colocated (second schema) +- `etcd` can be run on separate machines (first schema) or co-located (second schema) - We need at least one master, but we can have more (for high availability) @@ -144,7 +144,7 @@ No! - We could also use `rkt` ("Rocket") from CoreOS -- Or leverage through the *Container Runtime Interface* other pluggable runtimes +- Or leverage other pluggable runtimes through the *Container Runtime Interface* (like CRI-O, or containerd) @@ -162,12 +162,14 @@ Yes! - We can do these things without Docker
- (and get diagnosed with NIH syndrome) + (and get diagnosed with NIH¹ syndrome) - Docker is still the most stable container engine today
(but other options are maturing very quickly) +.footnote[¹[Not Invented Here](https://en.wikipedia.org/wiki/Not_invented_here)] + --- ## Do we need to run Docker at all? diff --git a/docs/dockercon.yml b/docs/dockercon.yml index 721bfe18..163ea447 100644 --- a/docs/dockercon.yml +++ b/docs/dockercon.yml @@ -1,3 +1,5 @@ +chat: https://dockercommunity.slack.com/messages/C7ET1GY4Q + exclude: - self-paced - snap diff --git a/docs/kube.yml b/docs/kube.yml index d66569c2..a3753d4d 100644 --- a/docs/kube.yml +++ b/docs/kube.yml @@ -2,6 +2,8 @@ exclude: - self-paced - snap +chat: "FIXME" + chapters: - | class: title diff --git a/docs/markmaker.py b/docs/markmaker.py index 6105151e..5e82b5c5 100755 --- a/docs/markmaker.py +++ b/docs/markmaker.py @@ -26,8 +26,6 @@ def generatefromyaml(manifest): logging.debug(titles) toc = gentoc(titles) markdown = markdown.replace("@@TOC@@", toc) - for (s1,s2) in manifest.get("variables", {}).items(): - markdown = markdown.replace(s1, s2) exclude = manifest.get("exclude", []) logging.debug("exclude={!r}".format(exclude)) @@ -38,6 +36,7 @@ def generatefromyaml(manifest): html = open("workshop.html").read() html = html.replace("@@MARKDOWN@@", markdown) html = html.replace("@@EXCLUDE@@", exclude) + html = html.replace("@@CHAT@@", manifest["chat"]) return html diff --git a/docs/prereqs-k8s.md b/docs/prereqs-k8s.md index 88eff044..299ac97e 100644 --- a/docs/prereqs-k8s.md +++ b/docs/prereqs-k8s.md @@ -25,7 +25,7 @@ class: in-person, extra-details
(available with `(apt|yum|brew) install mosh`; then connect with `mosh user@host`) - [GitHub](https://github.com/join) account -
(if you want to fork the repo; also used to join Gitter) +
(if you want to fork the repo) - [Gitter](https://gitter.im/) account
(to join the conversation during the workshop) @@ -66,7 +66,7 @@ class: extra-details - This is the stuff you're supposed to do! - Go to [container.training](http://container.training/) to view these slides -- Join the [chat room](chat) +- Join the [chat room](@@CHAT@@) ] diff --git a/docs/prereqs.md b/docs/prereqs.md index c687650e..882cf952 100644 --- a/docs/prereqs.md +++ b/docs/prereqs.md @@ -28,7 +28,7 @@ class: in-person, extra-details
(available with `(apt|yum|brew) install mosh`; then connect with `mosh user@host`) - [GitHub](https://github.com/join) account -
(if you want to fork the repo; also used to join Gitter) +
(if you want to fork the repo) - [Gitter](https://gitter.im/) account
(to join the conversation during the workshop) @@ -69,7 +69,7 @@ class: extra-details - This is the stuff you're supposed to do! - Go to [container.training](http://container.training/) to view these slides -- Join the [chat room](chat) +- Join the [chat room](@@CHAT@@) ] diff --git a/docs/selfpaced.yml b/docs/selfpaced.yml index f34f75a4..f7c4b648 100644 --- a/docs/selfpaced.yml +++ b/docs/selfpaced.yml @@ -1,6 +1,8 @@ exclude: - in-person +chat: FIXME + chapters: - | class: title diff --git a/docs/workshop.yml b/docs/workshop.yml deleted file mode 100644 index c55daa87..00000000 --- a/docs/workshop.yml +++ /dev/null @@ -1,46 +0,0 @@ -chapters: -- intro.md -- | - @@TOC@@ -- - prereqs.md - - versions.md - - | - class: title - - All right! -
- We're all set. -
- Let's do this. - - | - name: part-1 - - class: title, self-paced - - Part 1 - - sampleapp.md - - | - class: title - - Scaling out - - swarmkit.md -- - firstservice.md - - ourapponswarm.md -- - operatingswarm.md - - netshoot.md - - swarmnbt.md - - ipsec.md - - updatingservices.md - - healthchecks.md - - nodeinfo.md - - swarmtools.md -- - security.md - - secrets.md - - leastprivilege.md - - namespaces.md - - apiscope.md - - encryptionatrest.md - - metrics.md - - stateful.md - - extratips.md - - end.md