diff --git a/dockercon-us-2017/README.md b/dockercon-us-2017/README.md index 4419061b04..779e4a4d53 100644 --- a/dockercon-us-2017/README.md +++ b/dockercon-us-2017/README.md @@ -137,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. \ No newline at end of file diff --git a/dockercon-us-2017/workshop-slides/README.md b/dockercon-us-2017/workshop-slides/README.md new file mode 100644 index 0000000000..5ab474a127 --- /dev/null +++ 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 [trainging.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) \ No newline at end of file diff --git a/dockercon-us-2017/workshop-slides/docker-101-workshop-dockercon.pdf b/dockercon-us-2017/workshop-slides/docker-101-workshop-dockercon.pdf new file mode 100644 index 0000000000..e977862391 Binary files /dev/null and b/dockercon-us-2017/workshop-slides/docker-101-workshop-dockercon.pdf differ