Граф коммитов

718 Коммитов

Автор SHA1 Сообщение Дата
Mano Marks 0555f6a7c9 Merge pull request #305 from Deborah-Digges/patch-5
Make link description a little clearer
2017-06-21 12:14:39 -07:00
Deborah Gertrude Digges 9c8329ddf8 Make link description a little clearer 2017-06-21 23:08:18 +05:30
Mano Marks f1e6941c8f Merge pull request #301 from lukassup/patch-2
fix issues preventing Sails app from starting
2017-06-20 10:59:35 -07:00
Mano Marks 8f45c263b5 Merge pull request #300 from letientai299/master
Fix link location
2017-06-19 11:34:22 -07:00
Mano Marks 5b1f084daa Update ch11-bigdata.adoc 2017-06-19 11:33:58 -07:00
Lukas Šupienis 1bc66e4fb8 fix formatting issue (#302) 2017-06-16 12:25:47 -07:00
Lukas Šupienis dedf4bed87 fix issues preventing Sails app from starting 2017-06-15 20:12:37 +03:00
Tai Le 678f2b4278 Fix link location 2017-06-15 13:53:58 +08:00
Lukas Šupienis ef7e5a12e4 fix link typo (#299) 2017-06-14 17:02:52 -07:00
Tai Le aa280b4be0 Update the explanation to match with tutorial steps (#298)
* Update the explanation to match with tutorial steps

* Update alpine.md
2017-06-13 23:12:06 -07:00
Emerson Castaneda 10261ec4c2 Fixed typos & grammar in Netbeans/Eclipse/IntelliJ Spanish examples (#296)
* Fixed Typos & grammar in Netbeans Spanish examples

* Fixed Typos & grammar in Eclipse Spanish examples

* Fixed Typos & grammar in IntelliJ Spanish examples
2017-06-13 13:24:41 -07:00
Mano Marks 3ac82c305e Merge pull request #297 from trapier/patch-1
fix link to rotate_certs
2017-06-13 10:06:04 -07:00
Trapier Marshall b1ce76e3bb fix link to rotate_certs 2017-06-13 12:45:13 -04:00
Mano Marks dbaf8f34a2 Merge pull request #288 from emecas/spanish-translation
Humanizing spanish translation in order to sound less like as narrative machine
2017-06-12 13:57:23 -07:00
Castaneda db7ccd0fbf Summarizing reviewers' advice 2017-06-12 16:11:07 -04:00
Sophia Parafina f0e9964386 Merge pull request #294 from ManoMarks/master
First push to convert all Docker Hub references to Docker Cloud Store
2017-06-12 14:13:53 -05:00
Mano Marks 4631a05d32 First push to convert all Docker Hub references to Docker Cloud and Docker Store 2017-06-09 15:03:37 -07:00
Victor Coisne 80194c66fe Merge pull request #293 from ManoMarks/master
Moving community links to community repo
2017-06-09 11:26:33 -07:00
Mano Marks 37d43795ff updating link to curated tutorials 2017-06-09 11:13:54 -07:00
Mano Marks 49172f867d putting curated content in the community repo instead 2017-06-09 11:10:35 -07:00
Mano Marks e307c5c23f Merge pull request #292 from bhavin192/webapp-fix
Add Docker hub login instructions to webapp lab
2017-06-09 10:27:00 -07:00
Mano Marks d05486eae5 Merge pull request #291 from arun-gupta/dockercon
Dockercon
2017-06-09 10:26:49 -07:00
Arun Gupta bed4b8bac2 fix https://github.com/docker/labs/issues/242 2017-06-08 17:35:43 -07:00
Arun Gupta 9faafea74a fix https://github.com/docker/labs/issues/241 2017-06-08 17:31:58 -07:00
Mano Marks 07a80e35a5 Merge pull request #289 from arush-sal/patch-1
Fix issue #239 - Replace link to Compose file
2017-06-08 17:22:35 -07:00
Sushant Salil 17a861c8a6 Fix issue #239 - Replace link to Compose file
Link to the Compose file in setup has been replaced from https://github.com/docker/labs/blob/master/developer-tools/java/scripts/docker-compose-pull-images.yml to https://raw.githubusercontent.com/docker/labs/master/developer-tools/java/scripts/docker-compose-pull-images.yml as pointed by @arun-gupta
2017-06-08 23:20:57 +05:30
Bhavin Gandhi 8b0dbd5d25 Add Docker hub login instructions
In order to push the image it necessary to login. As the lab is for beginners it is useful add these instructions. Fixes #285
Signed-off-by: Bhavin Gandhi <bhavin7392@gmail.com>
2017-06-08 17:58:32 +05:30
Castaneda aebe74541a Humanizing spanish translation in order to sound less like as narrative machine
Committer: Emerson Castaneda
2017-06-07 09:24:06 -04:00
Mano Marks c39f7d281e Merge pull request #287 from emmanuelCarre/286-outdated-link-to-Docker-Github
Change Docker github url
2017-06-05 16:26:53 -07:00
Emmanuel CARRE 8db6bbda0b Change Docker github url
Change outdate Github Docker url https://github.com/docker/docker for
https://github.com/moby/moby.

Resolves: #286

Signed-off-by: Emmanuel CARRE <emmanuel.b.carre@gmail.com>
2017-06-06 01:07:05 +02:00
Mano Marks 83514855af Merge pull request #281 from urvil38/master
update tutorial.md file
2017-05-25 13:34:13 -07:00
Mano Marks 70d70d48da Merge pull request #283 from michaelmior/patch-1
Fix minor grammar issues
2017-05-25 11:29:19 -07:00
Michael Mior ef93b253ad Fix minor grammar issues 2017-05-25 14:08:18 -04:00
Urvil Patel a02f524f5c update tutorial.md file
fix the images in readme file which is not shown previously
2017-05-19 13:34:07 +05:30
spara 8a481f7d1d removed node modules 2017-05-18 17:49:16 -05:00
spara 908b611999 fixed typos in registry lab 2017-05-18 17:47:24 -05:00
Mano Marks 3d6d5049e6 Merge pull request #279 from colmprunty/patch-1
Update ReadMe
2017-05-16 15:43:20 -07:00
Mano Marks 5d4aa45eec Merge pull request #280 from ManoMarks/master
Adding in workshops from DockerCon 2017 Austin
2017-05-16 15:42:15 -07:00
Mano Marks 39aa50a406 Update README.md 2017-05-16 15:41:56 -07:00
Mano Marks 6216471e25 Adding in Workshops from DockerCon 2017 Austin 2017-05-16 15:38:45 -07:00
Colm Prunty a95566e671 Update ReadMe
Make the index links match the text in the document for browsing
2017-05-16 09:38:15 +01:00
Mano Marks 44faae43f4 adding in some labs from DCUS2017 2017-05-15 17:08:09 -07:00
Mano Marks 39bda42dd2 Merge pull request #278 from alexellis/post_dockercon_rpi_assets
Add RPi assets post Dockercon
2017-05-15 16:47:18 -07:00
Alex b55e694ba7 Move RPi links into README
Signed-off-by: Alex <alexellis2@gmail.com>
2017-05-15 22:22:08 +01:00
Alex b3f258cd06 Add RPi assets post Dockercon 2017-05-15 22:02:30 +01:00
Mano Marks ffb92cb370 Merge pull request #277 from willieLOH/hotfix/readme-update
Update beginner/chapters/votingapp.md
2017-05-14 15:43:15 -07:00
willieLOH 589597094f Update beginner/chapters/votingapp.md
added command to remove stack
2017-05-15 00:02:10 +08:00
Sophia Parafina 72b5f0f275 Merge pull request #275 from ManoMarks/master
Remove HoL 2016 and add in HoL from DCUS 2017
2017-05-12 17:38:49 -05:00
Mano Marks a1d53ea4c5 cleaning up some HoL references to DockerCon setup 2017-05-12 13:10:01 -07:00
Mano Marks bf2a6c3030 removing 2016 HoL and adding 2017 2017-05-12 12:05:10 -07:00