Commit Graph

840 Commits

Author SHA1 Message Date
Julien Bisconti
63f00a857d Merge pull request #59 from tarnfeld/patch-1
Added Portainer
2015-08-06 17:15:36 +02:00
Tom Arnfeld
a2cf288169 Added Portainer 2015-08-06 15:53:38 +01:00
Julien Bisconti
95a64535d5 Merge pull request #58 from umiddelb/master
Update README.md
2015-08-05 15:52:52 +02:00
Uli Middelberg
5a2df539c4 Update README.md 2015-08-05 15:10:02 +02:00
Uli Middelberg
6b868ab596 Update README.md 2015-08-05 13:28:30 +02:00
Julien Bisconti
e20bb13bfb add badge 2015-08-05 09:15:53 +02:00
Julien Bisconti
0d01b4f29e Merge pull request #57 from gitter-badger/gitter-badge
Add a Gitter chat badge to README.md
2015-08-05 09:05:34 +02:00
The Gitter Badger
ca3eccf638 Added Gitter badge 2015-08-05 06:51:59 +00:00
Julien Bisconti
09a055949d Merge pull request #56 from vegasbrianc/patch-3
Added ImageLayers to the Optimizing Images section
2015-08-04 22:13:09 +02:00
Brian Christner
120f358150 Update README.md
Added ImageLayers to the Optimizing Images section
2015-08-04 21:27:54 +02:00
Julien Bisconti
ebb4b4f779 add dockramp
Proof of Concept: A Client Driven Docker Image Builder
2015-08-04 21:17:22 +02:00
Julien Bisconti
ca12e91f28 Update README.md
add credits
2015-08-04 21:09:26 +02:00
Julien Bisconti
b769ccbcbf add docker-proxy 2015-08-04 20:08:48 +02:00
Julien Bisconti
420cc50040 add muguet (reverse proxy) 2015-08-04 18:44:31 +02:00
Julien Bisconti
d5512d506d add notary in security 2015-08-04 18:31:03 +02:00
Julien Bisconti
3872e94ec4 Add security section with docker-bench-security 2015-08-04 18:29:03 +02:00
Julien Bisconti
636ec281bf Update README.md
autodock and blimp + article in the correct section
2015-08-04 18:24:45 +02:00
Julien Bisconti
1ce9e01123 Merge pull request #55 from subuser-security/timthelion-subuuser-patch
Add subuser to list
2015-08-04 15:08:19 +02:00
Julien Bisconti
360494c092 add forward2docker in dev tools 2015-08-04 15:05:06 +02:00
Timothy Hobbs
3cceed811a Add subuser to list 2015-08-03 12:20:44 +02:00
Julien Bisconti
b99ca034d5 add dlayer in dev tools 2015-08-03 07:45:58 +02:00
Julien Bisconti
be7b35d674 Merge pull request #54 from rodionos/patch-1
Add ATSD in the Docker monitoring section.
2015-08-02 13:27:18 +02:00
Sergei Rodionov
de35531a87 Update README.md
Added ATSD in the Docker monitoring section.
2015-08-02 00:23:29 +03:00
Julien Bisconti
e41b519391 Merge pull request #53 from thieman/patch-1
Add Dusty to Local Container Managers
2015-08-01 08:00:01 +02:00
Travis Thieman
0174d4c9ae Add Dusty to Local Container Managers 2015-07-31 18:27:21 -04:00
Julien Bisconti
c6c4aa225b add credit where needed 2015-07-31 22:09:59 +02:00
Julien Bisconti
056d2b955c Merge pull request #52 from jakolehm/patch-1
Add Kontena to Remote Container Manager
2015-07-31 19:17:20 +02:00
Jari Kolehmainen
41da22a7e1 Add Kontena to Remote Container Manager 2015-07-31 19:23:31 +03:00
Julien Bisconti
81df1cfb84 remove space in Orchestration section 2015-07-31 11:30:40 +02:00
Julien Bisconti
47702053db move conduit to deployment 2015-07-31 11:28:54 +02:00
Julien Bisconti
ff09820a58 Add jfrazelle video at dockerCon 2015-07-31 11:17:41 +02:00
Julien Bisconti
789f019f59 Merge pull request #51 from vegasbrianc/patch-1
Update README.md
2015-07-31 11:08:23 +02:00
Brian Christner
7e45464138 Update README.md
Moved cAdvisor to the monitoring section and added InfluxDB and Prometheus Time series DB monitoring tools for Docker.
2015-07-31 10:56:14 +02:00
Julien Bisconti
34bba041fa Merge pull request #49 from ahagenbruch/master
Updated Book Section
2015-07-30 14:14:19 +02:00
Julien Bisconti
36704bdd56 Merge pull request #50 from cmheisel/cmheisel-patch-1
Add docker-gc
2015-07-30 14:13:04 +02:00
Chris Heisel
01ecde2ce4 Add docker-gc 2015-07-30 08:05:05 -04:00
hagenbruch
0dd9d878bb Added forthcoming German book, disambiguated the cookbook entries and cleaned up some URLs in the book section. 2015-07-30 13:27:11 +02:00
Julien Bisconti
6f062a5689 typo in menu
because I can't effin write
2015-07-30 08:32:26 +02:00
Julien Bisconti
5d68c2cbfd add Tsuru in Pass section 2015-07-30 08:31:11 +02:00
Julien Bisconti
d348850a29 Merge pull request #47 from rochacbruno/master
added Dealing with linked containers dependency in docker-compose tip
2015-07-30 08:16:09 +02:00
Bruno Rocha
90f5a9aace added Dealing with linked containers dependency in docker-compose tip 2015-07-29 18:47:28 -03:00
Julien Bisconti
8d3450bfc6 Merge pull request #45 from zchee/http-reverse-proxy
Add HTTP Reverse Proxy content & Add nginx-proxy and h2o-proxy
2015-07-29 10:34:59 +02:00
Julien Bisconti
6f730898c0 Merge pull request #46 from alessandroleite/master
Include the article: Docker vs. VMs? Combining Both for Cloud Portability Nirvana
2015-07-29 10:33:07 +02:00
Alessandro Leite
8c079d61bc Merge with the master of veggiemonk/awesome-docker 2015-07-29 09:05:56 +02:00
Koichi Shiraishi
8962d2cb69
Add HTTP Reverse Proxy content & Add nginx-proxy and h2o-proxy
Signed-off-by: Koichi Shiraishi <zcheeee@gmail.com>
2015-07-28 23:45:06 +09:00
Julien Bisconti
3010526c2f add jfrazelle article containerized desktop
much fun!!!
2015-07-28 15:44:21 +02:00
Julien Bisconti
9d458e580e add Rescoyl
Private Docker registry
2015-07-28 15:17:39 +02:00
Julien Bisconti
494381a556 update registry v2 2015-07-28 15:13:26 +02:00
Julien Bisconti
3ae835b5f1 add jfrazelle dockerfiles 2015-07-28 15:09:14 +02:00
Alessandro Leite
d9f393a6da Include the article: Docker vs. VMs? Combining Both for Cloud Portability Nirvana for the main resources section 2015-07-28 10:15:16 +02:00