From ad94cdab2df976b3036e70202e9540f507f74a36 Mon Sep 17 00:00:00 2001 From: Jerome Petazzoni Date: Sun, 2 Feb 2020 10:45:00 -0600 Subject: [PATCH] Last tweaks --- slides/1.yml | 17 +++++++++++------ slides/2.yml | 15 +++++++++++---- slides/3.yml | 13 +++++++++---- slides/4.yml | 13 +++++++++---- slides/5.yml | 13 +++++++++---- slides/logistics.md | 28 +++++----------------------- slides/shared/title.md | 9 +++------ 7 files changed, 57 insertions(+), 51 deletions(-) diff --git a/slides/1.yml b/slides/1.yml index 1322ab5c..3d22d4a6 100644 --- a/slides/1.yml +++ b/slides/1.yml @@ -1,19 +1,23 @@ title: | - Day 1 - Docker & Containers + Jour 1 + Fondamentaux + Conteneurs & Docker #chat: "[Slack](https://dockercommunity.slack.com/messages/C7GKACWDV)" -chat: "[Gitter](https://gitter.im/jpetazzo/workshop-yyyymmdd-city)" +chat: "[Gitter](https://gitter.im/enix/formation-highfive-202002)" gitrepo: github.com/jpetazzo/container.training -slides: http://container.training/ +slides: http://2020-02-enix.container.training/ exclude: - self-paced chapters: - shared/title.md +- logistics.md +- containers/intro.md +- shared/about-slides.md - shared/toc.md - - containers/Docker_Overview.md @@ -60,5 +64,6 @@ chapters: #- containers/Container_Engines.md #- containers/Ecosystem.md #- containers/Orchestration_Overview.md - #- shared/thankyou.md - #- containers/links.md +- + - shared/thankyou.md + - containers/links.md diff --git a/slides/2.yml b/slides/2.yml index b84deb26..b6074c55 100644 --- a/slides/2.yml +++ b/slides/2.yml @@ -1,19 +1,24 @@ title: | - Day 2 - Kubernetes fundamentals + Jour 2 + Fondamentaux + Orchestration + & Kubernetes #chat: "[Slack](https://dockercommunity.slack.com/messages/C7GKACWDV)" -chat: "[Gitter](https://gitter.im/jpetazzo/workshop-yyyymmdd-city)" +chat: "[Gitter](https://gitter.im/enix/formation-highfive-202002)" gitrepo: github.com/jpetazzo/container.training -slides: http://container.training/ +slides: http://2020-02-enix.container.training/ exclude: - self-paced chapters: - shared/title.md +- logistics.md +- k8s/intro.md +- shared/about-slides.md - shared/toc.md - - shared/prereqs.md @@ -48,3 +53,5 @@ chapters: #- k8s/record.md #- k8s/dashboard.md - k8s/ingress.md +- + - shared/thankyou.md diff --git a/slides/3.yml b/slides/3.yml index 93876681..c7771105 100644 --- a/slides/3.yml +++ b/slides/3.yml @@ -1,19 +1,22 @@ title: | - Day 3 - Developing Cloud Native Apps + Jour 3 + Méthodologies DevOps #chat: "[Slack](https://dockercommunity.slack.com/messages/C7GKACWDV)" -chat: "[Gitter](https://gitter.im/jpetazzo/workshop-yyyymmdd-city)" +chat: "[Gitter](https://gitter.im/enix/formation-highfive-202002)" gitrepo: github.com/jpetazzo/container.training -slides: http://container.training/ +slides: http://2020-02-enix.container.training/ exclude: - self-paced chapters: - shared/title.md +- logistics.md +#- k8s/intro.md +- shared/about-slides.md - shared/toc.md - # Bien démarrer en local (minikube, kind) @@ -80,3 +83,5 @@ chapters: # # Prometheus Grafana #- | # # Telemetry +- + - shared/thankyou.md diff --git a/slides/4.yml b/slides/4.yml index 8cf4d6d4..0f1e9b4a 100644 --- a/slides/4.yml +++ b/slides/4.yml @@ -1,19 +1,22 @@ title: | - Day 4 - Advanced Kubernetes + Jour 4 + Kubernetes Avancé #chat: "[Slack](https://dockercommunity.slack.com/messages/C7GKACWDV)" -chat: "[Gitter](https://gitter.im/jpetazzo/workshop-yyyymmdd-city)" +chat: "[Gitter](https://gitter.im/enix/formation-highfive-202002)" gitrepo: github.com/jpetazzo/container.training -slides: http://container.training/ +slides: http://2020-02-enix.container.training/ exclude: - self-paced chapters: - shared/title.md +- logistics.md +- k8s/intro.md +- shared/about-slides.md - shared/toc.md - - k8s/resource-limits.md @@ -33,3 +36,5 @@ chapters: - k8s/extending-api.md - k8s/operators.md #- k8s/operators-design.md +- + - shared/thankyou.md diff --git a/slides/5.yml b/slides/5.yml index 1bb577f9..519fb8d6 100644 --- a/slides/5.yml +++ b/slides/5.yml @@ -1,19 +1,22 @@ title: | - Day 5 - Kubernetes Operations + Jour 5 + Opérer Kubernetes #chat: "[Slack](https://dockercommunity.slack.com/messages/C7GKACWDV)" -chat: "[Gitter](https://gitter.im/jpetazzo/workshop-yyyymmdd-city)" +chat: "[Gitter](https://gitter.im/enix/formation-highfive-202002)" gitrepo: github.com/jpetazzo/container.training -slides: http://container.training/ +slides: http://2020-02-enix.container.training/ exclude: - self-paced chapters: - shared/title.md +- logistics.md +- k8s/intro.md +- shared/about-slides.md - shared/toc.md - - k8s/prereqs-admin.md @@ -35,3 +38,5 @@ chapters: - k8s/csr-api.md - k8s/openid-connect.md - k8s/podsecuritypolicy.md +- + - shared/thankyou.md diff --git a/slides/logistics.md b/slides/logistics.md index 33388a06..37c924ac 100644 --- a/slides/logistics.md +++ b/slides/logistics.md @@ -1,35 +1,17 @@ ## Intros -- This slide should be customized by the tutorial instructor(s). - - Hello! We are: - - .emoji[👩🏻‍🏫] Ann O'Nymous ([@...](https://twitter.com/...), Megacorp Inc) + - .emoji[🐳] Jérôme Petazzoni ([@jpetazzo](https://twitter.com/jpetazzo), Enix SAS) - - .emoji[👨🏾‍🎓] Stu Dent ([@...](https://twitter.com/...), University of Wakanda) + - .emoji[] Julien Girardin (Enix SAS) - - -- The workshop will run from ... - -- There will be a lunch break at ... - - (And coffee breaks!) + (and coffee breaks!) - Feel free to interrupt for questions at any time - *Especially when you see full screen container pictures!* - -- Live feedback, questions, help: @@CHAT@@ diff --git a/slides/shared/title.md b/slides/shared/title.md index 4ab52435..34cc82e9 100644 --- a/slides/shared/title.md +++ b/slides/shared/title.md @@ -11,11 +11,8 @@ class: title, in-person @@TITLE@@

.footnote[ -**Be kind to the WiFi!**
- -*Don't use your hotspot.*
-*Don't stream videos or download big files during the workshop[.](https://www.youtube.com/watch?v=h16zyxiwDLY)*
-*Thank you!* +**WiFi: FIXME**
+**Mot de passe: FIXME** -**Slides: @@SLIDES@@** +**Slides[:](https://www.youtube.com/watch?v=h16zyxiwDLY) @@SLIDES@@** ]