Commit Graph

1148 Commits

Author SHA1 Message Date
Julien Bisconti
1816e5b867 Merge pull request #368 from Moshe-Immerman/awesome
Add 2 new useful resources
2017-06-28 11:36:10 +03:00
Julien Bisconti
08df60d136 Merge pull request #367 from Moshe-Immerman/master
fix: remove old links and redirects
2017-06-28 11:33:15 +03:00
Moshe Immerman
3ccedbb0e5 Add 2 new resources 2017-06-28 09:31:02 +02:00
Moshe Immerman
69d4de49ba fix: remove old links and redirects 2017-06-28 08:24:45 +02:00
Julien Bisconti
0c389fe825 Merge pull request #353 from klinebch/patch-1
Update Readme.md
2017-06-22 18:07:29 +03:00
Andreas Gebhardt
e46e09db45 Merge pull request #365 from devhkr/fix-build-error
Fix Travis CI #810 and minor URL change
2017-06-22 16:53:15 +02:00
devhkr
125f661088 Fix Travis CI #810 and minor URL change 2017-06-22 16:31:39 +02:00
Chris Kline
84019a2c68 Merge pull request #1 from klinebch/klinebch-patch-1
Update README.md
2017-06-22 07:01:03 -06:00
Chris Kline
3c1d0446bf Update README.md
I've made the recommended changes and added the $$$ to our entry.  I request, however, that the same notation be added to the other vendors who all have paid offerings, including New Relic, Dynatrace, and AppDynamics.  I notice that none of them have that notation.  Also, the Dynatrace entry is in the original section I chose (Monitoring & Logging) and should also be moved to Monitoring & Logging Services as they are a similar service to CA, AppD, and New Relic.

Thanks for building this page!
2017-06-22 07:00:30 -06:00
Henry
0eee27a913 Merge pull request #364 from vegasbrianc/Training
alphabetised the Where to Start section and included Play with @moby tool
2017-06-22 10:57:18 +02:00
Brian Christner
6779977499
removed pre-description 2017-06-22 10:49:47 +02:00
Brian Christner
86ff86290f
reordered the Where to Start list 2017-06-22 10:47:23 +02:00
Brian Christner
9761c62624
updated description of Play with @moby 2017-06-22 08:57:58 +02:00
Brian Christner
b789beb0b1
alphabetized the Training section and included Play with Moby tool 2017-06-22 08:51:55 +02:00
Henry
e8a7818973 Merge pull request #362 from vegasbrianc/scar
Added Serverless & Container Aware Architecture (SCAR)
2017-06-21 14:58:45 +02:00
Brian Christner
3253a62a9a
removed duplicate SCAR entry 2017-06-21 14:48:46 +02:00
Brian Christner
fdff4ce17b
fixed grammar for the description 2017-06-21 14:34:43 +02:00
Brian Christner
9ed516cbcc
fixed grammar for the description 2017-06-21 14:33:42 +02:00
Brian Christner
da04533063
fixed description and added '@' symbol for git username 2017-06-21 14:19:55 +02:00
Brian Christner
7829e42de2
Added Serverless & Container Aware Framework (Scar) 2017-06-21 13:30:12 +02:00
Henry
3476ac215c Merge pull request #361 from vegasbrianc/master
udocker tool - run docker containers in user space without root privileges
2017-06-21 12:57:13 +02:00
Brian Christner
44f34b31f7
added credit link to source GitHub account 2017-06-21 11:32:03 +02:00
Brian Christner
cdbf08b129
added udocker tool for running containers without root permissions 2017-06-21 11:21:06 +02:00
Henry
23eb7b1d7b Merge pull request #359 from veggiemonk/add-code-of-conduct-1
Create CODE_OF_CONDUCT.md
2017-06-20 21:44:24 +02:00
Julien Bisconti
5dbe5207fb Update link to code of conduct 2017-06-20 22:36:14 +03:00
Julien Bisconti
a8e4f65d0a Merge pull request #360 from devhkr/fix-build-errors
Fix Travis CI #786
2017-06-20 22:28:20 +03:00
devhkr
d8d80cda34 Remove duplicate entry of composeregistry 2017-06-20 18:02:08 +02:00
devhkr
b0f9c140c6 Fix Travis CI #786 2017-06-20 17:22:48 +02:00
Julien Bisconti
bf57bd80fc Create CODE_OF_CONDUCT.md 2017-06-20 15:14:52 +03:00
Julien Bisconti
2603d21417 Merge pull request #356 from Moshe-Immerman/patch-3
cleanup formatting and credits
2017-06-17 20:31:53 +03:00
Moshe-Immerman
f532f0fafa Merge branch 'master' into patch-3 2017-06-17 18:49:51 +02:00
Moshe-Immerman
76338dae53 fix nomad link and credit 2017-06-17 18:48:43 +02:00
Julien Bisconti
7fc84d42af Merge pull request #358 from agebhar1/feature/fix-TravisCI#776
revise markdown spotify link by reference link
2017-06-16 23:26:50 +03:00
Andreas Gebhardt
3d04720289 revise markdown spotify link by reference link
Add `[spotify]` reference link to fix Travis CI check
issues.

```
Issues :-(
> Links
  All OK ✓
> Dupes
  1. [L171] https://github.com/spotify/
```
2017-06-16 18:43:27 +02:00
Julien Bisconti
10b3af5acb Merge pull request #355 from Moshe-Immerman/patch-2
Add grantyd, a framework for easy management of docker-based components.
2017-06-16 17:38:59 +03:00
Julien Bisconti
778abe21b5 Merge pull request #351 from devhkr/add-project
Add CIS Docker Benchmark
2017-06-16 17:33:21 +03:00
Andreas Gebhardt
dc2ee5734f Merge pull request #354 from Moshe-Immerman/patch-1
add Spotify/Helios
2017-06-16 15:46:10 +02:00
Moshe-Immerman
baed64e21b add credits 2017-06-16 15:33:27 +02:00
Andreas Gebhardt
b73e6e1ff2 Merge pull request #357 from Moshe-Immerman/patch-4
fix bluemix link
2017-06-16 15:22:11 +02:00
Moshe-Immerman
e6f510c661 fix bluemix link 2017-06-16 14:23:17 +02:00
Moshe-Immerman
711c052a82 cleanup formatting and credits 2017-06-16 14:21:08 +02:00
Moshe-Immerman
883db63338 Add grantyd, a framework for easy management of docker-based components across machines 2017-06-16 14:05:51 +02:00
Moshe-Immerman
3b96d26dde add Spotify/Helios 2017-06-16 13:57:52 +02:00
Chris Kline
86afc7dd15 Update Readme.md
Added CA Technologies docker monitoring offerings.  Highly rated.  https://www.itcentralstation.com/categories/docker-container-monitoring#top_rated
2017-06-15 15:25:38 -06:00
devhkr
a4f37e62e3 Add CIS Docker Benchmark 2017-06-13 14:38:07 +02:00
Julien Bisconti
ada11b8bd8 Merge pull request #350 from cloudeigh/patch-1
Adding Azure ACS under container services
2017-06-13 10:46:44 +03:00
Andreas Gebhardt
7428238398 Merge pull request #349 from saikrishna321/master
added appium-docker
2017-06-13 07:46:45 +02:00
saikrishna321
6fd510aea2 updated lexicographical order 2017-06-13 09:45:21 +05:30
cloudeigh
014eabcc5e Adding Azure ACS under container services
Amazon ECS is listed but I notice Azure ACS isn't - adding that to fix!
2017-06-13 12:42:27 +10:00
saikrishna321
ed00aa4d26 added appium-docker 2017-06-12 21:53:16 +05:30