Commit Graph
100 Commits
Author SHA1 Message Date
Julien Bisconti 4ea99b2508 Merge pull request #328 from devhkr/master
Modfied 'Where to start' section
2017-04-27 15:57:35 +03:00
Julien Bisconti 681a40b5ac Merge pull request #329 from vladgolubev/patch-1
Add Apache OpenWhisk to Serverless section
2017-04-27 13:47:31 +03:00
Julien Bisconti d2abdbabd1 Merge pull request #325 from devhkr/master
Deis project name changed
2017-04-21 13:57:50 +03:00
Julien Bisconti 6cc44b7cfd Update CONTRIBUTING.md 2017-04-20 15:14:08 +03:00
Julien Bisconti 809e07696d Clarifying docker -> Moby
Moby      = open source development

Docker CE = free product release based on Moby

Docker EE = commercial product release based on Docker CE.

Docker EE is on the same code base as Docker CE, so also built from Moby, with commercial components added, such as "docker data center / universal control plane"
2017-04-20 14:11:35 +03:00
Julien Bisconti 2ebe412963 Merge pull request #321 from erikh/patch-1
Add github.com/box-builder/box
2017-04-20 14:02:55 +03:00
Julien Bisconti 52b0c7a849 Merge branch 'master' into patch-1 2017-04-20 13:59:14 +03:00
Julien Bisconti 9c41d52000 Merge pull request #322 from devhkr/master
Minor index modification
2017-04-20 13:57:40 +03:00
Julien Bisconti 61ad23aa33 Merge pull request #317 from hsorellana/master
Modified index
2017-04-16 18:31:46 +03:00
Julien Bisconti 85a5c6e3dd Merge pull request #316 from devhkr/master
Added link for new maintainers
2017-04-15 20:00:35 +03:00
Julien Bisconti d5e1000e60 change links from jfrazelle to jessfraz 2017-04-15 10:46:38 +03:00
Julien Bisconti 33cc93c55a Merge pull request #314 from agebhar1/feature/fabiolb
update Fabio's GitHub link
2017-04-15 07:00:51 +03:00
Julien Bisconti b1e7bbbc7d Merge branch 'master' into feature/fabiolb 2017-04-15 06:53:20 +03:00
Julien Bisconti 780b885885 Merge pull request #313 from devhkr/master
Updated link text and URL for IBM Bluemix
2017-04-15 06:51:58 +03:00
Julien Bisconti 5f3faa90e3 Merge pull request #312 from devhkr/master
Removed Octohost project
2017-04-13 19:58:50 +03:00
Julien Bisconti 5fb8b94b82 Merge pull request #310 from vegasbrianc/master
updated Swarm Visualizer GitHub URL
2017-04-12 11:31:36 +03:00
Julien Bisconti af5bde88e1 Merge pull request #308 from vik-y/patch-1
Replace DockerUI with portainer.io
2017-04-09 15:12:58 +03:00
Julien Bisconti 672b127130 Create pull_request_template.md 2017-04-07 20:53:22 +03:00
Julien Bisconti 63a2e5b5f4 Update LICENSE.md 2017-04-07 07:16:11 +03:00
Julien Bisconti 15a781255d Merge pull request #307 from veggiemonk/veggiemonk-patch-1
add text for new collaborators, maintainers
2017-04-06 21:47:07 +03:00
Julien Bisconti 656b1c9081 add text for new collaborators, maintainers 2017-04-06 21:45:33 +03:00
Julien Bisconti 6b1fa56ee9 Merge pull request #306 from gtonic/master
add Sonatype Nexus OSS as Docker Registry
2017-04-03 21:39:17 +03:00
Julien Bisconti e20843fc05 Merge branch 'master' into master 2017-04-03 21:35:16 +03:00
Julien Bisconti c11e65e4c5 Merge pull request #305 from agebhar1/feature/docker-it
add `docker-it` by @whisklabs
2017-04-03 21:34:19 +03:00
Julien Bisconti 003e49ae11 Merge pull request #303 from agebhar1/feature/fabric8io/docker-maven-plugin
add `docker-maven-plugin` by @fabric8io
2017-04-01 18:08:35 +03:00
Julien Bisconti 6b8c198fa6 Merge branch 'master' into feature/fabric8io/docker-maven-plugin 2017-04-01 18:08:01 +03:00
Julien Bisconti ce2f9cd45b add awesome docker twitter account link
you can follow every commit from twitter if you prefer.
2017-04-01 18:04:31 +03:00
Julien Bisconti 71c00e301e Remove Travis badge (new "awesome rules")
It will be displayed on the website: 
[![Build Status](https://travis-ci.org/veggiemonk/awesome-docker.svg?branch=master)](https://travis-ci.org/veggiemonk/awesome-docker)
2017-04-01 17:58:57 +03:00
Julien Bisconti a4fd975244 Rename "menu" to "contents"
according to rules of https://github.com/sindresorhus/awesome/blob/master/pull_request_template.md
2017-04-01 17:57:40 +03:00
Julien Bisconti a05622e039 Merge pull request #302 from mguilherme/docker-maven-plugin
Add docker-maven-plugin to Developer Tools
2017-04-01 09:29:57 +03:00
Julien Bisconti ff2f51c7d4 Remove docker-private-registry
Cause: timeout
Service has a problem and it causes all builds to fail.
Considered inactive.
2017-03-30 22:56:52 +03:00
Julien Bisconti 96d6a2f8bd Merge pull request #300 from vegasbrianc/master
Add Docker FaaS (Functions as a Service)
2017-03-23 13:13:26 +02:00
Julien Bisconti 9451bd5ba8 Merge branch 'master' into master 2017-03-23 13:13:02 +02:00
Julien Bisconti 805b97d8bc removed twitter account dockernews suspended 2017-03-23 07:59:14 +02:00
Julien Bisconti 1939780d11 Merge pull request #299 from vegasbrianc/master
dgoss a fast YAML container validator
2017-03-23 07:58:00 +02:00
Julien Bisconti 95ca2b14d9 Merge branch 'master' into master 2017-03-23 07:57:39 +02:00
Julien Bisconti b2117a3f92 Merge pull request #298 from zablotski/master
Install Docker on your machine link fixed
2017-03-22 21:37:40 +02:00
Julien Bisconti 63d5e50e50 Merge branch 'master' into master 2017-03-22 21:37:31 +02:00
Julien Bisconti ce94bdb016 Merge pull request #297 from sdomino/update/nanobox
Update/nanobox
2017-03-22 21:37:19 +02:00
Julien Bisconti 056dc5cf49 add credits for ctop 2017-03-16 10:14:37 +02:00
Julien Bisconti 373a0b6eda fix broken URLs 2017-03-16 10:11:47 +02:00
Julien Bisconti 0806ff87c0 Merge pull request #296 from joelhandwell/patch-1
Add packer for image builder
2017-03-16 10:09:31 +02:00
Julien Bisconti d253623cc1 Merge branch 'master' into patch-1 2017-03-16 10:09:22 +02:00
Julien Bisconti 4ec0d38e3c Merge pull request #295 from agungsantoso/master
Adding ctop to Monitoring & Logging
2017-03-16 10:07:35 +02:00
Julien Bisconti 64e30376d5 Merge pull request #293 from DenisIzmaylov/patch-1
Add Docker Russian-speaking Community
2017-03-14 13:00:03 +02:00
Julien Bisconti 05d691fbea Merge branch 'master' into patch-1 2017-03-14 12:58:49 +02:00
Julien Bisconti 9b088eb219 Merge pull request #291 from veggiemonk/update-DVM-URL
update URL for DVM (docker version manager)
2017-03-14 12:56:27 +02:00
Julien Bisconti 69300fdc17 Merge branch 'master' into update-DVM-URL 2017-03-14 12:56:16 +02:00
Julien Bisconti 16972f3b22 Merge pull request #292 from vorakl/add-trc
Add a new utility: TrivialRC
2017-03-14 12:55:47 +02:00
Julien Bisconti e61f58f95f Merge branch 'master' into update-DVM-URL 2017-03-10 19:06:42 +02:00
Julien Bisconti 3824d2d597 Merge pull request #290 from BretFisher/patch-1
Adding more CaaS hosters
2017-03-10 19:05:36 +02:00
Julien Bisconti 1e37f28012 update URL for DVM (docker version manager) 2017-03-10 10:37:07 +02:00
Julien Bisconti 518ba30251 Merge pull request #288 from lstephen/patch-1
Add construi
2017-03-05 10:51:12 +02:00
Julien Bisconti 7d8b639274 update link azure files volume driver 2017-03-01 18:31:19 +02:00
Julien Bisconti 7a124615de update codefresh description
closes #270
2017-02-23 09:55:55 +02:00
Julien Bisconti 3915ccde53 Merge pull request #284 from veggiemonk/vegasbrianc-patch-1
Added CI/CD tool
2017-02-21 15:12:41 +02:00
Julien Bisconti 1f2b60deca Merge pull request #283 from eon01/devopslinks
add devopslinks newsletter
2017-02-19 08:24:50 +02:00
Julien Bisconti 97b3f0fde8 Merge branch 'master' into devopslinks 2017-02-19 08:22:45 +02:00
Julien Bisconti 43a57cb99f Merge pull request #281 from veggiemonk/contrib-chat
contrib: join the chat 🤓☎︎
2017-02-19 08:20:52 +02:00
Julien Bisconti 6fbbe114d0 Create .gitattributes
repository's language should markdown / HTML
2017-02-18 22:56:59 +02:00
Julien Bisconti c5d4cefd0c update chat URL 2017-02-18 22:48:14 +02:00
Julien Bisconti df274f3c05 contrib: join the chat 🤓☎︎ 2017-02-18 10:46:39 +02:00
Julien Bisconti 277bbc5aa8 fix redirection for Docker Curriculum 2017-02-17 09:39:26 +02:00
Julien Bisconti d314f8ae1a Merge pull request #277 from deltaskelta/master
Docker-Alertd: Send Alerts Based on Container Usage/Statistics
2017-02-17 09:32:00 +02:00
Julien Bisconti b2ffd92a88 Update CONTRIBUTING.md 2017-02-16 16:20:14 +02:00
Julien Bisconti 9e947b907c Merge pull request #275 from dmitrytokarev/docker-selenium
Added Testing section with docker-selenium links
2017-02-15 10:49:42 +02:00
Julien Bisconti 21162b2bbd Update CONTRIBUTING.md 2017-02-13 08:14:43 +02:00
Julien Bisconti 6d684ba3a1 Update CONTRIBUTING.md
added the twitter alias of the maintainers
2017-02-12 19:40:53 +02:00
Julien Bisconti aaf5a94d1e Merge pull request #273 from veggiemonk/issue-template
issue-template
2017-02-12 19:17:33 +02:00
Julien Bisconti a4044870e4 issue-template 2017-02-11 19:18:54 +02:00
Julien Bisconti 06e32b37e5 Merge pull request #265 from Valien/patch-1
Added 2 new hosting companies.
2017-01-27 21:24:40 +02:00
Julien Bisconti 3976f3b7fb Update CONTRIBUTING.md 2017-01-27 14:46:59 +02:00
Julien Bisconti 9a4707f3ba Merge pull request #262 from munkyboy/elsy
add elsy
2017-01-19 11:10:33 +02:00
Julien Bisconti ef0d8cd7da Merge pull request #260 from dimaspivak/patch-1
Add clusterdock to list of orchestration projects
2017-01-17 23:14:06 +02:00
Julien Bisconti ec907675f0 add article Node.js in Containers Using Docker 2017-01-07 09:56:34 +02:00
Julien Bisconti 2aeceff572 Merge pull request #257 from uschtwill/patch-4
updates alerting entry
2017-01-06 23:40:41 +02:00
Julien Bisconti 8097011449 update gliderlabs blog url 2017-01-06 16:53:58 +02:00
Julien Bisconti 934b3b6365 whitelist eclipse and codenvy 2017-01-06 16:44:17 +02:00
Julien Bisconti 5b9c3ef2b1 Merge pull request #258 from TylerJewell/patch-1
Add Eclipse Che & Codenvy
2017-01-06 16:42:29 +02:00
Julien Bisconti e729bdb12a Merge pull request #256 from SISheogorath/patch-1
Add some articles
2016-12-30 07:07:45 +02:00
Julien Bisconti 236e660add Merge pull request #255 from parijs/patch-1
Added CoScale as a monitoring tool
2016-12-21 15:23:47 +07:00
Julien Bisconti a9898f5b3b Merge pull request #253 from xiaopeng163/master
add Docker Kubernetes Lab Handbook
2016-12-11 22:59:42 +07:00
Julien Bisconti 9af6fefab8 Merge pull request #252 from johnaxel/master
Add ECS adoption article
2016-12-10 09:19:05 +07:00
Julien Bisconti a7fbddac2b Merge pull request #250 from JensPiegsa/patch-1
another docker cheat sheet added
2016-12-05 07:59:32 +07:00
Julien Bisconti f866507f47 Merge pull request #249 from Silex/patch-1
Fix typo
2016-12-05 01:25:48 +07:00
Julien Bisconti 0683673253 Merge pull request #248 from Vad1mo/master
Added Docker Registry services
2016-12-02 20:45:43 +07:00
Julien Bisconti c175b8bb59 Merge pull request #246 from lirantal/master
Adding dockly
2016-12-01 08:21:37 +07:00
Julien Bisconti f53099a431 add "Say Thanks" Badge 2016-11-26 23:09:10 +07:00
Julien Bisconti 8ee74b75b7 fix rancher url duplicate 2016-06-29 19:57:06 +02:00
Julien Bisconti 400f71b0c0 Merge pull request #199 from JonnatasCabral/master
Add Rancher to the PaaS list
2016-06-29 19:54:35 +02:00
Julien Bisconti beaea2b150 Merge pull request #198 from hirro/master
Added Docker Swarm Visualizer
2016-06-29 15:34:16 +02:00
Julien Bisconti d1d09c7ae1 Merge pull request #196 from rossf7/patch-1
Add MicroBadger to the list
2016-06-26 15:33:34 +02:00
Julien Bisconti be2b361c9b Merge pull request #195 from alessandroleite/master
Include dockersql
2016-06-25 14:21:49 +02:00
Julien Bisconti 89d9d5d88e Merge pull request #194 from bbodenmiller/patch-2
fix GitLab capitalization
2016-06-25 14:21:08 +02:00
Julien Bisconti 466c24a1df Merge pull request #193 from bbodenmiller/patch-1
fix GitHub capitalization
2016-06-25 14:20:22 +02:00
Julien Bisconti aeaf63c958 Merge pull request #192 from josegonzalez/patch-1
Added empire
2016-06-21 13:06:46 +02:00
Julien Bisconti 5571b7a046 Merge pull request #191 from BenHall/katacoda
Add Katacoda to the list
2016-06-18 13:59:09 +02:00
Julien Bisconti aaa6967445 whitelist mesosphere.com 2016-06-07 19:24:55 +02:00
Julien Bisconti 547af2f40a Merge pull request #190 from woliveiras/patch-1
Add Portuguese Articles section
2016-06-05 17:42:02 +02:00
Julien Bisconti b54474dff9 Merge pull request #189 from wsilva/UpdatingBooks
Updated some books and added Gitlab Container Registry information
2016-06-04 15:42:17 +02:00