github/container.training
1
0
Fork 0
mirror of https://github.com/jpetazzo/container.training.git synced 2026-07-25 15:56:29 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' into kube

Browse Source
This commit is contained in:
Jérôme Petazzoni
2017-11-19 23:34:32 -08:00
parent 5e9e8fa95b f264838ec5
commit a5101b2db3
2 changed files with 12 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
slides/index.html
View File

@@ -66,15 +66,21 @@
<tr><td class="title" colspan="4">Coming soon at a conference near you</td></tr>
<!--
<td><a class="chat" href="https://gitter.im/jpetazzo/workshop-20171026-prague" /></td>
<tr>
<td>Kubernetes enablement at Docker</td>
<td><a class="slides" href="http://kube.container.training/" /></td>
<td><a class="chat" href="https://docker.slack.com/messages/C83M572J2" /></td>
</tr>
<!--
<td><a class="attend" href="https://qconsf.com/sf2017/workshop/orchestrating-microservices-docker-swarm" /></td>
-->
-->
<!--
<tr>
<td>Nothing for now (stay tuned...)</td>
</tr>
-->
<tr><td class="title" colspan="4">Past workshops</td></tr>

4
slides/kube/versions-k8s.md
View File

@@ -1,8 +1,8 @@
## Brand new versions!
- Kubernetes 1.8
- Docker Engine 17.10
- Docker Compose 1.16
- Docker Engine 17.11
- Docker Compose 1.17
.exercise[