A bunch of changes in there

- added self-paced manifest for intro workshop
- refactored intro content to work for all workshops
- fixed footnote CSS to work in all contexts
- intro+logistics content is good to go
This commit is contained in:
Jérôme Petazzoni
2017-11-10 19:24:38 -08:00
parent 00262c767e
commit 4322478a4a
13 changed files with 104 additions and 84 deletions

View File

@@ -27,9 +27,9 @@ class: self-paced
- Likewise, it will take more than merely *reading* these slides
to make you an expert
- These slides include *tons* of exercises
- These slides include *tons* of exercises and examples
- They assume that you have access to a cluster of Docker nodes
- They assume that you have access to some Docker nodes
- If you are attending a workshop or tutorial:
<br/>you will be given specific instructions to access your cluster
@@ -39,3 +39,21 @@ class: self-paced
[Play-With-Docker](http://www.play-with-docker.com/) and
read [these instructions](https://github.com/jpetazzo/container.training#using-play-with-docker) for extra
details
---
## 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[👇 Try it! The source file will be shown and you can view it on GitHub and fork and edit it.]

View File

@@ -1,48 +0,0 @@
## Intros
- Hello! We are
AJ ([@s0ulshake](https://twitter.com/s0ulshake), Travis CI)
&
Jérôme ([@jpetazzo](https://twitter.com/jpetazzo), Docker Inc.)
- This is our collective Docker knowledge:
![Bell Curve](images/bell-curve.jpg)
---
## Agenda
.small[
- 09:00-09:10 Hello!
- 09:10-10:30 Part 1
- 10:30-11:00 coffee break
- 11:00-12:30 Part 2
- 12:30-13:30 lunch break
- 13:30-15:00 Part 3
- 15:00-15:30 coffee break
- 15:30-17:00 Part 4
- 17:00-18:00 Afterhours and Q&A
]
<!--
- The tutorial will run from 9:00am to 12:20pm
- This will be fast-paced, but DON'T PANIC!
<br/>
(all the content is publicly available)
- There will be a coffee break at 10:30am
<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/container.training
- Feel free to interrupt for questions at any time
- Live feedback, questions, help on @@CHAT@@

View File

@@ -60,9 +60,9 @@ class: in-person
## Where are we going to run our containers?
--
---
class: in-person
class: in-person, pic
![You get five VMs](images/you-get-five-vms.jpg)

View File

@@ -8,13 +8,14 @@ class: title, self-paced
class: title, in-person
@@TITLE@@
**Be kind to the WiFi!**
<br/>
*Use the 5G network.*
*Don't use your hotspot.*
<br/>
*Don't stream videos or download big files during the workshop.*
@@TITLE@@<br/></br>
.footnote[
**Be kind to the WiFi!**<br/>
<!-- *Use the 5G network.* -->
*Don't use your hotspot.*<br/>
*Don't stream videos or download big files during the workshop.*<br/>
*Thank you!*
**Slides: http://container.training/**
]

View File

@@ -11,7 +11,8 @@ exclude:
chapters:
- common/title.md
- common/logistics.md
- logistics.md
- common/intro.md
- common/toc.md
- - intro/Docker_Overview.md
#- intro/Docker_History.md

View File

@@ -0,0 +1,42 @@
title: |
Introduction
to Docker and
Containers
chat: "[Slack](https://dockercommunity.slack.com/messages/C7GKACWDV)"
#chat: "[Gitter](https://gitter.im/jpetazzo/workshop-yyyymmdd-city)"
exclude:
- in-person
chapters:
- common/title.md
# - common/logistics.md
- common/intro.md
- common/toc.md
- - intro/Docker_Overview.md
#- intro/Docker_History.md
- intro/Training_Environment.md
- intro/Installing_Docker.md
- intro/First_Containers.md
- intro/Background_Containers.md
- intro/Start_And_Attach.md
- - intro/Initial_Images.md
- intro/Building_Images_Interactively.md
- intro/Building_Images_With_Dockerfiles.md
- intro/Cmd_And_Entrypoint.md
- intro/Copying_Files_During_Build.md
- intro/Multi_Stage_Builds.md
- intro/Publishing_To_Docker_Hub.md
- intro/Dockerfile_Tips.md
- - intro/Naming_And_Inspecting.md
- intro/Container_Networking_Basics.md
- intro/Network_Drivers.md
- intro/Container_Network_Model.md
#- intro/Connecting_Containers_With_Links.md
- intro/Ambassadors.md
- - intro/Local_Development_Workflow.md
- intro/Working_With_Volumes.md
- intro/Compose_For_Dev_Stacks.md
- intro/Advanced_Dockerfiles.md
- common/thankyou.md

View File

@@ -11,8 +11,8 @@ exclude:
chapters:
- common/title.md
- common/logistics.md
- kube/intro-ks.md
- logistics.md
- common/intro.md
- common/toc.md
- - common/prereqs.md
- kube/versions-k8s.md

View File

@@ -1,15 +0,0 @@
## 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/container.training
- 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.]

17
slides/logistics.md Normal file
View File

@@ -0,0 +1,17 @@
## Intros
- Hello! We are:
- 👷🏻‍♀️ AJ ([@s0ulshake](https://twitter.com/s0ulshake), Travis CI)
- 🐳 Jérôme ([@jpetazzo](https://twitter.com/jpetazzo), Docker Inc.)
- The workshop will run from 9am to 4pm
- There will be a lunch break at noon
(And coffee breaks!)
- Feel free to interrupt for questions at any time
- Live feedback, questions, help on @@CHAT@@

View File

@@ -15,8 +15,8 @@ exclude:
chapters:
- common/title.md
- common/logistics.md
- swarm/intro.md
- logistics.md
- common/intro.md
- common/toc.md
- - common/prereqs.md
- swarm/versions.md

View File

@@ -15,8 +15,8 @@ exclude:
chapters:
- common/title.md
- common/logistics.md
- swarm/intro.md
- logistics.md
- common/intro.md
- common/toc.md
- - common/prereqs.md
- swarm/versions.md

View File

@@ -11,7 +11,7 @@ exclude:
chapters:
- common/title.md
#- common/logistics.md
- swarm/intro.md
- common/intro.md
- common/toc.md
- - common/prereqs.md
- swarm/versions.md

View File

@@ -81,7 +81,10 @@ a {
.footnote {
position: absolute;
bottom: 3em;
bottom: 1em;
}
span.footnote {
bottom: 2em;
}
.red { color: #fa0000; }
@@ -124,6 +127,7 @@ div.title > p:first-child {
font-size: 300%;
}
/* "Normal" images (not on title or pic slides) shouldn't be too big */
div img {
max-width: 1210px;
max-height: 250px;