Merge pull request docker#280 from ManoMarks/master

Adding in workshops from DockerCon 2017 Austin
trapier · May 16, 2017 · 5d4aa45 · 5d4aa45
2 parents 39bda42 + 39aa50a
commit 5d4aa45
Show file tree

Hide file tree

Showing 6 changed files with 20 additions and 1 deletion.
diff --git a/dockercon-us-2017/README.md b/dockercon-us-2017/README.md
@@ -4,7 +4,9 @@
 
 This repo contains the series of hands-on labs presented at DockerCon 2017 in Austin. They are designed to help you gain experience in various Docker features, products, and solutions. Depending on your experience, each lab requires between 30-45 minutes to complete. They range in difficulty from easy to advanced.
 
-At the Hands-on Labs at DockerCon 2017 in Austin, we issued [Microsoft Azure](https://azure.microsoft.com/) credentials and hostnames. Many of these labs assumes you have Azure VMs and Docker Datacenter licenses. You can sign up for Azure resources through the Azure site. You can get a trial license for Docker Datacenter through [Docker Store](https://store.docker.com/search?offering=enterprise&type=edition).
+At the Hands-on Labs at DockerCon 2017 in Austin, we issued [Microsoft Azure](https://azure.microsoft.com/) credentials and hostnames. Many of these labs assumes you have Azure VMs and Docker Datacenter licenses. You can sign up for Azure resources through the Azure site. Each lab will identify prerequists at the begining of the lab. For Linux base nodes you 
+
+You can get a trial license for Docker Datacenter through [Docker Store](https://store.docker.com/search?offering=enterprise&type=edition).
 
 ---
 
@@ -135,3 +137,7 @@ This lab is aimed at ops and system admins. It steps through packaging an ASP.NE
 > - Package an existing ASP.NET MSI so the app runs in Docker, without any application changes.
 > - Create an upgraded package with application updates and Windows patches.
 > - Update and rollback the running application in a production environment with zero downtime.
+
+## [DockerCon 2017 Austin Workshops](workshop-slides/README.md)
+
+At DockerCon 2017 in Austin, we had [10 workshops](https://2017.dockercon.com/workshops/), each lasting about 3 hours.
diff --git a/dockercon-us-2017/workshop-slides/README.md b/dockercon-us-2017/workshop-slides/README.md
@@ -0,0 +1,13 @@
+# DockerCon 2017 Austin Workshops
+
+At DockerCon 2017 in Austin, we had [10 workshops](https://2017.dockercon.com/workshops/), each lasting about 3 hours. These are the slides from the workshops so you can get the same content.
+
+* [Learn Docker](./docker-101-workshop-dockercon.pdf)
+* [Orchestration Workshop](https://github.com/jpetazzo/orchestration-workshop) Beginner and Advanced
+* Introduction to Enterprise Docker Operations. Paid training, check out our offerings on [training.docker.com](http://training.docker.com/)
+* [Docker Security](security-workshop-dockercon.pdf)
+* [Networking Workshop](networking-workshop-dockercon.pdf)
+* [Docker for Java Developers](https://github.com/docker/labs/tree/master/developer-tools/java)
+* [Modernizing Monolithic ASP.NET Applications with Docker](mta-asp-dockercon-workshop.pdf)
+* [Hands-on Docker for Raspberry Pi](http://blog.alexellis.io/hands-on-docker-raspberrypi/)
+* [Microservices Lifecycle Explained Through Docker and Continuous Deployment](http://vfarcic.github.io/devops21/workshop.html)
diff --git a/dockercon-us-2017/workshop-slides/docker-101-workshop-dockercon.pdf b/dockercon-us-2017/workshop-slides/docker-101-workshop-dockercon.pdf
diff --git a/dockercon-us-2017/workshop-slides/mta-asp-dockercon-workshop.pdf b/dockercon-us-2017/workshop-slides/mta-asp-dockercon-workshop.pdf
diff --git a/dockercon-us-2017/workshop-slides/networking-workshop-dockercon.pdf b/dockercon-us-2017/workshop-slides/networking-workshop-dockercon.pdf
diff --git a/dockercon-us-2017/workshop-slides/security-workshop-dockercon.pdf b/dockercon-us-2017/workshop-slides/security-workshop-dockercon.pdf