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
Mano Marks
a6aafb61c2
Merge pull request #272 from Deborah-Digges/patch-3
...
Update votingapp.md
2017-05-11 10:21:13 -07:00
Mano Marks
ad8c9c4512
Merge pull request #273 from Deborah-Digges/patch-4
...
Update README.md
2017-05-11 10:18:39 -07:00
Deborah Gertrude Digges
85c1d22fd1
Update README.md
2017-05-11 22:25:22 +05:30
Deborah Gertrude Digges
d1b7676d79
Update votingapp.md
2017-05-11 22:23:35 +05:30
Mano Marks
521fc0fabe
Merge pull request #271 from cdituri/patch-1
...
README.md: fix broken HTTP Routing Mesh link
2017-05-10 17:22:03 -07:00
Chris Dituri
9c611b06cb
README.md: fix broken HTTP Routing Mesh link
...
Spaces in the filename caused markdown not to render link properly, works fine when urlencoded--as this PR proposes.
An alternative fix would be to rename ``labs\networking/A4-HTTP Routing Mesh.md``, substituting the <spaces> for hyphens--this would bring the file into alignment with all others in the directory.
2017-05-10 19:20:32 -05:00
Mano Marks
4d2f211159
Delete .DS_Store
2017-05-09 15:51:11 -07:00
Mano Marks
0ecabbe38d
Merge pull request #269 from Zebradil/patch-1
...
Fix formatting
2017-05-08 10:56:26 -07:00
German Lashevich
f771acc96e
Fix formatting
2017-05-08 16:49:26 +03:00
Mano Marks
4f1352c95d
Merge pull request #268 from arun-gupta/dockercon
...
Final slides from DockerCon 2017
2017-05-04 14:45:39 -07:00
Mano Marks
3a6909af33
Merge pull request #243 from fvhovell/patch-1
...
Cannot scale network in a stack
2017-05-04 14:45:26 -07:00
Arun Gupta
948075fc83
final version of #DockerCon slides
2017-05-04 14:36:11 -07:00
Mano Marks
01e4468ceb
Merge pull request #267 from Deborah-Digges/patch-2
...
Fix typo
2017-05-04 13:24:13 -07:00
Deborah Gertrude Digges
035308ac5e
Fix typo
2017-05-04 22:47:49 +05:30
Mano Marks
868c85ec56
Merge pull request #263 from ManoMarks/master
...
removing cloud quickstart swarm mode tutorial
2017-05-01 12:52:03 -07:00
Mano Marks
bae8e3f9e5
removing cloud quickstart. To be replaced later with Docker for AWS and Docker for Azure labs
2017-05-01 12:50:44 -07:00
Mano Marks
7788a14055
Merge pull request #262 from ManoMarks/master
...
removing dotnet bot
2017-05-01 12:47:39 -07:00
Mano Marks
270d33a7ba
removing dotnet bot
2017-05-01 12:46:30 -07:00
Mano Marks
27d29089e2
Merge pull request #260 from royeectu/master
...
Changed the order of the cleanup - it is impossible to remove secrets…
2017-05-01 12:40:38 -07:00
Mano Marks
56555ed424
Merge pull request #261 from friism/patch-4
...
fix README
2017-05-01 11:43:14 -07:00
Michael Friis
9decb41433
fix README
2017-05-01 11:26:40 -07:00
royeectu
a632b45362
Changed the order of the cleanup - it is impossible to remove secrets while being used by services
2017-04-30 10:02:17 +03:00
Mano Marks
af9a6691eb
Merge pull request #258 from iblancasa/patch-1
...
Fix MD errors
2017-04-27 10:08:14 -07:00
Mano Marks
865a4ea450
Merge pull request #259 from royeectu/master
...
Fixed markdown - should be H1
2017-04-27 10:06:46 -07:00