From e092f506456c9c22d4bb8035815f2a9f79dcbfc1 Mon Sep 17 00:00:00 2001 From: Jerome Petazzoni Date: Tue, 27 Feb 2018 09:40:54 -0600 Subject: [PATCH] Branch out intro/intro.md into per-workshop variants --- slides/common/about-slides.md | 28 +++++++++++++++++++++++ slides/intro-fullday.yml | 3 ++- slides/intro-selfpaced.yml | 3 ++- slides/intro/intro.md | 38 +++++++++++++++++++++++++++++++ slides/kube-halfday.yml | 3 ++- slides/kube-selfpaced.yml | 3 ++- slides/kube/intro.md | 35 ++++++++++++++++++++++++++++ slides/swarm-fullday.yml | 3 ++- slides/swarm-halfday.yml | 3 ++- slides/swarm-selfpaced.yml | 3 ++- slides/swarm-video.yml | 3 ++- slides/{common => swarm}/intro.md | 31 ------------------------- 12 files changed, 117 insertions(+), 39 deletions(-) create mode 100644 slides/common/about-slides.md create mode 100644 slides/intro/intro.md create mode 100644 slides/kube/intro.md rename slides/{common => swarm}/intro.md (63%) diff --git a/slides/common/about-slides.md b/slides/common/about-slides.md new file mode 100644 index 00000000..9cd68475 --- /dev/null +++ b/slides/common/about-slides.md @@ -0,0 +1,28 @@ +## About these slides + +- All the content is available in a public GitHub repository: + + https://github.com/jpetazzo/container.training + +- You can get updated "builds" of the slides there: + + http://container.training/ + + + +-- + +- Typos? Mistakes? Questions? Feel free to hover over the bottom of the slide ... + +.footnote[.emoji[👇] Try it! The source file will be shown and you can view it on GitHub and fork and edit it.] + + diff --git a/slides/intro-fullday.yml b/slides/intro-fullday.yml index d4a8f5a0..14c805b5 100644 --- a/slides/intro-fullday.yml +++ b/slides/intro-fullday.yml @@ -12,7 +12,8 @@ exclude: chapters: - common/title.md - logistics.md -- common/intro.md +- intro/intro.md +- common/about-slides.md - common/toc.md - - intro/Docker_Overview.md #- intro/Docker_History.md diff --git a/slides/intro-selfpaced.yml b/slides/intro-selfpaced.yml index 23cf3006..ddf9ffe3 100644 --- a/slides/intro-selfpaced.yml +++ b/slides/intro-selfpaced.yml @@ -12,7 +12,8 @@ exclude: chapters: - common/title.md # - common/logistics.md -- common/intro.md +- intro/intro.md +- common/about-slides.md - common/toc.md - - intro/Docker_Overview.md #- intro/Docker_History.md diff --git a/slides/intro/intro.md b/slides/intro/intro.md new file mode 100644 index 00000000..bfe3870a --- /dev/null +++ b/slides/intro/intro.md @@ -0,0 +1,38 @@ +## A brief introduction + +- This was initially written to support in-person, + instructor-led workshops and tutorials + +- You can also follow along on your own, at your own pace + +- We included as much information as possible in these slides + +- We recommend having a mentor to help you ... + +- ... Or be comfortable spending some time reading the Docker + [documentation](https://docs.docker.com/) ... + +- ... And looking for answers in the [Docker forums](forums.docker.com), + [StackOverflow](http://stackoverflow.com/questions/tagged/docker), + and other outlets + +--- + +class: self-paced + +## Hands on, you shall practice + +- Nobody ever became a Jedi by spending their lives reading Wookiepedia + +- Likewise, it will take more than merely *reading* these slides + to make you an expert + +- These slides include *tons* of exercises and examples + +- They assume that you have acccess to a machine running Docker + +- If you are attending a workshop or tutorial: +
you will be given specific instructions to access a cloud VM + +- If you are doing this on your own: +
we will tell you how to install Docker or access a Docker environment diff --git a/slides/kube-halfday.yml b/slides/kube-halfday.yml index 7ca89f17..50726cfa 100644 --- a/slides/kube-halfday.yml +++ b/slides/kube-halfday.yml @@ -11,7 +11,8 @@ exclude: chapters: - common/title.md - logistics.md -- common/intro.md +- kube/intro.md +- common/about-slides.md - common/toc.md - - common/prereqs.md - kube/versions-k8s.md diff --git a/slides/kube-selfpaced.yml b/slides/kube-selfpaced.yml index dfac73f7..deda5477 100644 --- a/slides/kube-selfpaced.yml +++ b/slides/kube-selfpaced.yml @@ -11,7 +11,8 @@ exclude: chapters: - common/title.md #- logistics.md -- common/intro.md +- kube/intro.md +- common/about-slides.md - common/toc.md - - common/prereqs.md - kube/versions-k8s.md diff --git a/slides/kube/intro.md b/slides/kube/intro.md new file mode 100644 index 00000000..41f5b2de --- /dev/null +++ b/slides/kube/intro.md @@ -0,0 +1,35 @@ +## A brief introduction + +- This was initially written to support in-person, + instructor-led workshops and tutorials + +- You can also follow along on your own, at your own pace + +- We included as much information as possible in these slides + +- We recommend having a mentor to help you ... + +- ... Or be comfortable spending some time reading the Kubernetes [documentation](https://kubernetes.io/docs/) ... + +- ... And looking for answers on [StackOverflow](http://stackoverflow.com/questions/tagged/kubernetes) and other outlets + +--- + +class: self-paced + +## Hands on, you shall practice + +- Nobody ever became a Jedi by spending their lives reading Wookiepedia + +- Likewise, it will take more than merely *reading* these slides + to make you an expert + +- These slides include *tons* of exercises and examples + +- They assume that you have access to a Kubernetes cluster + +- If you are attending a workshop or tutorial: +
you will be given specific instructions to access your cluster + +- If you are doing this on your own: +
the first chapter will give you various options to get your own cluster diff --git a/slides/swarm-fullday.yml b/slides/swarm-fullday.yml index 283b2242..47e541cd 100644 --- a/slides/swarm-fullday.yml +++ b/slides/swarm-fullday.yml @@ -16,7 +16,8 @@ exclude: chapters: - common/title.md - logistics.md -- common/intro.md +- swarm/intro.md +- common/about-slides.md - common/toc.md - - common/prereqs.md - swarm/versions.md diff --git a/slides/swarm-halfday.yml b/slides/swarm-halfday.yml index 9d6a2552..83e6539c 100644 --- a/slides/swarm-halfday.yml +++ b/slides/swarm-halfday.yml @@ -16,7 +16,8 @@ exclude: chapters: - common/title.md - logistics.md -- common/intro.md +- swarm/intro.md +- common/about-slides.md - common/toc.md - - common/prereqs.md - swarm/versions.md diff --git a/slides/swarm-selfpaced.yml b/slides/swarm-selfpaced.yml index f2910995..d6296f3c 100644 --- a/slides/swarm-selfpaced.yml +++ b/slides/swarm-selfpaced.yml @@ -11,7 +11,8 @@ exclude: chapters: - common/title.md #- common/logistics.md -- common/intro.md +- swarm/intro.md +- common/about-slides.md - common/toc.md - - common/prereqs.md - swarm/versions.md diff --git a/slides/swarm-video.yml b/slides/swarm-video.yml index 544057ed..2c989129 100644 --- a/slides/swarm-video.yml +++ b/slides/swarm-video.yml @@ -11,7 +11,8 @@ exclude: chapters: - common/title.md #- common/logistics.md -- common/intro.md +- swarm/intro.md +- common/about-slides.md - common/toc.md - - common/prereqs.md - swarm/versions.md diff --git a/slides/common/intro.md b/slides/swarm/intro.md similarity index 63% rename from slides/common/intro.md rename to slides/swarm/intro.md index 0048853f..868c7b1c 100644 --- a/slides/common/intro.md +++ b/slides/swarm/intro.md @@ -36,34 +36,3 @@ class: self-paced - If you are doing this on your own:
the first chapter will give you various options to get your own cluster - ---- - -## About these slides - -- All the content is available in a public GitHub repository: - - https://github.com/jpetazzo/container.training - -- You can get updated "builds" of the slides there: - - http://container.training/ - - - --- - -- Typos? Mistakes? Questions? Feel free to hover over the bottom of the slide ... - -.footnote[.emoji[👇] Try it! The source file will be shown and you can view it on GitHub and fork and edit it.] - -