diff --git a/slides/1.yml b/slides/1.yml
new file mode 100644
index 00000000..bb66ce6a
--- /dev/null
+++ b/slides/1.yml
@@ -0,0 +1,33 @@
+title: |
+ Container Foundations
+
+chat: "`#infra-summit-container-foundation`"
+
+gitrepo: github.com/jpetazzo/container.training
+
+slides: https://2021-04-summit.container.training/
+
+#slidenumberprefix: "#SomeHashTag — "
+
+exclude:
+- self-paced
+
+content:
+- shared/title.md
+- logistics.md
+- shared/about-slides.md
+- shared/toc.md
+- # DAY 1
+ - containers/Local_Environment.md
+ - containers/First_Containers.md
+ - containers/Background_Containers.md
+ - containers/Initial_Images.md
+ - containers/Building_Images_Interactively.md
+-
+ - containers/Building_Images_With_Dockerfiles.md
+ - containers/Cmd_And_Entrypoint.md
+ - containers/Copying_Files_During_Build.md
+ # FIXME update Compose section so that folks can test the app
+ - containers/Compose_For_Dev_Stacks.md
+ - containers/Exercise_Dockerfile_Basic.md
+ - shared/thankyou.md
diff --git a/slides/2.yml b/slides/2.yml
new file mode 100644
index 00000000..207513ed
--- /dev/null
+++ b/slides/2.yml
@@ -0,0 +1,53 @@
+title: |
+ Advanced Containers
+
+chat: "`#infra-summit-adv-containers`"
+
+gitrepo: github.com/jpetazzo/container.training
+
+slides: https://2021-04-summit.container.training/
+
+#slidenumberprefix: "#SomeHashTag — "
+
+exclude:
+- self-paced
+
+content:
+- shared/title.md
+- logistics.md
+- shared/about-slides.md
+- shared/toc.md
+- # DAY 2
+ - |
+ # Dockerfile Homework Review
+
+ Yesterday, we concluded the "Container Foundations" workshop with
+ a little homework assignment.
+
+ Let's look at it!
+
+ The repository is here:
+
+ https://github.com/jpetazzo/wordsmith
+
+ (You can find proposed solutions in various branches of this repository.)
+
+ - containers/Container_Networking_Basics.md
+ - containers/Local_Development_Workflow.md
+ - containers/Naming_And_Inspecting.md
+ #- containers/Labels.md
+ - containers/Getting_Inside.md
+-
+ - containers/Container_Network_Model.md
+ - containers/Network_Drivers.md
+ - containers/Multi_Stage_Builds.md
+ - containers/Dockerfile_Tips.md
+ - containers/Exercise_Dockerfile_Advanced.md
+ #- containers/Init_Systems.md
+ - shared/thankyou.md
+ #- containers/links.md
+-
+ - |
+ # (Extra Content)
+ - containers/Start_And_Attach.md
+ - one-more-thing.md
diff --git a/slides/_redirects b/slides/_redirects
index d708d6aa..832327ed 100644
--- a/slides/_redirects
+++ b/slides/_redirects
@@ -2,6 +2,7 @@
#/ /kube-halfday.yml.html 200!
#/ /kube-fullday.yml.html 200!
#/ /kube-twodays.yml.html 200!
+/ /summit.html 200!
# And this allows to do "git clone https://container.training".
/info/refs service=git-upload-pack https://github.com/jpetazzo/container.training/info/refs?service=git-upload-pack
diff --git a/slides/containers/Exercise_Dockerfile_Basic.md b/slides/containers/Exercise_Dockerfile_Basic.md
index 7922c626..a018d819 100644
--- a/slides/containers/Exercise_Dockerfile_Basic.md
+++ b/slides/containers/Exercise_Dockerfile_Basic.md
@@ -10,9 +10,7 @@ Let's write Dockerfiles for an existing application!
4. Build and test them individually
-
---
@@ -77,7 +75,7 @@ That's all we care about for now!
Bonus question: make sure that each container stops correctly when hitting Ctrl-C.
-???
+---
## Test with a Compose file
diff --git a/slides/containers/First_Containers.md b/slides/containers/First_Containers.md
index d2979361..febee8c8 100644
--- a/slides/containers/First_Containers.md
+++ b/slides/containers/First_Containers.md
@@ -125,27 +125,23 @@ root@04c0bb0a6c07:/# dpkg -l | wc -l
* `wc -l` counts them
-How many packages do we have on our host?
+This is a fairly minimal Ubuntu install.
+
+(We don't even have `ifconfig` or `ip`!)
---
class: in-person
-## Counting packages on the host
+## If we were running Docker on Linux...
-Exit the container by logging out of the shell, like you would usually do.
+Specifically, on Ubuntu...
-(E.g. with `^D` or `exit`)
+We could compare with the number of packages on the host.
-```bash
-root@04c0bb0a6c07:/# exit
-```
+(For comparison: about 500 on a stock Ubuntu Cloud Image.)
-Now, try to:
-
-* run `dpkg -l | wc -l`. How many packages are installed?
-
-* run `figlet`. Does that work?
+We could see that installing `figlet` in the container *did not* install it on the host.
---
diff --git a/slides/containers/Local_Environment.md b/slides/containers/Local_Environment.md
new file mode 100644
index 00000000..258e1542
--- /dev/null
+++ b/slides/containers/Local_Environment.md
@@ -0,0 +1,57 @@
+# Getting started
+
+What are we going to learn?
+
+A multi-layered approach! 🧅
+
+- If you haven't used Docker yet: I'll show you how to get started.
+
+- If you *have* already used Docker: I'll give you details, tips, tricks...
+
+---
+
+class: title
+
+*Tell me and I forget.*
+
+*Teach me and I remember.*
+
+*Involve me and I learn.*
+
+Misattributed to Benjamin Franklin
+
+[(Probably inspired by Chinese Confucian philosopher Xunzi)](https://www.barrypopik.com/index.php/new_york_city/entry/tell_me_and_i_forget_teach_me_and_i_may_remember_involve_me_and_i_will_lear/)
+
+---
+
+## Hands-on sections
+
+- The whole workshop is hands-on
+
+- We are going to build, ship, and run containers!
+
+- The slides are here to help ...
+
+- ... But most of the interesting action will be in the terminal
+
+- You are invited to reproduce all the demos
+
+ (if you feel like it!)
+
+---
+
+## What do we need?
+
+- Docker!
+
+ - on Linux
+
+ - on Mac with Intel Silicon
+
+ - on Mac with Apple Silicon
+
+ - on Windows
+
+- For the purpose of this workshop, there shouldn't be significant differences
+
+ (but we'll talk about these differences a little bit later)
diff --git a/slides/intro-fullday.yml b/slides/intro-fullday.yml
deleted file mode 100644
index 0473f9d0..00000000
--- a/slides/intro-fullday.yml
+++ /dev/null
@@ -1,70 +0,0 @@
-title: |
- Introduction
- to Containers
-
-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/
-
-#slidenumberprefix: "#SomeHashTag — "
-
-exclude:
-- self-paced
-
-content:
-- shared/title.md
-- logistics.md
-- containers/intro.md
-- shared/about-slides.md
-- shared/chat-room-im.md
-#- shared/chat-room-slack.md
-#- shared/chat-room-zoom-meeting.md
-#- shared/chat-room-zoom-webinar.md
-- shared/toc.md
--
- #- containers/Docker_Overview.md
- #- containers/Docker_History.md
- - containers/Training_Environment.md
- #- containers/Installing_Docker.md
- - containers/First_Containers.md
- - containers/Background_Containers.md
- #- containers/Start_And_Attach.md
- - containers/Naming_And_Inspecting.md
- #- containers/Labels.md
- - containers/Getting_Inside.md
- - containers/Initial_Images.md
--
- - containers/Building_Images_Interactively.md
- - containers/Building_Images_With_Dockerfiles.md
- - containers/Cmd_And_Entrypoint.md
- - containers/Copying_Files_During_Build.md
- - containers/Exercise_Dockerfile_Basic.md
--
- - containers/Container_Networking_Basics.md
- #- containers/Network_Drivers.md
- - containers/Local_Development_Workflow.md
- - containers/Container_Network_Model.md
- - containers/Compose_For_Dev_Stacks.md
- - containers/Exercise_Composefile.md
--
- - containers/Multi_Stage_Builds.md
- #- containers/Publishing_To_Docker_Hub.md
- - containers/Dockerfile_Tips.md
- - containers/Exercise_Dockerfile_Advanced.md
- #- containers/Docker_Machine.md
- #- containers/Advanced_Dockerfiles.md
- #- containers/Init_Systems.md
- #- containers/Application_Configuration.md
- #- containers/Logging.md
- #- containers/Namespaces_Cgroups.md
- #- containers/Copy_On_Write.md
- #- containers/Containers_From_Scratch.md
- #- containers/Container_Engines.md
- #- containers/Pods_Anatomy.md
- #- containers/Ecosystem.md
- #- containers/Orchestration_Overview.md
- - shared/thankyou.md
- - containers/links.md
diff --git a/slides/intro-selfpaced.yml b/slides/intro-selfpaced.yml
deleted file mode 100644
index 021f9c4d..00000000
--- a/slides/intro-selfpaced.yml
+++ /dev/null
@@ -1,71 +0,0 @@
-title: |
- Introduction
- to Containers
-
-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/
-
-#slidenumberprefix: "#SomeHashTag — "
-
-exclude:
-- in-person
-
-content:
-- shared/title.md
-# - shared/logistics.md
-- containers/intro.md
-- shared/about-slides.md
-#- shared/chat-room-im.md
-#- shared/chat-room-slack.md
-#- shared/chat-room-zoom-meeting.md
-#- shared/chat-room-zoom-webinar.md
-- shared/toc.md
-- - containers/Docker_Overview.md
- - containers/Docker_History.md
- - containers/Training_Environment.md
- - containers/Installing_Docker.md
- - containers/First_Containers.md
- - containers/Background_Containers.md
- - containers/Start_And_Attach.md
-- - containers/Initial_Images.md
- - containers/Building_Images_Interactively.md
- - containers/Building_Images_With_Dockerfiles.md
- - containers/Cmd_And_Entrypoint.md
- - containers/Copying_Files_During_Build.md
- - containers/Exercise_Dockerfile_Basic.md
-- - containers/Multi_Stage_Builds.md
- - containers/Publishing_To_Docker_Hub.md
- - containers/Dockerfile_Tips.md
- - containers/Exercise_Dockerfile_Advanced.md
-- - containers/Naming_And_Inspecting.md
- - containers/Labels.md
- - containers/Getting_Inside.md
-- - containers/Container_Networking_Basics.md
- - containers/Network_Drivers.md
- - containers/Container_Network_Model.md
- #- containers/Connecting_Containers_With_Links.md
- - containers/Ambassadors.md
-- - containers/Local_Development_Workflow.md
- - containers/Windows_Containers.md
- - containers/Working_With_Volumes.md
- - containers/Compose_For_Dev_Stacks.md
- - containers/Exercise_Composefile.md
- - containers/Docker_Machine.md
-- - containers/Advanced_Dockerfiles.md
- - containers/Init_Systems.md
- - containers/Application_Configuration.md
- - containers/Logging.md
- - containers/Resource_Limits.md
-- - containers/Namespaces_Cgroups.md
- - containers/Copy_On_Write.md
- #- containers/Containers_From_Scratch.md
-- - containers/Container_Engines.md
- - containers/Pods_Anatomy.md
- - containers/Ecosystem.md
- - containers/Orchestration_Overview.md
- - shared/thankyou.md
- - containers/links.md
diff --git a/slides/intro-twodays.yml b/slides/intro-twodays.yml
deleted file mode 100644
index 2f0dd6e6..00000000
--- a/slides/intro-twodays.yml
+++ /dev/null
@@ -1,79 +0,0 @@
-title: |
- Introduction
- to Containers
-
-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/
-
-#slidenumberprefix: "#SomeHashTag — "
-
-exclude:
-- self-paced
-
-content:
-- shared/title.md
-- logistics.md
-- containers/intro.md
-- shared/about-slides.md
-- shared/chat-room-im.md
-#- shared/chat-room-slack.md
-#- shared/chat-room-zoom-meeting.md
-#- shared/chat-room-zoom-webinar.md
-- shared/toc.md
-- # DAY 1
- - containers/Docker_Overview.md
- #- containers/Docker_History.md
- - containers/Training_Environment.md
- - containers/First_Containers.md
- - containers/Background_Containers.md
- - containers/Initial_Images.md
--
- - containers/Building_Images_Interactively.md
- - containers/Building_Images_With_Dockerfiles.md
- - containers/Cmd_And_Entrypoint.md
- - containers/Copying_Files_During_Build.md
- - containers/Exercise_Dockerfile_Basic.md
--
- - containers/Dockerfile_Tips.md
- - containers/Multi_Stage_Builds.md
- - containers/Publishing_To_Docker_Hub.md
- - containers/Exercise_Dockerfile_Advanced.md
--
- - containers/Naming_And_Inspecting.md
- - containers/Labels.md
- - containers/Start_And_Attach.md
- - containers/Getting_Inside.md
- - containers/Resource_Limits.md
-- # DAY 2
- - containers/Container_Networking_Basics.md
- - containers/Network_Drivers.md
- - containers/Container_Network_Model.md
--
- - containers/Local_Development_Workflow.md
- - containers/Working_With_Volumes.md
- - containers/Compose_For_Dev_Stacks.md
- - containers/Exercise_Composefile.md
--
- - containers/Installing_Docker.md
- - containers/Container_Engines.md
- - containers/Init_Systems.md
- - containers/Advanced_Dockerfiles.md
--
- - containers/Application_Configuration.md
- - containers/Logging.md
- - containers/Orchestration_Overview.md
--
- - shared/thankyou.md
- - containers/links.md
-#-
- #- containers/Docker_Machine.md
- #- containers/Ambassadors.md
- #- containers/Namespaces_Cgroups.md
- #- containers/Copy_On_Write.md
- #- containers/Containers_From_Scratch.md
- #- containers/Pods_Anatomy.md
- #- containers/Ecosystem.md
diff --git a/slides/kadm-fullday.yml b/slides/kadm-fullday.yml
deleted file mode 100644
index e40d6d27..00000000
--- a/slides/kadm-fullday.yml
+++ /dev/null
@@ -1,60 +0,0 @@
-title: |
- Kubernetes
- for Admins and Ops
-
-#chat: "[Slack](https://dockercommunity.slack.com/messages/C7GKACWDV)"
-#chat: "[Gitter](https://gitter.im/jpetazzo/workshop-yyyymmdd-city)"
-chat: "In person!"
-
-gitrepo: github.com/jpetazzo/container.training
-
-slides: http://container.training/
-
-#slidenumberprefix: "#SomeHashTag — "
-
-exclude:
-- self-paced
-- static-pods-exercise
-
-content:
-- shared/title.md
-- logistics.md
-- k8s/intro.md
-- shared/about-slides.md
-- shared/chat-room-im.md
-#- shared/chat-room-slack.md
-#- shared/chat-room-zoom-meeting.md
-#- shared/chat-room-zoom-webinar.md
-- shared/toc.md
--
- - k8s/prereqs-admin.md
- - k8s/architecture.md
- #- k8s/internal-apis.md
- - k8s/deploymentslideshow.md
- - k8s/dmuc.md
--
- - k8s/multinode.md
- - k8s/cni.md
- - k8s/cni-internals.md
- - k8s/interco.md
--
- - k8s/apilb.md
- #- k8s/setup-overview.md
- #- k8s/setup-devel.md
- #- k8s/setup-managed.md
- #- k8s/setup-selfhosted.md
- - k8s/cluster-upgrade.md
- - k8s/cluster-backup.md
- - k8s/staticpods.md
--
- #- k8s/cloud-controller-manager.md
- #- k8s/bootstrap.md
- - k8s/control-plane-auth.md
- - k8s/podsecuritypolicy.md
- - k8s/user-cert.md
- - k8s/csr-api.md
- - k8s/openid-connect.md
--
- #- k8s/lastwords-admin.md
- - k8s/links.md
- - shared/thankyou.md
diff --git a/slides/kadm-twodays.yml b/slides/kadm-twodays.yml
deleted file mode 100644
index dea0f87d..00000000
--- a/slides/kadm-twodays.yml
+++ /dev/null
@@ -1,84 +0,0 @@
-title: |
- Kubernetes
- for administrators
- and operators
-
-#chat: "[Slack](https://dockercommunity.slack.com/messages/C7GKACWDV)"
-#chat: "[Gitter](https://gitter.im/jpetazzo/workshop-yyyymmdd-city)"
-chat: "In person!"
-
-gitrepo: github.com/jpetazzo/container.training
-
-slides: http://container.training/
-
-#slidenumberprefix: "#SomeHashTag — "
-
-exclude:
-- self-paced
-
-content:
-- shared/title.md
-- logistics.md
-- k8s/intro.md
-- shared/about-slides.md
-- shared/chat-room-im.md
-#- shared/chat-room-slack.md
-#- shared/chat-room-zoom-meeting.md
-#- shared/chat-room-zoom-webinar.md
-- shared/toc.md
-# DAY 1
-- - k8s/prereqs-admin.md
- - k8s/architecture.md
- - k8s/internal-apis.md
- - k8s/deploymentslideshow.md
- - k8s/dmuc.md
-- - k8s/multinode.md
- - k8s/cni.md
- - k8s/cni-internals.md
- - k8s/interco.md
-- - k8s/apilb.md
- - k8s/setup-overview.md
- #- k8s/setup-devel.md
- - k8s/setup-managed.md
- - k8s/setup-selfhosted.md
- - k8s/cluster-upgrade.md
- - k8s/staticpods.md
-- - k8s/cluster-backup.md
- - k8s/cloud-controller-manager.md
- - k8s/healthchecks.md
- - k8s/healthchecks-more.md
-# DAY 2
-- - k8s/kubercoins.md
- - k8s/logs-cli.md
- - k8s/logs-centralized.md
- - k8s/authn-authz.md
- - k8s/user-cert.md
- - k8s/csr-api.md
-- - k8s/openid-connect.md
- - k8s/control-plane-auth.md
- ###- k8s/bootstrap.md
- - k8s/netpol.md
- - k8s/podsecuritypolicy.md
-- - k8s/resource-limits.md
- - k8s/metrics-server.md
- - k8s/cluster-sizing.md
- - k8s/horizontal-pod-autoscaler.md
-- - k8s/prometheus.md
- - k8s/extending-api.md
- - k8s/crd.md
- - k8s/operators.md
- - k8s/eck.md
- ###- k8s/operators-design.md
-# CONCLUSION
-- - k8s/lastwords.md
- - k8s/links.md
- - shared/thankyou.md
- - |
- # (All content after this slide is bonus material)
-# EXTRA
-- - k8s/volumes.md
- - k8s/configuration.md
- - k8s/secrets.md
- - k8s/statefulsets.md
- - k8s/local-persistent-volumes.md
- - k8s/portworx.md
diff --git a/slides/kube-adv.yml b/slides/kube-adv.yml
deleted file mode 100644
index 951531c2..00000000
--- a/slides/kube-adv.yml
+++ /dev/null
@@ -1,84 +0,0 @@
-title: |
- Advanced
- Kubernetes
-
-chat: "[Slack](https://dockercommunity.slack.com/messages/C7GKACWDV)"
-#chat: "[Gitter](https://gitter.im/jpetazzo/workshop-yyyymmdd-city)"
-
-gitrepo: github.com/jpetazzo/container.training
-
-slides: https://container.training/
-
-#slidenumberprefix: "#SomeHashTag — "
-
-exclude:
-- self-paced
-
-content:
-- shared/title.md
-- logistics.md
-- k8s/intro.md
-- shared/about-slides.md
-#- shared/chat-room-im.md
-#- shared/chat-room-slack.md
-#- shared/chat-room-zoom-meeting.md
-#- shared/chat-room-zoom-webinar.md
-- shared/toc.md
-- #1
- - k8s/prereqs-admin.md
- - k8s/architecture.md
- - k8s/internal-apis.md
- - k8s/deploymentslideshow.md
- - k8s/dmuc.md
-- #2
- - k8s/multinode.md
- - k8s/cni.md
- - k8s/interco.md
-- #3
- - k8s/cni-internals.md
- - k8s/apilb.md
- - k8s/control-plane-auth.md
- - |
- # (Extra content)
- - k8s/staticpods.md
- - k8s/cluster-upgrade.md
-- #4
- - k8s/kustomize.md
- - k8s/helm-intro.md
- - k8s/helm-chart-format.md
- - k8s/helm-create-basic-chart.md
- - |
- # (Extra content)
- - k8s/helm-create-better-chart.md
- - k8s/helm-dependencies.md
- - k8s/helm-values-schema-validation.md
- - k8s/helm-secrets.md
-- #5
- - k8s/extending-api.md
- - k8s/operators.md
- - k8s/sealed-secrets.md
- - k8s/crd.md
-- #6
- - k8s/ingress-tls.md
- - k8s/cert-manager.md
- - k8s/eck.md
-- #7
- - k8s/admission.md
- - k8s/kyverno.md
-- #8
- - k8s/aggregation-layer.md
- - k8s/metrics-server.md
- - k8s/prometheus.md
- - k8s/hpa-v2.md
-- #9
- - k8s/operators-design.md
- - k8s/kubebuilder.md
- - k8s/events.md
- - k8s/finalizers.md
- - |
- # (Extra content)
- - k8s/owners-and-dependents.md
- - k8s/apiserver-deepdive.md
- #- k8s/record.md
- - shared/thankyou.md
-
diff --git a/slides/kube-fullday.yml b/slides/kube-fullday.yml
deleted file mode 100644
index 050bddc8..00000000
--- a/slides/kube-fullday.yml
+++ /dev/null
@@ -1,125 +0,0 @@
-title: |
- Deploying and Scaling Microservices
- with Kubernetes
-
-#chat: "[Slack](https://dockercommunity.slack.com/messages/C7GKACWDV)"
-#chat: "[Gitter](https://gitter.im/jpetazzo/workshop-yyyymmdd-city)"
-chat: "In person!"
-
-gitrepo: github.com/jpetazzo/container.training
-
-slides: http://container.training/
-
-#slidenumberprefix: "#SomeHashTag — "
-
-exclude:
-- self-paced
-
-content:
-- shared/title.md
-- logistics.md
-- k8s/intro.md
-- shared/about-slides.md
-- shared/chat-room-im.md
-#- shared/chat-room-slack.md
-#- shared/chat-room-zoom-meeting.md
-#- shared/chat-room-zoom-webinar.md
-- shared/toc.md
--
- - shared/prereqs.md
- #- shared/webssh.md
- - shared/connecting.md
- #- k8s/versions-k8s.md
- - shared/sampleapp.md
- #- shared/composescale.md
- #- shared/hastyconclusions.md
- - shared/composedown.md
- - k8s/concepts-k8s.md
- - k8s/kubectlget.md
--
- - k8s/kubectl-run.md
- - k8s/batch-jobs.md
- - k8s/labels-annotations.md
- - k8s/kubectl-logs.md
- - k8s/logs-cli.md
- - shared/declarative.md
- - k8s/declarative.md
- - k8s/deploymentslideshow.md
- - k8s/kubenet.md
- - k8s/kubectlexpose.md
- - k8s/shippingimages.md
- #- k8s/buildshiprun-selfhosted.md
- - k8s/buildshiprun-dockerhub.md
- - k8s/ourapponkube.md
- #- k8s/exercise-wordsmith.md
--
- - k8s/yamldeploy.md
- - k8s/setup-overview.md
- #- k8s/setup-devel.md
- #- k8s/setup-managed.md
- #- k8s/setup-selfhosted.md
- #- k8s/dashboard.md
- #- k8s/k9s.md
- #- k8s/tilt.md
- #- k8s/kubectlscale.md
- - k8s/scalingdockercoins.md
- - shared/hastyconclusions.md
- - k8s/daemonset.md
- #- k8s/authoring-yaml.md
- #- k8s/exercise-yaml.md
- #- k8s/localkubeconfig.md
- #- k8s/access-eks-cluster.md
- #- k8s/accessinternal.md
- #- k8s/kubectlproxy.md
- - k8s/rollout.md
- #- k8s/healthchecks.md
- #- k8s/healthchecks-more.md
- #- k8s/record.md
--
- - k8s/namespaces.md
- - k8s/ingress.md
- #- k8s/ingress-tls.md
- #- k8s/kustomize.md
- #- k8s/helm-intro.md
- #- k8s/helm-chart-format.md
- #- k8s/helm-create-basic-chart.md
- #- k8s/helm-create-better-chart.md
- #- k8s/helm-dependencies.md
- #- k8s/helm-values-schema-validation.md
- #- k8s/helm-secrets.md
- #- k8s/exercise-helm.md
- #- k8s/gitlab.md
- #- k8s/create-chart.md
- #- k8s/create-more-charts.md
- #- k8s/netpol.md
- #- k8s/authn-authz.md
- #- k8s/user-cert.md
- #- k8s/csr-api.md
- #- k8s/openid-connect.md
- #- k8s/podsecuritypolicy.md
- - k8s/volumes.md
- #- k8s/exercise-configmap.md
- #- k8s/build-with-docker.md
- #- k8s/build-with-kaniko.md
- - k8s/configuration.md
- - k8s/secrets.md
- #- k8s/logs-centralized.md
- #- k8s/prometheus.md
- #- k8s/statefulsets.md
- #- k8s/local-persistent-volumes.md
- #- k8s/portworx.md
- #- k8s/openebs.md
- #- k8s/extending-api.md
- #- k8s/crd.md
- #- k8s/admission.md
- #- k8s/operators.md
- #- k8s/operators-design.md
- #- k8s/staticpods.md
- #- k8s/finalizers.md
- #- k8s/owners-and-dependents.md
- #- k8s/gitworkflows.md
--
- - k8s/whatsnext.md
- - k8s/lastwords.md
- - k8s/links.md
- - shared/thankyou.md
diff --git a/slides/kube-halfday.yml b/slides/kube-halfday.yml
deleted file mode 100644
index f3045598..00000000
--- a/slides/kube-halfday.yml
+++ /dev/null
@@ -1,88 +0,0 @@
-title: |
- Kubernetes 101
-
-
-#chat: "[Slack](https://dockercommunity.slack.com/messages/C7GKACWDV)"
-#chat: "[Gitter](https://gitter.im/jpetazzo/training-20180413-paris)"
-chat: "In person!"
-
-gitrepo: github.com/jpetazzo/container.training
-
-slides: http://container.training/
-
-#slidenumberprefix: "#SomeHashTag — "
-
-exclude:
-- self-paced
-
-content:
-- shared/title.md
-#- logistics.md
-# Bridget-specific; others use logistics.md
-- logistics-bridget.md
-- k8s/intro.md
-- shared/about-slides.md
-- shared/chat-room-im.md
-#- shared/chat-room-slack.md
-#- shared/chat-room-zoom-meeting.md
-#- shared/chat-room-zoom-webinar.md
-- shared/toc.md
-- - shared/prereqs.md
- #- shared/webssh.md
- - shared/connecting.md
- - k8s/versions-k8s.md
- - shared/sampleapp.md
-# Bridget doesn't go into as much depth with compose
- #- shared/composescale.md
- #- shared/hastyconclusions.md
- - shared/composedown.md
- - k8s/concepts-k8s.md
- - shared/declarative.md
- - k8s/declarative.md
- - k8s/kubenet.md
- - k8s/kubectlget.md
- - k8s/setup-overview.md
- #- k8s/setup-devel.md
- #- k8s/setup-managed.md
- #- k8s/setup-selfhosted.md
-- - k8s/kubectl-run.md
- #- k8s/batch-jobs.md
- #- k8s/labels-annotations.md
- - k8s/kubectl-logs.md
- - k8s/deploymentslideshow.md
- - k8s/kubectlexpose.md
- - k8s/shippingimages.md
- #- k8s/buildshiprun-selfhosted.md
- - k8s/buildshiprun-dockerhub.md
- - k8s/ourapponkube.md
- #- k8s/localkubeconfig.md
- #- k8s/access-eks-cluster.md
- #- k8s/accessinternal.md
- #- k8s/kubectlproxy.md
-- - k8s/dashboard.md
- #- k8s/k9s.md
- #- k8s/tilt.md
- #- k8s/kubectlscale.md
- - k8s/scalingdockercoins.md
- - shared/hastyconclusions.md
- - k8s/daemonset.md
- - k8s/rollout.md
- #- k8s/record.md
-- - k8s/logs-cli.md
-# Bridget hasn't added EFK yet
- #- k8s/logs-centralized.md
- - k8s/namespaces.md
- - k8s/helm-intro.md
- #- k8s/helm-chart-format.md
- - k8s/helm-create-basic-chart.md
- #- k8s/helm-create-better-chart.md
- #- k8s/helm-dependencies.md
- #- k8s/helm-values-schema-validation.md
- #- k8s/helm-secrets.md
- #- k8s/kustomize.md
- #- k8s/netpol.md
- - k8s/whatsnext.md
-# - k8s/links.md
-# Bridget-specific
- - k8s/links-bridget.md
- - shared/thankyou.md
diff --git a/slides/kube-selfpaced.yml b/slides/kube-selfpaced.yml
deleted file mode 100644
index 4328175c..00000000
--- a/slides/kube-selfpaced.yml
+++ /dev/null
@@ -1,154 +0,0 @@
-title: |
- Deploying and Scaling Microservices
- with Docker and Kubernetes
-
-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/
-
-#slidenumberprefix: "#SomeHashTag — "
-
-exclude:
-- in-person
-
-content:
-- shared/title.md
-#- logistics.md
-- k8s/intro.md
-- shared/about-slides.md
-#- shared/chat-room-im.md
-#- shared/chat-room-slack.md
-#- shared/chat-room-zoom-meeting.md
-#- shared/chat-room-zoom-webinar.md
-- shared/toc.md
--
- - shared/prereqs.md
- #- shared/webssh.md
- - shared/connecting.md
- - k8s/versions-k8s.md
- - shared/sampleapp.md
- #- shared/composescale.md
- #- shared/hastyconclusions.md
- - shared/composedown.md
- - k8s/concepts-k8s.md
--
- - k8s/kubectlget.md
- - k8s/kubectl-run.md
- - k8s/batch-jobs.md
- - k8s/labels-annotations.md
- - k8s/kubectl-logs.md
- - k8s/logs-cli.md
- - shared/declarative.md
- - k8s/declarative.md
- - k8s/deploymentslideshow.md
--
- - k8s/kubenet.md
- - k8s/kubectlexpose.md
- - k8s/shippingimages.md
- - k8s/buildshiprun-selfhosted.md
- - k8s/buildshiprun-dockerhub.md
- - k8s/ourapponkube.md
- #- k8s/exercise-wordsmith.md
- - k8s/yamldeploy.md
--
- - k8s/setup-overview.md
- - k8s/setup-devel.md
- - k8s/setup-managed.md
- - k8s/setup-selfhosted.md
- - k8s/dashboard.md
- - k8s/k9s.md
- - k8s/tilt.md
- #- k8s/kubectlscale.md
- - k8s/scalingdockercoins.md
- - shared/hastyconclusions.md
- - k8s/daemonset.md
- - k8s/authoring-yaml.md
- #- k8s/exercise-yaml.md
--
- - k8s/rollout.md
- - k8s/healthchecks.md
- - k8s/healthchecks-more.md
- - k8s/record.md
--
- - k8s/namespaces.md
- - k8s/localkubeconfig.md
- #- k8s/access-eks-cluster.md
- - k8s/accessinternal.md
- - k8s/kubectlproxy.md
--
- - k8s/ingress.md
- - k8s/ingress-tls.md
- - k8s/cert-manager.md
- - k8s/kustomize.md
- - k8s/helm-intro.md
- - k8s/helm-chart-format.md
- - k8s/helm-create-basic-chart.md
- - k8s/helm-create-better-chart.md
- - k8s/helm-dependencies.md
- - k8s/helm-values-schema-validation.md
- - k8s/helm-secrets.md
- #- k8s/exercise-helm.md
- - k8s/gitlab.md
--
- - k8s/netpol.md
- - k8s/authn-authz.md
- - k8s/podsecuritypolicy.md
- - k8s/user-cert.md
- - k8s/csr-api.md
- - k8s/openid-connect.md
- - k8s/control-plane-auth.md
--
- - k8s/volumes.md
- #- k8s/exercise-configmap.md
- - k8s/build-with-docker.md
- - k8s/build-with-kaniko.md
--
- - k8s/configuration.md
- - k8s/secrets.md
- - k8s/statefulsets.md
- - k8s/local-persistent-volumes.md
- - k8s/portworx.md
- - k8s/openebs.md
--
- - k8s/logs-centralized.md
- - k8s/prometheus.md
- - k8s/resource-limits.md
- - k8s/metrics-server.md
- - k8s/cluster-sizing.md
- - k8s/horizontal-pod-autoscaler.md
- - k8s/hpa-v2.md
--
- - k8s/extending-api.md
- - k8s/apiserver-deepdive.md
- - k8s/crd.md
- - k8s/aggregation-layer.md
- - k8s/admission.md
- - k8s/operators.md
- - k8s/operators-design.md
- - k8s/kubebuilder.md
- - k8s/sealed-secrets.md
- - k8s/kyverno.md
- - k8s/eck.md
- - k8s/finalizers.md
- - k8s/owners-and-dependents.md
- - k8s/events.md
--
- - k8s/dmuc.md
- - k8s/multinode.md
- - k8s/cni.md
- - k8s/cni-internals.md
- - k8s/apilb.md
- - k8s/staticpods.md
--
- - k8s/cluster-upgrade.md
- - k8s/cluster-backup.md
- - k8s/cloud-controller-manager.md
- - k8s/gitworkflows.md
--
- - k8s/lastwords.md
- - k8s/links.md
- - shared/thankyou.md
diff --git a/slides/kube-twodays.yml b/slides/kube-twodays.yml
deleted file mode 100644
index 71805b23..00000000
--- a/slides/kube-twodays.yml
+++ /dev/null
@@ -1,124 +0,0 @@
-title: |
- Deploying and Scaling Microservices
- with Kubernetes
-
-#chat: "[Slack](https://dockercommunity.slack.com/messages/C7GKACWDV)"
-#chat: "[Gitter](https://gitter.im/jpetazzo/workshop-yyyymmdd-city)"
-chat: "In person!"
-
-gitrepo: github.com/jpetazzo/container.training
-
-slides: http://container.training/
-
-#slidenumberprefix: "#SomeHashTag — "
-
-exclude:
-- self-paced
-
-content:
-- shared/title.md
-- logistics.md
-- k8s/intro.md
-- shared/about-slides.md
-- shared/chat-room-im.md
-#- shared/chat-room-slack.md
-#- shared/chat-room-zoom-meeting.md
-#- shared/chat-room-zoom-webinar.md
-- shared/toc.md
--
- - shared/prereqs.md
- #- shared/webssh.md
- - shared/connecting.md
- #- k8s/versions-k8s.md
- - shared/sampleapp.md
- #- shared/composescale.md
- #- shared/hastyconclusions.md
- - shared/composedown.md
- - k8s/concepts-k8s.md
- - k8s/kubectlget.md
--
- - k8s/kubectl-run.md
- - k8s/batch-jobs.md
- - k8s/labels-annotations.md
- - k8s/kubectl-logs.md
- - k8s/logs-cli.md
- - shared/declarative.md
- - k8s/declarative.md
- - k8s/deploymentslideshow.md
- - k8s/kubenet.md
- - k8s/kubectlexpose.md
- - k8s/shippingimages.md
- #- k8s/buildshiprun-selfhosted.md
- - k8s/buildshiprun-dockerhub.md
- - k8s/ourapponkube.md
- #- k8s/exercise-wordsmith.md
--
- - k8s/yamldeploy.md
- - k8s/setup-overview.md
- - k8s/setup-devel.md
- #- k8s/setup-managed.md
- #- k8s/setup-selfhosted.md
- - k8s/dashboard.md
- - k8s/k9s.md
- #- k8s/tilt.md
- #- k8s/kubectlscale.md
- - k8s/scalingdockercoins.md
- - shared/hastyconclusions.md
- - k8s/daemonset.md
- - k8s/authoring-yaml.md
- #- k8s/exercise-yaml.md
--
- - k8s/localkubeconfig.md
- #- k8s/access-eks-cluster.md
- - k8s/accessinternal.md
- #- k8s/kubectlproxy.md
- - k8s/rollout.md
- - k8s/healthchecks.md
- #- k8s/healthchecks-more.md
- - k8s/record.md
--
- - k8s/namespaces.md
- - k8s/ingress.md
- #- k8s/ingress-tls.md
- - k8s/kustomize.md
- - k8s/helm-intro.md
- - k8s/helm-chart-format.md
- - k8s/helm-create-basic-chart.md
- - k8s/helm-create-better-chart.md
- - k8s/helm-dependencies.md
- - k8s/helm-values-schema-validation.md
- - k8s/helm-secrets.md
- #- k8s/exercise-helm.md
- - k8s/gitlab.md
--
- - k8s/netpol.md
- - k8s/authn-authz.md
- #- k8s/csr-api.md
- #- k8s/openid-connect.md
- #- k8s/podsecuritypolicy.md
--
- - k8s/volumes.md
- #- k8s/exercise-configmap.md
- #- k8s/build-with-docker.md
- #- k8s/build-with-kaniko.md
- - k8s/configuration.md
- - k8s/secrets.md
- - k8s/logs-centralized.md
- - k8s/prometheus.md
--
- - k8s/statefulsets.md
- - k8s/local-persistent-volumes.md
- - k8s/portworx.md
- #- k8s/openebs.md
- #- k8s/extending-api.md
- #- k8s/admission.md
- #- k8s/operators.md
- #- k8s/operators-design.md
- #- k8s/staticpods.md
- #- k8s/owners-and-dependents.md
- #- k8s/gitworkflows.md
--
- - k8s/whatsnext.md
- - k8s/lastwords.md
- - k8s/links.md
- - shared/thankyou.md
diff --git a/slides/logistics-template.md b/slides/logistics-template.md
index 6787e10b..c128ca23 100644
--- a/slides/logistics-template.md
+++ b/slides/logistics-template.md
@@ -1,35 +1,23 @@
## Intros
-- This slide should be customized by the tutorial instructor(s).
+- Hello! I'm Jérôme Petazzoni ([@jpetazzo](https://twitter.com/jpetazzo))
-- Hello! We are:
+- The workshop will run from 9am to noon (Pacific time)
- - 👩🏻🏫 Ann O'Nymous ([@...](https://twitter.com/...), Megacorp Inc)
+- There will be a short break around 10:30am
- - 👨🏾🎓 Stu Dent ([@...](https://twitter.com/...), University of Wakanda)
+- I can't hear, read, or see you ... but I'm helped by folks who can!
-
-
-- The workshop will run from ...
-
-- There will be a lunch break at ...
-
- (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@@
+- If someone asks a question and you know the answer, please chime in!
diff --git a/slides/one-more-thing.md b/slides/one-more-thing.md
new file mode 100644
index 00000000..5236b0bf
--- /dev/null
+++ b/slides/one-more-thing.md
@@ -0,0 +1,12 @@
+## One more thing ...
+
+Actually, three more things!
+
+- `docker system prune`
+
+- `docker run --net host --pid host -v /:/host`
+
+- "Docker on Apple Silicon and the Magic of BuildKit"
+
+ (Wednesday, 10am-10:30am)
+
\ No newline at end of file
diff --git a/slides/summit.html b/slides/summit.html
new file mode 100644
index 00000000..1df22011
--- /dev/null
+++ b/slides/summit.html
@@ -0,0 +1,27 @@
+
+
+
| Monday, April 26th 2021 | ++ Container Foundations + | +
| Tuesday, April 27th, 2021 | ++ Advanced Containers + | +