Commit Graph

2063 Commits

Author SHA1 Message Date
154cd33cd7 Typo in dockervolumes.md line 141?
Upstream-commit: 9503afbc9116b06585cf42715a7ae0bcd0fb7881
Component: engine
2014-07-25 09:06:38 +02:00
86189cd855 Merge pull request #7185 from thaJeztah/patch-1
Fix incorrect path in ENTRYPOINT example
Upstream-commit: ff28b0b9194ffdad15ea459e123e2f5b674dc7e6
Component: engine
2014-07-25 17:06:29 +10: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
0b23dd95aa Merge pull request #7199 from ipbabble/mp-changes
Fixed some typos for '--' Vs '-' in docker-run-1.md
Upstream-commit: 0758acfb03a3a93903e0f4a109f6e9e30b07fbc1
Component: engine
2014-07-24 06:51:56 -07:00
53aae89bf0 Fix incorrect path in ENTRYPOINT example
The ENTRYPOINT example uses "/usr/bin/ls" as path, but `ls` is located at `/bin/ls`.

Docker-DCO-1.1-Signed-off-by: Sebastiaan van Stijn <github@gone.nl> (github: thaJeztah)
Upstream-commit: 2819d9b4062914daa5b6bd4d08676807859eae3f
Component: engine
2014-07-24 14:48:23 +02:00
c9b056319d Merge pull request #7181 from timruffles/patch-3
[DOCS] replace foo/bar with concrete names
Upstream-commit: bb6217c0556709c7e911faa8e968c3f72a38464d
Component: engine
2014-07-24 12:26:10 +10:00
c26325b9c4 Typo changes to docker-run-1.md - changing '-' to '--' where approp.
Docker-DCO-1.1-Signed-off-by: William Henry <whenry@redhat.com> (github: ipbabble)
Upstream-commit: 140337296353b2dd37678b0e30cbf0ebe2cfd9e7
Component: engine
2014-07-23 16:49:07 -04:00
6dc7b294a3 Merge pull request #7180 from rhuss/patch-1
Fixed parent-child relationship description
Upstream-commit: b9024174be37919e85c3127cf0d41f6d94d835c3
Component: engine
2014-07-23 10:17:19 -07:00
d72a089030 [DOCS] replace foo/bar with concrete names
namespaces are not well documented, and I had to jump around to other docs. replacing `foo/bar` hopefully makes what's going on here a bit more obvious.

Docker-DCO-1.1-Signed-off-by: Tim Ruffles <timruffles@gmail.com> (github: timruffles)
Upstream-commit: 455e837e207a01153947fc81e3a22d6bb37d2c89
Component: engine
2014-07-23 15:21:16 +01: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
a347eb0112 user facing documentation changes in master atm
Docker-DCO-1.1-Signed-off-by: SvenDowideit <SvenDowideit@home.org.au> (github: SvenDowideit)
Upstream-commit: 5743cc3423b48a0a3c78c7640bb10d840c911604
Component: engine
2014-07-23 12:40:10 +10:00
9140b4810a Merge pull request #7151 from SvenDowideit/add-version-selection-ux
Add version selection ux to the Documentation.
Upstream-commit: 2f23e204d9190895ae761d97495fdbd7093b625a
Component: engine
2014-07-23 09:21:55 +10:00
f95bb42771 Merge pull request #7169 from fredlf/update_osx-install
Initial revisions to b2d doc, new screenshots.
Upstream-commit: 0d118ffbf83711bf8f6271308e290ab011bc460e
Component: engine
2014-07-23 07:34:06 +10:00
724ac12239 Initial revisions to b2d doc, new screenshots.
Docker-DCO-1.1-Signed-off-by: Fred Lifton <fred.lifton@docker.com> (github: fredlf)

Final revisions to B2D doc.

Docker-DCO-1.1-Signed-off-by: Fred Lifton <fred.lifton@docker.com> (github: fredlf)
Upstream-commit: 4002b4623c91d94d93f8575c4a554392202aa44d
Component: engine
2014-07-22 13:14:42 -07:00
5fa2981ff0 avoid publishing to the root unless specified, so old version releases only goto their own dir
Docker-DCO-1.1-Signed-off-by: SvenDowideit <SvenDowideit@home.org.au> (github: SvenDowideit)
Upstream-commit: 4d109f6158c7607ee4cd9907b17ddba5f4d29d04
Component: engine
2014-07-22 19:05:18 +10:00
eb7d72cb32 the build cache is too agressive, and I am regularly getting builds using an old version - forcing the issue
Docker-DCO-1.1-Signed-off-by: SvenDowideit <SvenDowideit@home.org.au> (github: SvenDowideit)
Upstream-commit: 3853a9c612e3d19dadea26153c9cebaec8cd67a4
Component: engine
2014-07-22 17:21:03 +10:00
bbc55c5d41 Merge pull request #7134 from MidnightDesign/patch-1
Fix a typo in the tutorial
Upstream-commit: 9dc82e6102f25b9d0da1410616a4af830e4349f4
Component: engine
2014-07-22 12:00:06 +10:00
ccf84ea953 Merge pull request #7112 from proppy/patch-8
docs/installation/google: update gcloud options
Upstream-commit: 1cc55fda3d53d2d54a877b85f36008b0654af9f4
Component: engine
2014-07-22 11:22:08 +10: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
ac0be9871d Merge pull request #6569 from bcexelbi/rhel-install-update
Updated Red Hat Enterprise Linux installation instructions for version 7
Upstream-commit: 8f75de2d4e11c12a7d17726f005f03e742f12057
Component: engine
2014-07-22 10:30:18 +10:00
0bdbb48e10 Merge pull request #7104 from mheon/sigproxy_docs
Update docs on --sig-proxy
Upstream-commit: 61b675d3bb6a645f7f4683253f78f0f9ddfe5a22
Component: engine
2014-07-21 13:42:41 -07:00
5d850a0bb6 Resolve merge conflict, attempt 3
Docker-DCO-1.1-Signed-off-by: AJ Bowen <aj@gandi.net> (github: soulshake)
Upstream-commit: 319a8a241e0b9182ea309b886e2d23e2f4d73c6c
Component: engine
2014-07-21 12:18:59 -07:00
21d78da869 docs/installation/google: update gcloud options
Docker-DCO-1.1-Signed-off-by: Johan Euphrosine <proppy@google.com> (github: proppy)
Upstream-commit: e1bb99d925895f4eaec54e7b8254f5250dfeb7dd
Component: engine
2014-07-21 10:55:12 -07:00
cec25b5ea2 Fix a typo in the tutorial
Upstream-commit: 9ff7bbe0ac4172ea15242218e9ac4668eddc1e7f
Component: engine
2014-07-21 10:34:54 +02:00
b3754356a2 dynamically load a /versions.html_fragment file so that all old versions get the complete dropdown list of versions to select
Docker-DCO-1.1-Signed-off-by: SvenDowideit <SvenDowideit@home.org.au> (github: SvenDowideit)
Upstream-commit: 5cd0f0824d04a73fb798207231b47157a51604d5
Component: engine
2014-07-21 15:51:14 +10:00
9bc7000fc7 The UX spec
Docker-DCO-1.1-Signed-off-by: SvenDowideit <SvenDowideit@home.org.au> (github: SvenDowideit)
Upstream-commit: c550ad59006c6a0c99b88581bb4378accea63043
Component: engine
2014-07-21 12:39:48 +10:00
afa8623ab8 initial work to make a mockup
Docker-DCO-1.1-Signed-off-by: SvenDowideit <SvenDowideit@home.org.au> (github: SvenDowideit)
Upstream-commit: 8a4b79ca5016ae8de0f530ae394064dc5142e5a6
Component: engine
2014-07-21 12:39:48 +10:00
e6ce9e7e5d Fix minor grammar issues in dockervolumes.md
Upstream-commit: 4ac6375790fe0c7bc9c1bb9c3fdc67db233ff8cb
Component: engine
2014-07-20 17:05:37 -07:00
85c7a7ed04 Merge pull request #7117 from hipertracker/patch-1
Update dockerlinks.md
Upstream-commit: e60543400da0c5de3f6167288f7181eea8a9049d
Component: engine
2014-07-21 09:43:23 +10: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
bbe750e110 Remove blank "use" documentation
Introduced in dotcloud/docker#3070

Docker-DCO-1.1-Signed-off-by: Ben Firshman <ben@firshman.co.uk> (github: bfirsh)
Upstream-commit: b82778b293e35a147d66001e6406843dc937a233
Component: engine
2014-07-18 18:45:20 -07:00
1a215f0eb4 Merge pull request #3070 from alexlarsson/certificates
Upstream-commit: c7bc929e0151b01e723feca1213a1adb9ffc7d9b
Component: engine
2014-07-18 18:27:00 -07:00
8cf0e7787b Update runmetrics.md
Upstream-commit: 95caf8c4856ad477dbc835c6f9af5af5668389c0
Component: engine
2014-07-18 16:16:19 -05:00
be50882dfa fix doc references
Docker-DCO-1.1-Signed-off-by: Daniel, Dao Quang Minh <dqminh89@gmail.com> (github: dqminh)
Upstream-commit: 4b5b3b43212c0a1883c56321aedbffc605be31f9
Component: engine
2014-07-18 17:45:25 +00:00
ee146b71d5 Add logout command
"docker logout [SERVER]" will remove the registry server' credentials from
.dockercfg file. If a server is not specified, it will log user out of the
default docker registry server

Docker-DCO-1.1-Signed-off-by: Daniel, Dao Quang Minh <dqminh89@gmail.com> (github: dqminh)
Upstream-commit: 06bc4e07529a93abede35ea8fcc2906c5963f2a3
Component: engine
2014-07-18 17:42:49 +00: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
0ebb75ea35 Merge pull request #6984 from jameskyle/6937-allow-setting-of-docker-config-directory
Closes 6937. Allows setting of docker config dir.
Upstream-commit: 36608696e1b062a1d319f205e6d5b0c56a85f33c
Component: engine
2014-07-18 09:51:50 -07:00
638498458f Update docs on --sig-proxy to indicate that SIGKILL and SIGSTOP cannot be proxied
Docker-DCO-1.1-Signed-off-by: Matt Heon <mheon@redhat.com> (github: mheon)
Upstream-commit: 31351d08a35b2c903a2b6407bea09ccf1449e79c
Component: engine
2014-07-18 12:32:04 -04:00
6b13e80c3e Updated Red Hat Enterprise Linux installation instructions for version 7
Docker-DCO-1.1-Signed-off-by: Brian Exelbierd <bex@pobox.com> (github: bcexelbi)
Upstream-commit: 204e080932db1cab17de2e19c826663b8b1449a6
Component: engine
2014-07-18 08:08:27 +02: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
f8ef72504f Merge pull request #7082 from bdevloed/patch-1
Update usingdocker.md
Upstream-commit: 7a5ddd5df85a9e8e9bdfb3a7b35c44d7e2ded1eb
Component: engine
2014-07-18 01:26:15 +00:00
0e4d2f6461 Merge pull request #7068 from fredlf/add_image-tag
Added info re: image[:tag] to make docs consistent. 
Upstream-commit: 9f036fc6eee8e92da383e1b9dec4a7375714b20c
Component: engine
2014-07-18 00:03:57 +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
073fd95835 Merge pull request #7027 from SvenDowideit/use-a-hello-world-micro-image
Tianon made a micro-image (sub one meg?) that we can use as a very fast ...
Upstream-commit: ca015b8885fb8f7ded215d7d7e55f9f7501498c7
Component: engine
2014-07-17 11:31:54 -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
3555c6d1c2 Merge pull request #7049 from albers/default-option
removed default --rm option from example build command
Upstream-commit: 4ae27be2cd1cbedea9cba0f796bc9f040dde7007
Component: engine
2014-07-17 04:52:16 -04:00
35e71a0cd0 Tianon made a micro-image (sub one meg?) that we can use as a very fast to download 'yes, your docker can download and run an image' test
Docker-DCO-1.1-Signed-off-by: Sven Dowideit <SvenDowideit@docker.com> (github: SvenDowideit)
Upstream-commit: 6ae07e24104af6eb245339dae3a878fb983d112e
Component: engine
2014-07-17 11:54:35 +10:00
19a14797ac Added info re: image[:tag] to make docs consistent. Fixed a markdown issue.
Closes issue #6833

Docker-DCO-1.1-Signed-off-by: Fred Lifton <fred.lifton@docker.com> (github: fredlf)
Upstream-commit: 41d6ab6318cc2c8905a174ed28a78dfcad06cef5
Component: engine
2014-07-16 16:39:44 -07:00
7ba096c75a Merge pull request #7045 from SvenDowideit/pr_out_re_write_to_put_the_emphasis_on_the_format
re-write to put the emphasis on the  format
Upstream-commit: 905ae7bb281cb8dbcc3ca6284103e0a3544db1f7
Component: engine
2014-07-16 11:47:05 -07:00
013dc5d8c5 removed default --rm option from example build command
this line gave the false impression that containers are not removed
unless you specify the --rm argument.
Upstream-commit: c5f55a233de09f8aa4ce7f061e8da2d435017fef
Component: engine
2014-07-16 11:18:08 +02:00