Better k8s intro, fix chat links

This commit is contained in:
Jérôme Petazzoni
2017-10-24 13:57:51 +02:00
parent f63107ce15
commit 488fa1c981
7 changed files with 47 additions and 21 deletions

BIN
docs/aj-containers.jpeg Normal file

Binary file not shown.

After

Width:  |  Height:  |  Size: 127 KiB

View File

@@ -2,7 +2,10 @@
case "$1" in
once)
for YAML in *.yml; do
./markmaker.py < $YAML > $YAML.html || rm $YAML.html
./markmaker.py < $YAML > $YAML.html || {
rm $YAML.html
break
}
done
;;

View File

@@ -1,4 +1,4 @@
chat: https://dockercommunity.slack.com/messages/C7ET1GY4Q
chat: "[Slack](https://dockercommunity.slack.com/messages/C7ET1GY4Q)"
exclude:
- self-paced

15
docs/intro-ks.md Normal file
View File

@@ -0,0 +1,15 @@
## About these slides
- Your one-stop shop to awesomeness:
http://container.training/
- The content that you're viewing right now is in a public GitHub repository:
https://github.com/jpetazzo/orchestration-workshop
- Typos? Mistakes? Questions? Feel free to hover over the bottom of the slide ...
--
.footnote[👇 Try it! The source file will be shown and you can view it on GitHub and fork and edit it.]

View File

@@ -2,7 +2,7 @@ exclude:
- self-paced
- snap
chat: "FIXME"
chat: "[Gitter](https://gitter.im/jpetazzo/workshop-20171026-prague)"
chapters:
- |
@@ -16,8 +16,10 @@ chapters:
**Be kind to the WiFi!**
<!--
*Use the 5G network*
<br/>
-->
*Don't use your hotspot*
<br/>
*Don't stream videos from YouTube, Netflix, etc.
@@ -33,12 +35,26 @@ chapters:
## Intros
- Hello! I am
Jérôme ([@jpetazzo](https://twitter.com/jpetazzo))
- Hello! We are
Jérôme ([@jpetazzo](https://twitter.com/jpetazzo), Docker Inc.)
&
AJ ([@s0ulshake](https://twitter.com/s0ulshake), Travis CI)
--
- This is my first time doing this
- This is our first time doing this
--
- But ... containers and us go back a long way
--
![CONTAINERS, I TELL YOU](aj-containers.jpeg)
--
- In the immortal words of [Chelsea Manning](https://twitter.com/xychelsea): #WeGotThis!
---
@@ -50,17 +66,15 @@ chapters:
<br/>
(please remind me if I forget about it!)
- All the content is publicly available (slides, code samples, scripts)
Upstream URL: https://github.com/jpetazzo/orchestration-workshop
- This will be fast-paced, but DON'T PANIC!
<br/>
(all the content is publicly available)
- Feel free to interrupt for questions at any time
- Live feedback, questions, help on [Gitter](chat)
- Live feedback, questions, help on @@CHAT@@
http://container.training/chat
- intro.md
- intro-ks.md
- |
@@TOC@@
- - prereqs-k8s.md

View File

@@ -27,9 +27,6 @@ class: in-person, extra-details
- [GitHub](https://github.com/join) account
<br/>(if you want to fork the repo)
- [Gitter](https://gitter.im/) account
<br/>(to join the conversation during the workshop)
- [Slack](https://community.docker.com/registrations/groups/4316) account
<br/>(to join the conversation after the workshop)
@@ -66,7 +63,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 on @@CHAT@@
]

View File

@@ -30,9 +30,6 @@ class: in-person, extra-details
- [GitHub](https://github.com/join) account
<br/>(if you want to fork the repo)
- [Gitter](https://gitter.im/) account
<br/>(to join the conversation during the workshop)
- [Slack](https://community.docker.com/registrations/groups/4316) account
<br/>(to join the conversation after the workshop)
@@ -69,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 on @@CHAT@@
]