d4dfa6563a
Reword a sentence bringing confusion about docker links
...
As [discovered][1] doing user support, the sentence `You've learned that a link creates a
source container that can provide information about itself to a recipient container` brings
confusion.
[1]: http://stackoverflow.com/questions/26652877/how-to-avoid-redundant-container-linking-in-docker-when-propagating-ip-addresses/26654203?noredirect=1#comment41945048_26654203
Signed-off-by: Thomas LEVEIL <thomasleveil@gmail.com >
Upstream-commit: 906985123aa6b7874c3c0e21f0fb5603928ff6dd
Component: engine
2014-10-31 13:00:59 +00:00
648f649fec
Merge pull request #8808 from nhsiehgit/dockerfiletut
...
changed dockerfile back button to look nicer
Upstream-commit: f1ddda6cf735e214a3980a000b1cbfb0d893e38a
Component: engine
2014-10-28 19:41:18 -07:00
088e4a75d9
Merge pull request #8750 from matm/patch-2
...
dockerimages.md: typo fix
Upstream-commit: 75ae54637778e98e06200d2a02afcab6902805aa
Component: engine
2014-10-28 22:04:43 -04:00
3de9330fda
changed dockerfile back button to look nicer
...
Signed-off-by: Nathan Hsieh <hsieh.nathan@gmail.com >
Upstream-commit: 7597f27276b1c47da05ad1ae0bbcca21e080d9a7
Component: engine
2014-10-28 11:52:49 -07:00
462b389e50
Add back Best Practices link.
...
Docker-DCO-1.1-Signed-off-by: Fred Lifton <fred.lifton@docker.com > (github: fredlf)
Upstream-commit: fcae37402aac7372414fd4947b7a280bec398557
Component: engine
2014-10-24 13:17:14 -07:00
20fbd71b3d
Tweaks to Dockerfile tutorial
...
Made a few tweaks to Dockerfile tutorial links and removed some cruft from the tutorial itself.
Docker-DCO-1.1-Signed-off-by: Fred Lifton <fred.lifton@docker.com > (github: fredlf)
Upstream-commit: cc45b13ad4e4384f016764c15a52eda95eb548a4
Component: engine
2014-10-24 12:00:47 -07:00
e7c0f6f001
dockerimages.md: typo fix
...
Upstream-commit: 417fde550e30e6e2b8853f73f6c85f25b9c6a80f
Component: engine
2014-10-24 09:09:20 +02:00
dcf4a751ab
Merge pull request #8682 from wpp/update_linking_documentation
...
Update linking documentation
Upstream-commit: 6aeda169957a4b6cabcdd8b3a163118b05af8434
Component: engine
2014-10-21 21:01:51 -07:00
32b0a0f87c
Update container linking documentation
...
As of 1.3 `docker ps` no longer shows links between containers.
This updates the documentation to reflect that change.
sudo docker docker inspect -f "{{ .HostConfig.Links }}" web
Signed-off-by: Philipp Weissensteiner <mail@philippweissensteiner.com >
Upstream-commit: 5df2c878a1b2baeb22538bb66be631b8da33236a
Component: engine
2014-10-21 21:58:05 +02:00
25b5c6da5c
small typo
...
Upstream-commit: 3d10d50c6d85e2d20e10bb925f3a3fc3212d52ea
Component: engine
2014-10-20 14:17:33 +08:00
f719bb448a
Update dockerimages.md
...
The container ID in the text didn't match the container ID from the figure above it.
Upstream-commit: 4e8f69bfe06897054611ee3c7fb41e5babce2224
Component: engine
2014-10-16 22:16:29 -04:00
7dca5b65c4
docs: Fix some minor typos on dockerlinks guide
...
Signed-off-by: Fabio Rehm <fgrehm@gmail.com >
Upstream-commit: 06d633e1f68d003f6183403b134142b12a24c9ca
Component: engine
2014-10-14 10:15:35 -03:00
7c9155aa4b
Add more info about the LINK env vars created
...
@SvenDowideit see what you think. I'd like to get your take on this
before I submit the PR.
Closes #4789
Signed-off-by: Doug Davis <dug@us.ibm.com >
Upstream-commit: 61387427cb9b1ed6a4c34e0a7960183159ee305d
Component: engine
2014-10-12 18:34:18 -07:00
e5c1195d99
reflect changes introduced in d2ffcd9 in docs
...
Docker-DCO-1.1-Signed-off-by: Brice Jaglin <bjaglin@teads.tv > (github: bjaglin)
Upstream-commit: 0099b5e68cc76080f01e9150d3a3b86e0cb2b741
Component: engine
2014-10-10 08:12:12 +02:00
c763054d93
added fixes to address comments
...
Signed-off-by: Nathan Hsieh <hsieh.nathan@gmail.com >
Upstream-commit: 6a874cf711a7df5e60f1290e02fe4ca25851b985
Component: engine
2014-10-08 13:46:44 -07:00
d2ff407b2f
Squashed commit of the following:
...
commit 3f9e9185fe7ee51f2fe55f0fc0d4fffdc4f289dc
Author: Nathan Hsieh <hsieh.nathan@gmail.com >
Date: Mon Oct 6 10:57:35 2014 -0700
changed the title of back buttons
commit f86934424e85931ec293e711ceaa93ee920828fb
Author: Nathan Hsieh <hsieh.nathan@gmail.com >
Date: Mon Oct 6 10:53:15 2014 -0700
Finished level 2, refactored tests
commit 8f502bce05293cccaf200b69ce5f5826eee72484
Author: Nathan Hsieh <hsieh.nathan@gmail.com >
Date: Mon Oct 6 08:52:37 2014 -0700
stylized better and added level 2
commit 07b2276b346c34c0cc0faa57500c40e120e77888
Author: Nathan Hsieh <hsieh.nathan@gmail.com >
Date: Fri Oct 3 18:17:29 2014 -0700
broke tutorial tests styles
commit 35d84147dc2f65b0ffeea5faf304add903219b1e
Author: Nathan Hsieh <hsieh.nathan@gmail.com >
Date: Fri Oct 3 17:23:48 2014 -0700
structured test level1 md file
commit 808d01b0d55d67eb1017f290a29da6c7d38565f2
Author: Nathan Hsieh <hsieh.nathan@gmail.com >
Date: Fri Oct 3 17:15:46 2014 -0700
Modified files and integrated tutorial through new page
commit 0f0093f2882489c3eeb6f8870f2b8aa64dc939a3
Author: Nathan Hsieh <hsieh.nathan@gmail.com >
Date: Thu Oct 2 14:34:44 2014 -0700
more refactoring
commit 5a9b98e55ebd455ccf2c0ced20f984545a0b6d71
Author: Nathan Hsieh <hsieh.nathan@gmail.com >
Date: Thu Oct 2 11:46:58 2014 -0700
clean js code
commit af3bbd8d5e1dffdaa1780f83b909ff566906e513
Author: Nathan Hsieh <hsieh.nathan@gmail.com >
Date: Thu Oct 2 11:26:39 2014 -0700
level 1 cleanup
commit c4852a7766ab4fbd978d65c8352ace05eb427ef5
Author: Nathan Hsieh <hsieh.nathan@gmail.com >
Date: Thu Oct 2 11:20:17 2014 -0700
fixed up fill-in level1
commit 7f02d80942549dec9c05f784b777fcb32d5bb81b
Author: Nathan Hsieh <hsieh.nathan@gmail.com >
Date: Wed Oct 1 17:45:42 2014 -0700
added dockerfile tut, stylized lesson1 Questions
Signed-off-by: Nathan Hsieh <hsieh.nathan@gmail.com >
Upstream-commit: c257dcc9a4a78aa4455fbd417d0f80b2efb4713a
Component: engine
2014-10-08 13:46:44 -07:00
34b246475b
merged conflicting commits
...
Signed-off-by: Nathan Hsieh <hsieh.nathan@gmail.com >
Upstream-commit: 8ceb213b3e86973c795ec87a724c7dc7a794d57e
Component: engine
2014-10-08 13:44:21 -07:00
ff11ba1435
Print a status message when pull command is executed
...
Using repo tag in the status message for better usability, as per review comments
Added documentation and Changed code to print Status after downloads are complete
Addresses #2404
Signed-off-by: Srini Brahmaroutu <srbrahma@us.ibm.com >
Upstream-commit: ecff6303a366a5e8fd178b7baa1c64895a3a3622
Component: engine
2014-10-01 22:55:29 +00:00
134a1a90ab
Merge pull request #8197 from fredlf/adding_official-repo-guidelines
...
Docs for Official Repo release
Upstream-commit: 8dd11c7175147d31761b647daac10fb18f0420c2
Component: engine
2014-09-23 20:55:07 -07:00
756d3489d5
Adding new Dockerfile Best Practices doc, and links thereto.
...
Docker-DCO-1.1-Signed-off-by: Fred Lifton <fred.lifton@docker.com > (github: fredlf)
Upstream-commit: d9fd5f6199aebb9ea784f5b23ec97b960f89f3d4
Component: engine
2014-09-23 14:21:00 -07:00
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
