Skip to content

Commit 72b5f0f

Browse files
sparaspara
authored
Merge pull request docker#275 from ManoMarks/master
Remove HoL 2016 and add in HoL from DCUS 2017
2 parents a6aafb6 + a1d53ea commit 72b5f0f

File tree

614 files changed

+66641
-2600
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

614 files changed

+66641
-2600
lines changed

‎README.md

+1
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,7 @@ This repo contains [Docker](https://docker.com) labs and tutorials authored both
1616
* [Building a 12 Factor app with Docker](12factor/README.md)
1717
* [Docker Security](security/README.md)
1818
* [Docker Networking](networking/)
19+
* [Hands-on Labs from DockerCon US 2017](dockercon-us-2017/)
1920

2021

2122
#### Community tutorials

‎dockercon-us-2016/README.md

-75
This file was deleted.

‎dockercon-us-2016/docker-cloud/README.md

-676
This file was deleted.

0 commit comments

Comments
 (0)