Commit Graph
100 Commits
Author SHA1 Message Date
Julien Bisconti 0684db5117 Merge pull request #87 from vivekjuneja/master
Calico Docker added under Networking
2015-10-13 07:36:21 +02:00
Julien Bisconti 22fda245d6 Merge pull request #86 from bobef/patch-1
Add link to "deploy".
2015-10-12 11:41:16 +02:00
Julien Bisconti ec29ecca9b Merge pull request #85 from messa/patch-1
fixed typo: boorklyn -> brooklyn
2015-10-10 11:10:37 +02:00
Julien Bisconti 32e4b0cbc4 add dockunit (CI) 2015-10-10 11:09:52 +02:00
Julien Bisconti 79e7d2ada4 Merge pull request #84 from orthographic-pedant/spell_check/collection
Fix typographical error(s)
2015-10-08 07:31:21 +02:00
Julien Bisconti 93ec75a870 Merge pull request #83 from flaudisio/fix-links
Fix 'What is Docker' and 'Where to start' links
2015-10-07 18:21:55 +02:00
Julien Bisconti 2a58cfb157 add link Learn Docker 2015-10-05 19:07:18 +02:00
Julien Bisconti a606e2ee80 Add local container manager: Beluga 2015-10-01 08:56:45 +02:00
Julien Bisconti a9483241db Merge pull request #82 from ahmetalpbalkan/patch-1
add Azure Files Volume Driver
2015-09-29 19:15:14 +02:00
Julien Bisconti c2e3b2c1cb add article dockerfile generator 2015-09-28 21:26:40 +02:00
Julien Bisconti 4b178e4903 add dexec in dev tools 2015-09-28 18:40:07 +02:00
Julien Bisconti f0da3ddbe8 Merge pull request #81 from EmileVauge/master
Added Træfɪk
2015-09-23 10:12:54 +02:00
Julien Bisconti c8a9dafbd0 Merge pull request #80 from alessandroleite/master
Include a reference to the talk: 6 Million Ways To Log In Docker
2015-09-22 17:33:28 +02:00
Julien Bisconti 10f3743bf2 add good tip: leave no ssh key behind 2015-09-18 13:59:58 +02:00
Julien Bisconti 2f07eab4c4 Merge pull request #79 from heinrichvk/master
Update README.md
2015-09-18 13:58:10 +02:00
Julien Bisconti 6f34d612b2 Merge pull request #78 from j0nr33v3/patch-1
Update Readme.MD with StackEngine
2015-09-12 18:25:38 +02:00
Julien Bisconti c6ab88cc3e add article docker on windows behind a firewall 2015-09-10 15:53:25 +02:00
Julien Bisconti b452798fb2 Merge pull request #77 from ybogdanov/patch-2
Add "rocker" tool - extended Dockerfile builder
2015-09-09 08:05:48 +02:00
Julien Bisconti 0e8154535b Create License.md
just trying
2015-09-07 11:11:23 +02:00
Julien Bisconti d63fd9be5d Merge pull request #76 from alessandroleite/master
Include the article: "Containerization and the PaaS" Cloud by Claus Pahl
2015-09-04 07:53:23 +02:00
Julien Bisconti 90ebc916c4 Merge pull request #75 from ybogdanov/patch-1
Add rocker-compose - deployment tool
2015-09-02 07:33:14 +02:00
Julien Bisconti ffe2e8ccf9 add docker unison 2015-09-01 12:17:45 +02:00
Julien Bisconti edfb2461ef Merge pull request #74 from craig-mulligan/craig-mulligan-patch-1
Add resin.io
2015-09-01 12:13:59 +02:00
Julien Bisconti ccd4b084d2 Merge pull request #73 from demarant/patch-1
add section for volume plugins and add convoy
2015-08-31 14:37:08 +02:00
Julien Bisconti 42d032514b Merge pull request #72 from vegasbrianc/patch-5
Update README.md
2015-08-31 14:36:45 +02:00
Julien Bisconti 6f8dd4a078 Merge pull request #71 from gomex/master
Add zabbix docker software link
2015-08-31 08:35:49 +02:00
Julien Bisconti f2b808bc46 Merge pull request #69 from megastef/master
Add SPM for Docker - Monitoring, Events and Logging
2015-08-25 11:14:07 +07:00
Julien Bisconti 89bf293ab2 Merge pull request #68 from alexwelch/patch-1
Fix CenturyLink names
2015-08-25 11:13:32 +07:00
Julien Bisconti 34216b5d7d Merge pull request #67 from vegasbrianc/patch-4
Update README.md
2015-08-25 11:12:58 +07:00
Julien Bisconti faf5c772ec Merge pull request #65 from benzaita/master
adding `docker-do`
2015-08-25 11:10:58 +07:00
Julien Bisconti 2e48335de7 add dray 2015-08-13 09:55:40 +02:00
Julien Bisconti 1e90e0de2a add Lorry 2015-08-13 09:51:14 +02:00
Julien Bisconti 21b899dbe0 add Docker Toolbox
Remove boot2docker and kitematic
2015-08-13 09:48:23 +02:00
Julien Bisconti 9e196acfba add watchtower 2015-08-13 08:24:24 +02:00
Julien Bisconti c5fbb9ceae remove gaudi
project discontinued
2015-08-11 12:14:54 +02:00
Julien Bisconti af8d85f41b Merge pull request #64 from fgrehm/master
Add devstep to dev tools list
2015-08-11 07:55:38 +02:00
Julien Bisconti 1ed3972412 Merge pull request #63 from paolomainardi/master
added dropdock.io
2015-08-09 15:51:47 +02:00
Julien Bisconti b2f8de3d55 Merge pull request #62 from garywiz/patch-1
Add Chaperone and docker base images
2015-08-08 06:55:31 +02:00
Julien Bisconti 8613f2b32e Merge pull request #61 from gesellix/patch-2
add "Continuous Deployment with Gradle and Docker"
2015-08-08 05:55:04 +02:00
Julien Bisconti 06ff4fd840 Merge pull request #60 from gesellix/patch-1
add Gradle Docker plugin and Docker client
2015-08-08 05:54:36 +02:00
Julien Bisconti 6cee5842a9 add images docker fluentd
useful images
2015-08-06 17:28:29 +02:00
Julien Bisconti dce79c8a70 add docker tips 2015-08-06 17:26:11 +02:00
Julien Bisconti 8c0f7cf176 add zodiac in deployment 2015-08-06 17:18:14 +02:00
Julien Bisconti 63f00a857d Merge pull request #59 from tarnfeld/patch-1
Added Portainer
2015-08-06 17:15:36 +02:00
Julien Bisconti 95a64535d5 Merge pull request #58 from umiddelb/master
Update README.md
2015-08-05 15:52:52 +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
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
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
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
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
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
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
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
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
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
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
Julien Bisconti 4d71c48b4b Merge pull request #44 from shyiko/patch-1
Added docker-vm
2015-07-24 21:57:21 +02:00
Julien Bisconti 4557db90ac add docker-cli in tools 2015-07-24 12:44:46 +02:00
Julien Bisconti bf13c0256f add tor routing article 2015-07-23 07:23:51 +02:00
Julien Bisconti bdc3471850 add docker training 2015-07-23 07:16:30 +02:00
Julien Bisconti 47286da1b4 adding bocker 2015-07-22 10:35:22 +02:00
Julien Bisconti ee3f0c7d71 Merge pull request #43 from dexterbt1/master
added web interface tool: Portus
2015-07-22 07:04:37 +02:00
Julien Bisconti f82a89648c Accurate title 2015-07-20 10:57:55 +02:00
Julien Bisconti 978c438438 Merge pull request #42 from alessandroleite/master
Include the article: Dockerizing Flask With Compose and Machine - From Localhost to the Cloud
2015-07-20 10:54:37 +02:00
Julien Bisconti 6a642e0fde add artcile: Joining the docker ship
how to contribute to docker
2015-07-15 21:14:08 +02:00
Julien Bisconti a787321359 add article: nginx proxy for docker 2015-07-15 21:10:17 +02:00
Julien Bisconti a9e2ac4e16 Merge pull request #41 from alessandroleite/master
Add the reference for three books and two texts
2015-07-13 21:24:58 +02:00
Julien Bisconti cbfbfb16c4 add article From local dev to remote deploy
From Local Development to Remote Deployment with Docker Machine and Compose
2015-07-12 08:17:35 +02:00
Julien Bisconti 64d31ded83 add hypriot in Rpi section 2015-07-09 10:21:43 +02:00
Julien Bisconti 79375a486c add main tools 2015-06-29 08:04:54 +02:00
Julien Bisconti 1b37fed60e add sherdock 2015-06-29 07:59:13 +02:00
Julien Bisconti a5ab52c530 add article docker cifs
Docker CIFS – How to Mount CIFS as a Docker Volume
2015-06-23 11:39:54 +02:00
Julien Bisconti dd171ac77f add Project Web Dev 2015-06-18 09:27:51 +02:00
Julien Bisconti dd77bb0c36 Merge pull request #40 from prologic/patch-1
Adding autodock and the autodock mini-PaaS
2015-06-13 19:30:25 +02:00
Julien Bisconti e12049be59 add dev tools: crane 2015-06-12 13:16:19 +02:00
Julien Bisconti 3cd24540a8 Merge pull request #39 from ahmetalpbalkan/patch-1
Added docker-jumpstart
2015-06-09 20:48:02 +02:00
Julien Bisconti bf39498295 add newsletter. WebOps weekly 2015-06-07 19:20:48 +02:00
Julien Bisconti a0dbc7e85f add section newsletter 2015-06-07 19:17:54 +02:00
Julien Bisconti 449c6fa211 add article vagrant and docker 2015-06-07 19:03:51 +02:00