Bridget Kromhout
546d9a2986
Testing redirect
2018-07-10 07:45:55 -05:00
Bridget Kromhout
8e5d27b185
changing redirects back
2018-07-10 07:40:49 -05:00
Bridget Kromhout
e8d9e94b72
First pass at edits for 90min workshop
2018-07-10 07:37:39 -05:00
Bridget Kromhout
ca980de2fd
Merge branch 'master' of github.com:bridgetkromhout/container.training into devopsdaysmsp2018
2018-07-10 07:36:05 -05:00
Bridget Kromhout
78ac91fcd5
Merge pull request #300 from bridgetkromhout/add-msp
...
Adding MSP 2018
2018-07-10 05:46:23 -05:00
Bridget Kromhout
971b5b0e6d
Let's not link quite yet
2018-07-10 05:45:22 -05:00
Bridget Kromhout
3393563498
Adding MSP 2018
2018-07-06 16:11:37 -05:00
Bridget Kromhout
ea4f46599d
Adding devopsdays MSP 2018
2018-07-06 16:02:02 -05:00
Bridget Kromhout
94483ebfec
Merge pull request #298 from jpetazzo/improve-index-format
...
Switch to two-line format since our titles are so long
2018-07-06 15:43:01 -05:00
Jerome Petazzoni
db5d5878f5
Switch to two-line format since our titles are so long
2018-07-03 10:47:41 -05:00
ctas582
2585daac9b
Force rng to be single threaded ( #293 )
2018-06-28 08:20:54 -05:00
Bridget Kromhout
21043108b3
Merge pull request #296 from bridgetkromhout/version-up
...
Version bump
2018-06-27 01:14:06 -05:00
Bridget Kromhout
65faa4507c
Version bump
2018-06-27 08:12:40 +02:00
Bridget Kromhout
644f2b9c7a
Merge pull request #295 from bridgetkromhout/add-slides-ams
...
Adding slides link for ams
2018-06-26 17:04:27 -05:00
Bridget Kromhout
dab9d9fb7e
Adding slides link
2018-06-27 00:03:18 +02:00
Diego Quintana
139757613b
Update Container_Networking_Basics.md
...
Added needed single quotes. I've also moved `nginx` to the end of the line, to follow a more consistent syntax (`options` before `name|id`).
```
Usage: docker inspect [OPTIONS] NAME|ID [NAME|ID...]
Return low-level information on Docker objects
Options:
-f, --format string Format the output using the given Go template
-s, --size Display total file sizes if the type is container
--type string Return JSON for specified type
```
2018-06-22 10:58:26 -05:00
Bridget Kromhout
10eed2c1c7
Merge pull request #288 from ctas582/typos
...
Correct typos
2018-06-22 09:21:56 -05:00
ctas582
c4fa75a1da
Correct typos
2018-06-21 15:00:36 +01:00
ctas582
847140560f
Correct typo
2018-06-21 14:16:05 +01:00
ctas582
1dc07c33ab
Correct typos
2018-06-20 11:19:28 +01:00
Bridget Kromhout
4fc73d95c0
Merge pull request #285 from bridgetkromhout/vupdate
...
Updating version
2018-06-12 10:14:21 -07:00
Bridget Kromhout
690ed55953
Updating version
2018-06-12 10:12:04 -07:00
Bridget Kromhout
16a5809518
Merge pull request #284 from bridgetkromhout/add-vel-2day
...
Adding Erik and Brian's two-day Velocity training to the front page
2018-06-12 09:01:32 -07:00
Bridget Kromhout
0fed34600b
Adding Erik and Brian's two-day
2018-06-12 08:55:53 -07:00
Jerome Petazzoni
2d95f4177a
Remove extraneous python invocation
2018-06-12 04:25:00 -05:00
Bridget Kromhout
e9d1db56fa
Adding VelNY bootcamp ( #283 )
...
* Adding VelNY bootcamp
* Colon not good here
2018-06-12 04:09:54 -05:00
Bridget Kromhout
a076a766a9
Merge pull request #282 from bridgetkromhout/reorder
...
Reordering upcoming events
2018-06-11 09:47:57 -07:00
Bridget Kromhout
be3c78bf54
Reordering
2018-06-11 09:40:30 -07:00
Bridget Kromhout
5bb6b8e2ab
Merge pull request #281 from bridgetkromhout/add-velocity-sj-2018
...
Adding Velocity SJ 2018
2018-06-11 09:08:35 -07:00
Bridget Kromhout
f79193681d
Adding Velocity SJ 2018
2018-06-11 08:53:53 -07:00
Bridget Kromhout
379ae69db5
Merge pull request #277 from bridgetkromhout/rollout-failure
...
Clarifying rollout failure via dashboard
2018-06-11 08:34:36 -07:00
Jerome Petazzoni
cde89f50a2
Add mention to skip slide if dashboard isn't deployed
2018-06-10 17:07:56 -05:00
Bridget Kromhout
98563ba1ce
Clarifying rollout failure via dashboard
2018-06-04 20:58:57 -05:00
Bridget Kromhout
99bf8cc39f
Merge pull request #271 from jpetazzo/new-index-generator
...
Replace index.html with a generator
2018-06-05 02:13:27 +02:00
Bridget Kromhout
ea642cf90e
Merge pull request #274 from bridgetkromhout/eng-v
...
bumping version
2018-06-04 23:28:48 +02:00
Bridget Kromhout
a7d89062cf
Bumping engine version
2018-06-04 15:43:30 -05:00
Bridget Kromhout
564e4856b4
Merge branch 'master' of https://github.com/jpetazzo/container.training
2018-06-04 14:41:07 -05:00
Bridget Kromhout
011cd08af3
Merge pull request #269 from jpetazzo/kubectlproxy
...
Show how to access internal services with kubectl proxy
2018-06-04 21:40:40 +02:00
Jerome Petazzoni
e294a4726c
Update version numbers
2018-06-04 08:47:30 -05:00
Jerome Petazzoni
a21e8b0849
Image and title size fixes
2018-06-04 06:11:00 -05:00
Jerome Petazzoni
cc6f36b50f
Wording (non-native speakers probably don't know boo-boo)
2018-06-04 05:54:02 -05:00
Jerome Petazzoni
6e35162788
Remove 'kubernetes in action' demo
2018-06-04 05:50:21 -05:00
Jerome Petazzoni
30ca940eeb
Opt-out a bunch of slides in the deep dive section
2018-06-04 05:49:24 -05:00
Jerome Petazzoni
14eb19a42b
Typo fixes
2018-06-04 05:43:28 -05:00
Jerome Petazzoni
da053ecde2
Update fundamentals TOC
2018-06-03 15:27:27 -05:00
Jerome Petazzoni
c86ef7de45
Add 'past workshops' page and backfill 2016-2017 workshops
2018-06-03 09:55:43 -05:00
Jérôme Petazzoni
c5572020b9
Add a few slides about resource limits ( #273 )
...
The section about namespaces and cgroups is very thorough,
but we also need something showing how to practically
limit container resource usage without diving into a very
deep technical chapter.
2018-06-03 05:28:16 -05:00
Jerome Petazzoni
3d7ed3a3f7
Clarify how to stop kubectl proxy
2018-06-03 05:10:48 -05:00
Bridget Kromhout
138163056f
Merge pull request #270 from jpetazzo/kubectl-create-namespace
...
Show an easier way to create namespaces
2018-06-02 17:12:38 +02:00
Alexis Daboville
5e78e00bc9
Small typos ( #272 )
...
* Small typo
* elastichsearch -> elasticsearch
* realeased -> released
2018-06-02 09:09:38 -05:00
