cd4d60a084
Consistently use 'sudo docker' in examples
...
Docker-DCO-1.1-Signed-off-by: Sven Dowideit <SvenDowideit@docker.com > (github: SvenDowideit)
Upstream-commit: fc9a3b1c1b835c170a4916362855e127a0e366e1
Component: engine
2014-09-16 11:49:05 +10:00
c3fe53e47f
docs: shrink images
...
Docker-DCO-1.1-Signed-off-by: Cristian Staretu <cristian.staretu@gmail.com > (github: unclejack)
Upstream-commit: 90dcc7c8405437a10b81e932b49a856502cee626
Component: engine
2014-09-15 14:46:29 +03:00
23359870fc
Signed-off-by: David Gebler <davidgebler@gmail.com>
...
modified: userguide/dockerlinks.md
fixes incorrect environment variable labeling in container linking guide
Upstream-commit: 78fe117076289695ab03c90d266c47438ab8db7a
Component: engine
2014-09-12 11:04:40 +01:00
d739fdd226
Merge pull request #7988 from markotibold/patch-1
...
Fixed a typo
Upstream-commit: 990da301cf79a07206751b6407125eb4ccbe4d9d
Component: engine
2014-09-12 10:41:12 +10:00
3be52d7f70
Match docs to actual port range used in code.
...
Addresses #7985
Docker-DCO-1.1-Signed-off-by: Phil Estes <estesp@linux.vnet.ibm.com > (github: estesp)
Upstream-commit: d6f4b2ebb40ac79c3ba21e7196bba3b83124cf16
Component: engine
2014-09-11 17:20:01 -04:00
f444f23973
Fixed typo
...
Upstream-commit: ef3920278e6a07254a6dcd9502254ed25656d552
Component: engine
2014-09-11 08:55:45 +02:00
024af24baa
Fix link for configuring automated builds
...
Upstream-commit: ecbc8de2496bb8399a06defb5adfd0860adad788
Component: engine
2014-09-10 21:08:05 +02:00
534f9322ba
small typo. fixed broken code snippet
...
Docker-DCO-1.1-Signed-off-by: Nathan Hsieh <hsieh.nathan@gmail.com > (github: nhsiehgit)
Upstream-commit: adc9a14db49f7e8ffd7cecb788bb9b560a7a3aae
Component: engine
2014-09-03 17:53:45 -07:00
c3ac4898d5
alternative to exit command: CTRL-D
...
Docker-DCO-1.1-Signed-off-by: Eike Herzbach <eike@herzbach.net > (github: eik3)
Upstream-commit: c0c525b3d1a527738c1d942efd70e810908c0eac
Component: engine
2014-09-01 13:38:25 +10:00
431506329f
Be more explicit about volume removal
...
Signed-off-by: Peter Salvatore <peter@psftw.com >
Upstream-commit: bfa3d5fa726dc27e44208b51557edca9b64cf4e9
Component: engine
2014-08-28 16:44:41 -04:00
ac32065d5c
Update /etc/hosts when linked container is restarted
...
Docker-DCO-1.1-Signed-off-by: Victor Vieux <vieux@docker.com > (github: vieux)
Upstream-commit: 450740c891c60dda15b7abe29f35b8e142c2c40e
Component: engine
2014-08-27 18:23:41 -07:00
5b6d059957
Update usingdocker.md
...
Minor rewording and removal of unnecessary apostrophe.
Upstream-commit: fe845c4da88ef15baf45fa600a077a75f3634c40
Component: engine
2014-08-22 17:48:26 +01:00
c5e8598f0d
Merge pull request #7035 from tianon/standardize-apt-get-install
...
Standardize "apt-get install" usage across the repo
Upstream-commit: 503d124677f5a0221e1bf8c8ed7320a15c5e01db
Component: engine
2014-08-01 11:43:37 +10:00
c8eb8f3b81
First pass at replacing parent-child metaphor to describe docker links.
...
Addresses issue #7141
Docker-DCO-1.1-Signed-off-by: Fred Lifton <fred.lifton@docker.com > (github: fredlf)
a little git by
Docker-DCO-1.1-Signed-off-by: Fred Lifton <fred.lifton@docker.com > (github: SvenDowideit)
Upstream-commit: 631ea726e425713415e7a991f9a813d02b3f6d75
Component: engine
2014-08-01 11:09:00 +10:00
a0d04e4cbb
Replace old index image with hub
...
Docker-DCO-1.1-Signed-off-by: Brian Goff <cpuguy83@gmail.com > (github: cpuguy83)
Upstream-commit: ba57d3d9e63445f43e4d53da44e8dec27baa288d
Component: engine
2014-07-30 11:15:18 -04:00
e2390724e7
Standardize "apt-get install" usage across the repo
...
I might have missed some, but I think this is most of the offenders.
Docker-DCO-1.1-Signed-off-by: Andrew Page <admwiggin@gmail.com > (github: tianon)
Upstream-commit: fc637b5275c2fe23c9857a34316a783042d906b8
Component: engine
2014-07-28 17:41:59 -06:00
bed02719c0
Correct Typo In Documentation
...
Upstream-commit: 331200cbaae75a2876bac037c8df2e609bab9658
Component: engine
2014-07-28 14:39:17 -06:00
154cd33cd7
Typo in dockervolumes.md line 141?
...
Upstream-commit: 9503afbc9116b06585cf42715a7ae0bcd0fb7881
Component: engine
2014-07-25 09:06:38 +02:00
6ae4c9014c
update go import path and libcontainer
...
Docker-DCO-1.1-Signed-off-by: Victor Vieux <vieux@docker.com > (github: vieux)
Upstream-commit: b3ee9ac74e171e00f14027e39278013629e681b8
Component: engine
2014-07-24 22:19:50 +00:00
6f7c4cc1d5
Fixed parent-child relationship description
...
"db" is the parent image, and "web" links to it as the child image. There was a typo in the document which reversed the relation.
Upstream-commit: 0a4b39b6a4e9faeea5d8c679e7b03e317a7b02f9
Component: engine
2014-07-23 10:23:14 +02:00
74853679b5
Merge pull request #7030 from runvnc/patch-1
...
Better example for data container
Upstream-commit: 324010ad66f4fa393f53cbfa2fa68d21dabb5941
Component: engine
2014-07-22 10:49:27 +10:00
e6ce9e7e5d
Fix minor grammar issues in dockervolumes.md
...
Upstream-commit: 4ac6375790fe0c7bc9c1bb9c3fdc67db233ff8cb
Component: engine
2014-07-20 17:05:37 -07:00
48f4247a56
Update dockerlinks.md
...
Added missing command for logging into web container.
Upstream-commit: a781de0c10d33f9af92ba8270193f218a3dafdf5
Component: engine
2014-07-19 05:38:11 +01:00
5dc6b4a870
Improve data volume container example.
...
Docker-DCO-1.1-Signed-off-by: Jason Livesay <ithkuil@gmail.com > (github: runvnc)
Upstream-commit: 8273cb4b9bd22ddfdd899682f08ac8327e912a28
Component: engine
2014-07-18 10:22:15 -07:00
9be351863a
Merge pull request #7094 from fredlf/update_docker-hub
...
New screenshots and a few small edits.
Upstream-commit: c11660169a9b1a18f1917d835db3893ff163065c
Component: engine
2014-07-18 02:36:33 +00:00
563aeae59f
New screenshots and a few small edits.
...
Docker-DCO-1.1-Signed-off-by: Fred Lifton <fred.lifton@docker.com > (github: fredlf)
Upstream-commit: c92e13f6789ceda5b5fa78c691173e5c0bd840c4
Component: engine
2014-07-17 16:41:50 -07:00
5a160c1d84
Update usingdocker.md
...
Change --help example command to match output in docs
Upstream-commit: f9b3147e2c3463207392d0f7a8ce533b42632815
Component: engine
2014-07-17 14:44:18 +02:00
6c75ad07a9
Update small note about layer limitation
...
Docker-DCO-1.1-Signed-off-by: Michaël Pailloncy <mpapo.dev@gmail.com > (github: mpapo)
Upstream-commit: 2a230729dae91a54cfe617843b1dd7141ad51948
Component: engine
2014-07-15 21:58:01 +02:00
9e62037a6b
Add small note about AUFS layer limitation
...
Docker-DCO-1.1-Signed-off-by: Michaël Pailloncy <mpapo.dev@gmail.com > (github: mpapo)
Upstream-commit: d91d381856b7c91fa992c3cd1943f27c269219f2
Component: engine
2014-07-15 21:58:01 +02:00
abe9a19e05
Merge pull request #6854 from tomfotherby/patch-1
...
Add documention on how to Mount a Host File as a Data Volume
Upstream-commit: d9265007a0f7c6e47c015b427d59b5638e1102c1
Component: engine
2014-07-10 10:29:15 +00:00
6971f5c244
Tiny text reformat (as per review comments)
...
Docker-DCO-1.1-Signed-off-by: Tom Fotherby <github@tomfotherby.com > (github: tomfotherby)
Upstream-commit: e479cae7cf86a2929e0439a61565ed7d9100f445
Component: engine
2014-07-09 08:21:31 +01:00
1cc255b83d
Typo fix
...
Docker-DCO-1.1-Signed-off-by: Tom Fotherby <github@tomfotherby.com > (github: tomfotherby)
Upstream-commit: a247b63aa18a31cc2aeb8e32c06b040a47764d0b
Component: engine
2014-07-08 10:01:26 +01:00
843b374f7e
Don't make the user get a container alreayd exists error
...
Docker-DCO-1.1-Signed-off-by: SvenDowideit <SvenDowideit@home.org.au > (github: SvenDowideit)
Upstream-commit: 6a9c6d3bf12982ca31e0b38cd323073b44c98456
Component: engine
2014-07-08 11:09:55 +10:00
10fd0b6403
Reformat to keep line length within 80 characters
...
Docker-DCO-1.1-Signed-off-by: Tom Fotherby <github@tomfotherby.com > (github: tomfotherby)
Upstream-commit: ebbfdf0a0f99aac67b8ad5d789d8a400be346c30
Component: engine
2014-07-07 12:01:04 +01:00
8ad8344e9f
Fix the parent/child relationship in the docs
...
In the Docker Linking Docs, the parent child relationship
was backwards. The Web container should be able to access
the DB, not other way around. Furthermore, the output of
'docker ps' was wrong (it showed that the DB could access
the Web). This fixes both typos.
Docker-DCO-1.1-Signed-off-by: Ian Bull <irbull@gmail.com > (github: irbull)
Upstream-commit: 29a20672c216e2f8aa90af765ac5c47e3350b3d9
Component: engine
2014-07-05 13:58:09 -07:00
82cbeaf605
Update File mount info for docker v1.1.0
...
Docker-DCO-1.1-Signed-off-by: Tom Fotherby <github@tomfotherby.com > (github: tomfotherby)
Upstream-commit: 87df57810d39bdd50167338e5ff8d0e6bc6e23e2
Component: engine
2014-07-05 03:46:41 +01:00
003b3ea1df
Add info to Mount a Host File as a Data Volume
...
Docker-DCO-1.1-Signed-off-by: Tom Fotherby <github@tomfotherby.com > (github: tomfotherby)
Upstream-commit: cfbe062eb2ba6f1d24ab3b6f9b965a65931d5b07
Component: engine
2014-07-04 18:52:10 +01:00
c8806a50df
I'm going to wish I didn't do this
...
Docker-DCO-1.1-Signed-off-by: SvenDowideit <SvenDowideit@home.org.au > (github: SvenDowideit)
Upstream-commit: fa29b1f062d25c1a8ca62f02b9cc7533df4c7449
Component: engine
2014-07-03 10:31:56 +10:00
daa972d7b1
Merge pull request #6789 from SvenDowideit/pr_out_expand_to_used_b2d_vm_on_any_of_the_platforms
...
expand to 'used b2d vm on any of the platforms'
Upstream-commit: 5ff18b8155b4cd6274b63ea227ff3d686464dc14
Component: engine
2014-07-01 16:09:38 -07:00
23fab74a7a
Lowercase world, because its not important.
...
Docker-DCO-1.1-Signed-off-by: Sven Dowideit <SvenDowideit@docker.com > (github: SvenDowideit)
Upstream-commit: a09f99b8b0e157e3bb72ad0c9dad8d83896c5182
Component: engine
2014-07-01 15:07:48 -07:00
ae635ad89d
removing the exclaimation mark from our hello-world examples, some users get trapped by the shell
...
Docker-DCO-1.1-Signed-off-by: SvenDowideit <SvenDowideit@home.org.au > (github: SvenDowideit)
Upstream-commit: 3091d9a31e81be9b8a99aaae8f7d5c2e64043286
Component: engine
2014-07-01 15:07:48 -07:00
5d4daaece0
convert OSX into OS X
...
Docker-DCO-1.1-Signed-off-by: Sven Dowideit <SvenDowideit@docker.com > (github: SvenDowideit)
Upstream-commit: 91c4fbb7bfe8851130f746911e34b9d190bb4572
Component: engine
2014-07-01 15:00:34 -07:00
9fa6f8bdbb
expand to 'used b2d vm on any of the platforms'
...
Docker-DCO-1.1-Signed-off-by: SvenDowideit <SvenDowideit@home.org.au > (github: SvenDowideit)
Upstream-commit: 84990731f79e4e94229a7ff2039f812e8b036643
Component: engine
2014-07-01 15:00:34 -07:00
58bb79fb17
Update usingdocker.md
...
boot2docker on windows also uses an IP of its own.
Docker-DCO-1.1-Signed-off-by: Tom Maaswinkel <tom.maaswinkel@12wiki.eu > (github: SvenDowideit)
Upstream-commit: fc4c0d9de45da5ff5664fb9c914b68e176c626cd
Component: engine
2014-07-01 15:00:34 -07:00
bc68396213
Merge pull request #6752 from mchelen/patch-5
...
fix typo
Upstream-commit: 7362a09cd9e3efa3e0e065e5b8d69a9dfd614cf2
Component: engine
2014-06-29 08:29:12 +10:00
889b867878
fix typo
...
Upstream-commit: 0d2656ce6e8536fcdb6d68b5899febe867f59c70
Component: engine
2014-06-28 12:26:36 -04:00
d1e69d47f8
missing sudo
...
Upstream-commit: 4a5f09387e17860ba748d94028cb2a307c9e0b11
Component: engine
2014-06-28 12:01:16 -04:00
a541e4db62
Update dockerimages.md
...
fix typo
Upstream-commit: 815279c240e27478aa7ddde349761546a5c474fc
Component: engine
2014-06-27 11:09:09 -04:00
f8c849c6d4
Update dockerizing.md
...
fix typo
Upstream-commit: 0bfa14a70aa7dda06d769c5dd55354b13b417c94
Component: engine
2014-06-27 02:34:47 -04:00
b5142ee5aa
Remove superfluous reptition from usingdocker.md
...
Clarify wording about default docker ps options
Fix typo in dockerlinks.md
Docker-DCO-1.1-Signed-off-by: Paul Weaver <pauweave@cisco.com > (github: ch3pjw)
Upstream-commit: 748aaf3530b943449d61952e06eb9aeab4a455ac
Component: engine
2014-06-27 11:43:29 +10:00
