From 674d24c44061d487741ef75c950ad182a804798a Mon Sep 17 00:00:00 2001 From: Jerome Petazzoni Date: Sun, 3 Jun 2018 16:15:57 -0500 Subject: [PATCH] Assemble intro TOC --- slides/index.html | 264 +++--------------------------------- slides/intro-fullday.yml | 38 ++++-- slides/intro.yml | 1 + slides/intro/CI_Pipeline.md | 3 + slides/kube.yml | 1 + slides/logistics.md | 18 +-- slides/swarm-fullday.yml | 61 --------- slides/swarm-halfday.yml | 61 --------- slides/swarm-selfpaced.yml | 70 ---------- slides/swarm-video.yml | 70 ---------- slides/theme.css | 85 ++++++++++++ 11 files changed, 144 insertions(+), 528 deletions(-) create mode 120000 slides/intro.yml create mode 100644 slides/intro/CI_Pipeline.md create mode 120000 slides/kube.yml delete mode 100644 slides/swarm-fullday.yml delete mode 100644 slides/swarm-halfday.yml delete mode 100644 slides/swarm-selfpaced.yml delete mode 100644 slides/swarm-video.yml create mode 100644 slides/theme.css diff --git a/slides/index.html b/slides/index.html index 09973c2d..a0a2c942 100644 --- a/slides/index.html +++ b/slides/index.html @@ -1,248 +1,28 @@ - Container Training - + +Formation/workshop containers, orchestration, et Kubernetes à Montpellier en juin -
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
Container Training
Coming soon near you
June 12th, 2018: Velocity San Jose - Kubernetes 101 
June 27th, 2018: devopsdays Amsterdam - Kubernetes 101 
July 17th, 2018: OSCON - Kubernetes 101 
Oct 1st, 2018: Velocity New York - Kubernetes 101 
Past workshops
May 17th, 2018: Revolution Conf Virginia Beach - Docker 101
May 10th, 2018: NDC Minnesota - Kubernetes 101
May 8th, 2018: CRAFT Budapest - Swarm Orchestration
April 27th, 2018: GOTO Chicago - Swarm Orchestration
April 24th, 2018: GOTO Chicago - Kubernetes 101
April 11-12, 2018: Introduction aux conteneurs (in French)
April 13, 2018: Introduction à l'orchestration (in French)
April 6th, 2018: MuraCon Sacramento, CA - Docker 101
March 27, 2018: SREcon Americas — Kubernetes 101
March 27, 2018: Boosterconf: Kubernetes 101
February 22, 2018: IndexConf: Kubernetes 101
QCON SF: Orchestrating Microservices with Docker Swarm
QCON SF: Introduction to Docker and Containers
Deploying and scaling microservices with Docker and Kubernetes
LISA16 T1: Deploying and Scaling Applications with Docker Swarm
PyCon2016: Introduction to Docker and containers
Self-paced tutorials
Introduction to Docker and Containers
Container Orchestration with Docker and Swarm
Deploying and Scaling Microservices with Docker and Kubernetes
- Maintained by Jérôme Petazzoni (@jpetazzo) and contributors. -
-
+
+
+

Introduction aux conteneurs

+
De la pratique … aux bonnes pratiques
+
(5-6 juin 2018)
+

+SLIDES +CHATROOM +

+
+
+

Introduction à l'orchestration

+
Kubernetes par l'exemple
+
(7 juin 2018)
+

+SLIDES +CHATROOM +

+
+
diff --git a/slides/intro-fullday.yml b/slides/intro-fullday.yml index e4b1d523..27b5b385 100644 --- a/slides/intro-fullday.yml +++ b/slides/intro-fullday.yml @@ -2,12 +2,12 @@ title: | Introduction to Containers -chat: "[Slack](https://dockercommunity.slack.com/messages/C7GKACWDV)" -#chat: "[Gitter](https://gitter.im/jpetazzo/workshop-yyyymmdd-city)" +#chat: "[Slack](https://dockercommunity.slack.com/messages/C7GKACWDV)" +chat: "[Gitter](https://gitter.im/jpetazzo/training-20180605-montpellier)" gitrepo: github.com/jpetazzo/container.training -slides: http://container.training/ +slides: http://juin2018.container.training/ exclude: - self-paced @@ -30,12 +30,28 @@ chapters: - intro/Building_Images_With_Dockerfiles.md - intro/Cmd_And_Entrypoint.md - intro/Copying_Files_During_Build.md -- - intro/Multi_Stage_Builds.md +- - | + # Exercise — writing Dockerfiles + + Let's write Dockerfiles for an existing application! + + The code is at: https://bitbucket.org/jgarrouste/k8s-wordsmith-exo/src/master/ + - intro/Multi_Stage_Builds.md - intro/Publishing_To_Docker_Hub.md - intro/Dockerfile_Tips.md + - | + # Exercise — writing better Dockerfiles + + Let's update our Dockerfiles to leverage multi-stage builds! + + The code is at: https://bitbucket.org/jgarrouste/k8s-wordsmith-exo/src/master/ - - intro/Naming_And_Inspecting.md - intro/Labels.md - intro/Getting_Inside.md + - intro/Resource_Limits.md +- - intro/Namespaces_Cgroups.md + - intro/Copy_On_Write.md + #- intro/Containers_From_Scratch.md - - intro/Container_Networking_Basics.md - intro/Network_Drivers.md - intro/Container_Network_Model.md @@ -44,14 +60,18 @@ chapters: - - intro/Local_Development_Workflow.md - intro/Working_With_Volumes.md - intro/Compose_For_Dev_Stacks.md + - | + # Exercise — writing a Compose file + + Let's write a Compose file for the wordsmith app! + + The code is at: https://bitbucket.org/jgarrouste/k8s-wordsmith-exo/src/master/ + +- - intro/CI_Pipeline.md - intro/Docker_Machine.md -- - intro/Advanced_Dockerfiles.md + - intro/Advanced_Dockerfiles.md - intro/Application_Configuration.md - intro/Logging.md - - intro/Resource_Limits.md -- - intro/Namespaces_Cgroups.md - - intro/Copy_On_Write.md - #- intro/Containers_From_Scratch.md - - intro/Container_Engines.md - intro/Ecosystem.md - intro/Orchestration_Overview.md diff --git a/slides/intro.yml b/slides/intro.yml new file mode 120000 index 00000000..9faf6714 --- /dev/null +++ b/slides/intro.yml @@ -0,0 +1 @@ +intro-fullday.yml \ No newline at end of file diff --git a/slides/intro/CI_Pipeline.md b/slides/intro/CI_Pipeline.md new file mode 100644 index 00000000..19f22804 --- /dev/null +++ b/slides/intro/CI_Pipeline.md @@ -0,0 +1,3 @@ +# Building a CI pipeline + +.center[![Demo](images/demo.jpg)] diff --git a/slides/kube.yml b/slides/kube.yml new file mode 120000 index 00000000..043d5cb9 --- /dev/null +++ b/slides/kube.yml @@ -0,0 +1 @@ +kube-fullday.yml \ No newline at end of file diff --git a/slides/logistics.md b/slides/logistics.md index c818d864..096ad9c9 100644 --- a/slides/logistics.md +++ b/slides/logistics.md @@ -1,26 +1,14 @@ ## Intros -- This slide should be customized by the tutorial instructor(s). - - Hello! We are: - - .emoji[👩🏻‍🏫] Ann O'Nymous ([@...](https://twitter.com/...), Megacorp Inc) - - - .emoji[👨🏾‍🎓] Stu Dent ([@...](https://twitter.com/...), University of Wakanda) - - - -- The workshop will run from ... - -- There will be a lunch break at ... +- There will be a lunch break at 12:30 (And coffee breaks!) diff --git a/slides/swarm-fullday.yml b/slides/swarm-fullday.yml deleted file mode 100644 index 4ba793b6..00000000 --- a/slides/swarm-fullday.yml +++ /dev/null @@ -1,61 +0,0 @@ -title: | - Container Orchestration - with Docker and Swarm - -chat: "[Slack](https://dockercommunity.slack.com/messages/C7GKACWDV)" -#chat: "[Gitter](https://gitter.im/jpetazzo/workshop-yyyymmdd-city)" - -gitrepo: github.com/jpetazzo/container.training - -slides: http://container.training/ - -exclude: -- self-paced -- snap -- btp-auto -- benchmarking -- elk-manual -- prom-manual - -chapters: -- common/title.md -- logistics.md -- swarm/intro.md -- common/about-slides.md -- common/toc.md -- - common/prereqs.md - - swarm/versions.md - - common/sampleapp.md - - common/composescale.md - - common/composedown.md - - swarm/swarmkit.md - - common/declarative.md - - swarm/swarmmode.md - - swarm/creatingswarm.md - #- swarm/machine.md - - swarm/morenodes.md -- - swarm/firstservice.md - - swarm/ourapponswarm.md - - swarm/hostingregistry.md - - swarm/testingregistry.md - - swarm/btp-manual.md - - swarm/swarmready.md - - swarm/compose2swarm.md - - swarm/updatingservices.md - #- swarm/rollingupdates.md - - swarm/healthchecks.md -- - swarm/operatingswarm.md - - swarm/netshoot.md - - swarm/ipsec.md - - swarm/swarmtools.md - - swarm/security.md - - swarm/secrets.md - - swarm/encryptionatrest.md - - swarm/leastprivilege.md - - swarm/apiscope.md -- - swarm/logging.md - - swarm/metrics.md - - swarm/stateful.md - - swarm/extratips.md - - common/thankyou.md - - swarm/links.md diff --git a/slides/swarm-halfday.yml b/slides/swarm-halfday.yml deleted file mode 100644 index 39acc72b..00000000 --- a/slides/swarm-halfday.yml +++ /dev/null @@ -1,61 +0,0 @@ -title: | - Container Orchestration - with Docker and Swarm - -chat: "[Slack](https://dockercommunity.slack.com/messages/C7GKACWDV)" -#chat: "[Gitter](https://gitter.im/jpetazzo/workshop-yyyymmdd-city)" - -gitrepo: github.com/jpetazzo/container.training - -slides: http://container.training/ - -exclude: -- self-paced -- snap -- btp-manual -- benchmarking -- elk-manual -- prom-manual - -chapters: -- common/title.md -- logistics.md -- swarm/intro.md -- common/about-slides.md -- common/toc.md -- - common/prereqs.md - - swarm/versions.md - - common/sampleapp.md - - common/composescale.md - - common/composedown.md - - swarm/swarmkit.md - - common/declarative.md - - swarm/swarmmode.md - - swarm/creatingswarm.md - #- swarm/machine.md - - swarm/morenodes.md -- - swarm/firstservice.md - - swarm/ourapponswarm.md - #- swarm/hostingregistry.md - #- swarm/testingregistry.md - #- swarm/btp-manual.md - #- swarm/swarmready.md - - swarm/compose2swarm.md - - swarm/updatingservices.md - #- swarm/rollingupdates.md - #- swarm/healthchecks.md -- - swarm/operatingswarm.md - #- swarm/netshoot.md - #- swarm/ipsec.md - #- swarm/swarmtools.md - - swarm/security.md - #- swarm/secrets.md - #- swarm/encryptionatrest.md - - swarm/leastprivilege.md - - swarm/apiscope.md - - swarm/logging.md - - swarm/metrics.md - #- swarm/stateful.md - #- swarm/extratips.md - - common/thankyou.md - - swarm/links.md diff --git a/slides/swarm-selfpaced.yml b/slides/swarm-selfpaced.yml deleted file mode 100644 index 89b6146f..00000000 --- a/slides/swarm-selfpaced.yml +++ /dev/null @@ -1,70 +0,0 @@ -title: | - Container Orchestration - with Docker and Swarm - -chat: "[Slack](https://dockercommunity.slack.com/messages/C7GKACWDV)" - -gitrepo: github.com/jpetazzo/container.training - -slides: http://container.training/ - -exclude: -- in-person -- btp-auto - -chapters: -- common/title.md -#- common/logistics.md -- swarm/intro.md -- common/about-slides.md -- common/toc.md -- - common/prereqs.md - - swarm/versions.md - - | - name: part-1 - - class: title, self-paced - - Part 1 - - common/sampleapp.md - - common/composescale.md - - common/composedown.md - - swarm/swarmkit.md - - common/declarative.md - - swarm/swarmmode.md - - swarm/creatingswarm.md - #- swarm/machine.md - - swarm/morenodes.md -- - swarm/firstservice.md - - swarm/ourapponswarm.md - - swarm/hostingregistry.md - - swarm/testingregistry.md - - swarm/btp-manual.md - - swarm/swarmready.md - - swarm/compose2swarm.md - - | - name: part-2 - - class: title, self-paced - - Part 2 -- - swarm/operatingswarm.md - - swarm/netshoot.md - - swarm/swarmnbt.md - - swarm/ipsec.md - - swarm/updatingservices.md - - swarm/rollingupdates.md - - swarm/healthchecks.md - - swarm/nodeinfo.md - - swarm/swarmtools.md -- - swarm/security.md - - swarm/secrets.md - - swarm/encryptionatrest.md - - swarm/leastprivilege.md - - swarm/apiscope.md - - swarm/logging.md - - swarm/metrics.md - - swarm/stateful.md - - swarm/extratips.md - - common/thankyou.md - - swarm/links.md diff --git a/slides/swarm-video.yml b/slides/swarm-video.yml deleted file mode 100644 index 3274d60a..00000000 --- a/slides/swarm-video.yml +++ /dev/null @@ -1,70 +0,0 @@ -title: | - Container Orchestration - with Docker and Swarm - -chat: "[Slack](https://dockercommunity.slack.com/messages/C7GKACWDV)" - -gitrepo: github.com/jpetazzo/container.training - -slides: http://container.training/ - -exclude: -- in-person -- btp-auto - -chapters: -- common/title.md -#- common/logistics.md -- swarm/intro.md -- common/about-slides.md -- common/toc.md -- - common/prereqs.md - - swarm/versions.md - - | - name: part-1 - - class: title, self-paced - - Part 1 - - common/sampleapp.md - - common/composescale.md - - common/composedown.md - - swarm/swarmkit.md - - common/declarative.md - - swarm/swarmmode.md - - swarm/creatingswarm.md - #- swarm/machine.md - - swarm/morenodes.md -- - swarm/firstservice.md - - swarm/ourapponswarm.md - - swarm/hostingregistry.md - - swarm/testingregistry.md - - swarm/btp-manual.md - - swarm/swarmready.md - - swarm/compose2swarm.md - - | - name: part-2 - - class: title, self-paced - - Part 2 -- - swarm/operatingswarm.md - #- swarm/netshoot.md - #- swarm/swarmnbt.md - - swarm/ipsec.md - - swarm/updatingservices.md - - swarm/rollingupdates.md - #- swarm/healthchecks.md - - swarm/nodeinfo.md - - swarm/swarmtools.md -- - swarm/security.md - - swarm/secrets.md - - swarm/encryptionatrest.md - - swarm/leastprivilege.md - - swarm/apiscope.md - #- swarm/logging.md - #- swarm/metrics.md - - swarm/stateful.md - - swarm/extratips.md - - common/thankyou.md - - swarm/links.md diff --git a/slides/theme.css b/slides/theme.css new file mode 100644 index 00000000..74d0a326 --- /dev/null +++ b/slides/theme.css @@ -0,0 +1,85 @@ +@import url('https://fonts.googleapis.com/css?family=PT+Sans'); + +body { + font-family: 'PT Sans', sans-serif; + max-width: 900px; + margin: 0 auto 0 auto; + font-size: 13pt; + background: lightgrey; +} + +body > div { + background: white; + padding: 0 5em 0 5em; +} + +ul, p, h1, h2, h3, h4, h5, h6 { + margin: 0; +} + +h1, h2, h3 { + padding-top: 1em; + padding-bottom: 0.5em; +} + +ul, p { + padding-bottom: 1em; +} + +img { + width: 200px; + float: left; + margin-right: 1em; + margin-bottom: 0.5em; + margin-top: 3em; +} + +h2:nth-of-type(n+5) { + color: #0069A8; +} + +h2:nth-of-type(-n+4) { + text-align: center; +} + +h2:nth-of-type(1) { + font-size: 3em; +} + +h2:nth-of-type(2) { + font-size: 2em; +} + +h2:nth-of-type(3) { + font-size: 1.5em; +} + +h2:nth-of-type(4) { + font-size: 1em; +} + +/* index */ +.index h4 { + font-size: 2.0em; +} +.index h5 { + font-size: 1.3em; +} +.index h6 { + font-size: 1.0em; +} +.index h4, .index h5, .index h6, .index p { + padding: 5pt; +} +div.index { +} +div.block { + background: #e1f8ff; + padding: 1em; + margin: 2em; +} +.index { + font-size: 1.5em; + padding: 0.5em; +} +