docker
/
labs
зеркало из https://github.com/docker/labs.git
1
0
Форкнуть 0
Код Задачи Пакеты Проекты Релизы Вики Активность
644 коммитов 32 Ветки 0 Теги 251 MiB
Граф коммитов

644 Коммитов

Автор SHA1 Сообщение Дата
Mano Marks b533f46e29 Merge pull request #369 from jodumont/patch-2 
Update README.md
 2017-10-21 12:05:02 +02:00
JꙨdцӍoηҬ d0d981fe84 Update README.md 2017-10-20 18:43:18 +02:00
Mano Marks cf247e41bd Merge pull request #367 from fabianenardon/master 
Changing the image used for jenkins
 2017-10-17 06:25:15 +02:00
Fabiane Bizinella Nardon a570b0c0e3 Adding a note to fix line endings on plugin.txt when running jenkins on windows. 2017-10-16 15:49:10 -02:00
Fabiane Bizinella Nardon d6b676bb26 Changing the image used for jenkins 2017-10-16 15:33:45 -02:00
Mano Marks b2e74dcfca Merge pull request #356 from Thubo/master 
Remove note on IntelliJ compatibility with Docker
 2017-10-16 18:32:44 +02:00
Mano Marks 7160ee765a Merge pull request #348 from switchdk/patch-1 
Adding target for ADD
 2017-10-16 18:32:09 +02:00
Mano Marks 570dbf54ca Merge pull request #358 from patrikwm/patch-1 
Update ch09-cicd.adoc
 2017-10-16 18:11:25 +02:00
Mano Marks e2d24f75f2 Merge pull request #355 from sbstnbr/patch-1 
Replace references to couchbase by mysql
 2017-10-16 18:10:13 +02:00
Mano Marks 7cdc22aa3e Merge pull request #365 from arun-gupta/dockercon1 
#DockerCon sprint
 2017-10-16 17:21:35 +02:00
Arun Gupta 839ab97244 adding latest tag for prometheus 2017-10-16 17:15:42 +02:00
Arun Gupta f6ebeb7101 fixing https://github.com/docker/labs/issues/363 2017-10-16 17:15:42 +02:00
Arun Gupta af2f8f6d65 cleaning up words (thx @tiffanyfj) 2017-10-16 17:15:42 +02:00
Arun Gupta af71e98a9b resolving conflicts 2017-10-16 17:15:07 +02:00
Arun Gupta f77a439522 fixed https://github.com/docker/labs/issues/352 2017-10-16 17:07:49 +02:00
Arun Gupta 1d88c7ecc7 fixed https://github.com/docker/labs/issues/349 2017-10-16 17:07:49 +02:00
Arun Gupta c954efe068 last command fixed https://github.com/docker/labs/issues/350 2017-10-16 17:07:49 +02:00
Arun Gupta 5406728903 fixed https://github.com/docker/labs/issues/350 2017-10-16 17:07:43 +02:00
Arun Gupta c1d80d93cc resolving conflict 2017-10-16 17:06:50 +02:00
Arun Gupta bd02ac8178 fixing https://github.com/docker/labs/issues/351 2017-10-16 17:05:09 +02:00
Sébastien Bro 359b0e2915 Fix typo MySQL and add link 2017-10-16 17:00:15 +02:00
Patrik WM a78f35dec9 Update ch09-cicd.adoc 
remove path to file since instructions on previous line are to 'cd jenkins_home/workspace/ci-test/sample'
cd jenkins_home/workspace/ci-test/sample
 2017-10-16 16:06:40 +02:00
Sébastien Bro 367771b64c Replace references to couchbase by mysql 2017-10-16 16:05:01 +02:00
Matthias Thubauville 7442ae6a93 Remove note on IntelliJ compatibility with Docker 2017-10-16 16:03:46 +02:00
Peter Dam 40e411c715 Adding target for ADD 
Hi,
Just a suggestion to add the target to the line of downloading the JDK9. Potentially consider making this line (with the download) the not-commented option to ensure the Dockerfile works first time a build is attempted.
Thanks,
Peter Dam
 2017-10-16 14:24:42 +02:00
Mano Marks 1cb986a682 Merge pull request #347 from jdleesmiller/dockercon-eu-review 
Add note about JDK9 to non-JDK9 Java chapter
 2017-10-16 13:54:00 +02:00
John Lees-Miller 31f6469bd3 Clarify link to why Java 5 is no longer supported as a target 2017-10-16 13:48:42 +02:00
John Lees-Miller 929c650601 Add note about JDK9 2017-10-15 22:28:03 +02:00
John Lees-Miller 8409fc6cf9 Add missing article 2017-10-15 22:26:10 +02:00
Mano Marks 331bd998e7 Merge pull request #346 from arun-gupta/dockercon 
#DockerCon - fixing the different header levels, better formatting, more consistent
 2017-10-15 17:08:21 +02:00
Arun Gupta 8d6b2e80c1 fixing the different header levels, better formatting, more consistent 2017-10-15 17:07:21 +02:00
Mano Marks cfd8292cab Merge pull request #345 from arun-gupta/dockercon2 
#Dockercon sprint - adding app-specific metrics and Grafana dashboard
 2017-10-15 14:53:34 +02:00
Arun Gupta 8f7edf2847 adding images 2017-10-15 14:34:15 +02:00
Arun Gupta 4612617651 fixing the title 2017-10-15 14:34:06 +02:00
Arun Gupta 08c5306049 fixing/matching title 2017-10-15 12:29:17 +02:00
Arun Gupta c693cdf0b7 adding Java + Prometheus monitoring 2017-10-15 12:25:35 +02:00
Arun Gupta b1501e84e2 making the link relative 2017-10-15 12:21:45 +02:00
Arun Gupta bd817befcf fixing typo 2017-10-15 12:21:25 +02:00
Arun Gupta f1a07fa544 adding TOC 2017-10-15 08:46:22 +01:00
Sophia Parafina 2e431866e9 Merge pull request #343 from arun-gupta/dockercon 
#DockerCon sprint - Updating monitoring content, adding Java 9 clarifications
 2017-10-15 00:40:18 -05:00
Arun Gupta bd67c83e5c starting work on Grafana 2017-10-14 22:17:19 -07:00
Arun Gupta 125ad68fb4 adding other images 2017-10-14 22:10:16 -07:00
Arun Gupta 5829f0ad4f adding a PromQL chart 2017-10-14 21:34:34 -07:00
Arun Gupta 3ec0663d40 adding some placeholders for future improvements 2017-10-14 21:27:11 -07:00
Arun Gupta 30da1ce001 updating cAdvisor + Prometheus section 2017-10-14 20:59:55 -07:00
Arun Gupta 156e58276a adding a lot more details about Prometheus 2017-10-14 20:37:31 -07:00
Arun Gupta 5464d19f3a adding some clarifications 2017-10-14 18:25:41 -07:00
Arun Gupta 9f816b8d4c adding some details about Prometheus + cAdvisor integration 2017-10-14 18:07:20 -07:00
Arun Gupta abdb22cb5d updating the snapshot 2017-10-14 17:40:09 -07:00
Arun Gupta 3ded665871 adding link to #344 2017-10-14 17:38:30 -07:00