58385e59a1
Merge pull request #6840 from gesellix/patch-1
...
docs: add Groovy Docker-Client link
Upstream-commit: 323e6a3cf29677459a7bc658a0b5221e5675bc46
Component: engine
2014-07-07 11:16:55 +10:00
1f0f85afed
Merge pull request #6846 from irbull/master
...
Fix the parent/child relationship in the docs
Upstream-commit: cf01997ebeea84b31c35bb99253e5f3ca5b05533
Component: engine
2014-07-07 10:27:27 +10:00
0664d3e7f1
run.md: Fix references to cli
...
There are now no other occurrences of `#cli-` in this document.
TODO: Find other places with wrong links.
Upstream-commit: 95870ef3349920efc981a703d52f5832b79ee18e
Component: engine
2014-07-06 14:47:37 +02: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
f9a8a47305
doc fix: remove trailing *
...
The trailing `*` makes it seem like there is some kind of annotation
Upstream-commit: 6e4b37fffdfc324141aae9f86268db4e8ed7aeb0
Component: engine
2014-07-03 14:02:40 -07:00
984e0d89c3
docs: add Groovy Docker-Client link
...
Docker-DCO-1.1-Signed-off-by: Tobias Gesellchen <tobias@gesellix.de > (github: gesellix)
Upstream-commit: 5c246c931eec7ec31a90fc4ae1577eb54f938427
Component: engine
2014-07-03 22:24:24 +02:00
6e61659fda
Fix 2 docker.com theme regressions on docs.docker.com
...
- Hover colours of doc nav wrong
- Primary Docs Nav not active when user is Logged in.
Docker-DCO-1.1-Signed-off-by: Sven Dowideit <SvenDowideit@docker.com > (github: SvenDowideit)
Upstream-commit: 873241790f802351d36c490046435215b33e4551
Component: engine
2014-07-02 21:19:48 -07:00
a07084dd27
missed these merge conflicts when manually rebasing too many files
...
Docker-DCO-1.1-Signed-off-by: SvenDowideit <SvenDowideit@home.org.au > (github: SvenDowideit)
Upstream-commit: f8d9ecfb2ceda0cc2aed3d8fd3fbcbf625a8fcdd
Component: engine
2014-07-03 11:07:42 +10:00
3309d6e15c
Merge pull request #6824 from fredlf/1-1_release_notes
...
Added Release Notes
Upstream-commit: 9fe95f1c5bae60bad72f056b109e4b1b694d7dc0
Component: engine
2014-07-03 10:45:11 +10:00
478a3a5c9d
Corrected version number to 3 digits.
...
Docker-DCO-1.1-Signed-off-by: Fred Lifton <fred.lifton@docker.com > (github: fredlf)
Upstream-commit: c3f4972f6d036520df589676c7ebeef397d327c2
Component: engine
2014-07-02 17:41:52 -07: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
bedc0093af
Update cli.md and man pages to match current cli
...
Docker-DCO-1.1-Signed-off-by: SvenDowideit <SvenDowideit@home.org.au > (github: SvenDowideit)
Upstream-commit: b07f193822d00e40580cd11320ed7e01b629f9d7
Component: engine
2014-07-03 10:22:20 +10:00
f26079f0a4
Added Release Notes
...
Release notes for v.1.1 have been added to the docs index.md page. Made some revisions to
other content to make it shorter.
Docker-DCO-1.1-Signed-off-by: Fred Lifton <fred.lifton@docker.com > (github: fredlf)
Upstream-commit: d946cae36436a270b14d53585624e5567e590db2
Component: engine
2014-07-02 16:33:13 -07: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
5b3846e278
Merge pull request #6781 from anweiss/6738-dscarticle
...
Add Article for PowerShell DSC
Upstream-commit: 96e2bfe28a27217c9ef48b84579290615c413fe4
Component: engine
2014-07-01 15:48:19 -07:00
b197a64c27
Merge pull request #6788 from SvenDowideit/remote-bang-from-hello-world
...
removing the exclaimation mark from our hello-world examples, some users...
Upstream-commit: a52d90a100938f18411f128369923326e13ba905
Component: engine
2014-07-01 18:10:17 -04: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
dc89e9a3a5
Merge pull request #6803 from vieux/pr_6176
...
Implement tail for docker logs
Upstream-commit: 49d49ac98f06d0016bcbda56f3ef158c64167bae
Component: engine
2014-07-01 14:59:37 -07:00
fe06e048c4
update docs
...
Docker-DCO-1.1-Signed-off-by: Victor Vieux <vieux@docker.com > (github: vieux)
Upstream-commit: e06d533cc20c6aab10bf28a610445e7de6a8ef42
Component: engine
2014-07-01 21:59:08 +00:00
84b509b855
add DSC article
...
Docker-DCO-1.1-Signed-off-by: Andrew Weiss <andrew.weiss@outlook.com > (github: anweiss)
Upstream-commit: 5c344dca4be275fc4e85c5e2dfd35133aff5cb23
Component: engine
2014-07-01 17:32:55 -04:00
c1f6739a06
Implement tail for docker logs
...
Fixes #4330
Docker-DCO-1.1-Signed-off-by: Alexandr Morozov <lk4d4math@gmail.com > (github: LK4D4)
Upstream-commit: 1dc0caf9c0170ab8e7f5a2f77f2dbdacff322eff
Component: engine
2014-07-01 23:44:12 +04:00
3cde46554b
more docs for dockerignore
...
Docker-DCO-1.1-Signed-off-by: Tibor Vass <teabee89@gmail.com > (github: tiborvass)
Upstream-commit: c21c55e0b6d0f9582e4ee168fbd518b57dacc8fb
Component: engine
2014-07-01 15:11:18 -04:00
e49c262737
Merge pull request #6787 from vieux/pause_commit2
...
Pause/freeze containers during commit
Upstream-commit: cdc62c778f86070d2d62de5055d6288b916136ee
Component: engine
2014-07-01 10:11:18 -07:00
afd3ebbfd3
updated docs & tests
...
Docker-DCO-1.1-Signed-off-by: Victor Vieux <vieux@docker.com > (github: vieux)
Upstream-commit: 957c510d729ac3dcbe892b145fb2d9ed766be2ca
Component: engine
2014-07-01 17:10:00 +00:00
7ce2f56d41
Add FAQ entry about bundled vs packaged libraries
...
Docker-DCO-1.1-Signed-off-by: Jérôme Petazzoni <jerome@docker.com > (github: jpetazzo)
Upstream-commit: ae1ff4dea311f8c6ff025b4835dc5d751f1b6261
Component: engine
2014-07-01 07:47:59 -07:00
ae1f05d70a
Pause/freeze containers during commit
...
Initiates a pause before committing a container,
adds a pause option to the commit command, defaulting to 'true'.
Fixes bug: #6267
Fixes bug: #3675
Docker-DCO-1.1-Signed-off-by: Eric Windisch <ewindisch@docker.com > (github: ewindisch)
Upstream-commit: 17d870bed5ef997c30da1e8b9843f4e84202f8d4
Component: engine
2014-07-01 00:30:21 +00:00
413eaeb715
blindly make all uses of e\.?g\.? into e.g.,
...
Docker-DCO-1.1-Signed-off-by: SvenDowideit <SvenDowideit@home.org.au > (github: SvenDowideit)
Upstream-commit: fde10cf87b9f0df6d8aa8683721a6f9d71dda516
Component: engine
2014-07-01 09:55:19 +10:00
7ad4718c9d
Fixed typographical erros in the documentation
...
Used the RETF rules provided by Wikipedia to fix some typographical
errors in the Markdown files of the documentation with the following
script:
https://github.com/openstack/openstack-doc-tools/tree/master/cleanup/retf
Docker-DCO-1.1-Signed-off-by: Christian Berendt <berendt@b1-systems.de > (github: berendt)
Docker-DCO-1.1-Signed-off-by: Christian Berendt <berendt@b1-systems.de > (github: SvenDowideit)
Upstream-commit: b44e13ae023816ed9d36b6dc6d74f089fc402cab
Component: engine
2014-07-01 09:54:20 +10:00
4ca700fb27
Merge pull request #6766 from jamtur01/clirun
...
Formatting and consistency fixes to CLI and RUN references
Upstream-commit: 7128353be5e475c98c1c7454d7344d71ceefc3ea
Component: engine
2014-06-30 08:21:57 -04:00
b4d4865eb8
Merge pull request #6765 from SvenDowideit/pr_out_use_the_official_image_for_now_there_s_an_opensuse_image_on_its_way
...
use the official image for now - there's an opensuse image on its way
Upstream-commit: 8d1cc686735883f099bcacf78cdc7224b4373bff
Component: engine
2014-06-30 20:00:12 +10:00
74e9171bcc
Add the 1.13 API docs to the menu
...
Docker-DCO-1.1-Signed-off-by: SvenDowideit <SvenDowideit@home.org.au > (github: SvenDowideit)
Upstream-commit: 26332fe339d4d939d91fe00a0df849d564026005
Component: engine
2014-06-30 14:19:16 +10:00
866640533b
Merge pull request #6544 from mheon/sigproxy_docs
...
Update --sig-proxy documentation
Upstream-commit: b4df555d27603621eacbcabb19d1db52bc370c86
Component: engine
2014-06-30 13:16:38 +10:00
ee97bfaf79
Formatting and consistency fixes to CLI and RUN references
...
* Removed double backticks.
* Reformatted paragraphs.
* Fixed consistent STDOUT/STDIN/STDERR references.
* Fixed several broken URLs.
* Fixed backtick mismatches.
Docker-DCO-1.1-Signed-off-by: James Turnbull <james@lovedthanlost.net > (github: jamtur01)
Upstream-commit: 8c765ae68a4a9aceb9886f4d92f2ded7af144e22
Component: engine
2014-06-29 22:25:12 -04:00
08986aa647
use the official image for now - there's an opensuse image on its way
...
Docker-DCO-1.1-Signed-off-by: SvenDowideit <SvenDowideit@home.org.au > (github: SvenDowideit)
Upstream-commit: 24bf8faa99ef7c80aca3ee3a6eac485f74e521ef
Component: engine
2014-06-30 11:46:09 +10:00
91e2c5657a
Merge pull request #6631 from SvenDowideit/add-versioning-to-docs-output
...
Add versioning to docs output
Upstream-commit: 0757a5663a704c5ffd1181b438703d9113dc4c8c
Component: engine
2014-06-30 11:38:04 +10:00
a201d5816f
Remove extra "Docker" from docs index
...
Upstream-commit: 3be683a0bbf25f41e9f4b1652f8f0784cafbd05b
Component: engine
2014-06-29 19:45:08 -03:00
88cb9a99d9
Merge pull request #6747 from softprops/master
...
added linkage to tugboat, a scala client library
Upstream-commit: 2075ef029e37d54466a223f68c8837c7b67782c5
Component: engine
2014-06-29 16:21:32 +10:00
5c2debaa25
added linkage to tugboat, a scala client
...
Docker-DCO-1.1-Signed-off-by: Doug Tangren <d.tangren@gmail.com > (github: softprops)
Upstream-commit: 5c0819a0464624eba12b6a37462d549d7fed3be4
Component: engine
2014-06-28 23:21:40 -04: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
67b3725d98
Merge pull request #6741 from fredlf/suse-install-fix
...
Changed add to group command to include -a (append) flag, for safety. In...
Upstream-commit: 4a9dc8d73d3f871f978c9cf19b5d8d646bdc44d5
Component: engine
2014-06-28 10:43:11 +10:00
9af8758aff
Merge pull request #6680 from mheon/cgroup_memory
...
Update docker-run manpage
Upstream-commit: ff206374999966421633a5f20e65e8df22eb2d1b
Component: engine
2014-06-27 14:39:03 -07:00
d6f80e2f4f
Merge pull request #6731 from mchelen/patch-2
...
Update dockerimages.md
Upstream-commit: 018f887fe1346415ea6c1d9259dfd7b2bf131025
Component: engine
2014-06-27 14:37:12 -07:00
3aa7eb85d0
Merge pull request #6678 from mheon/fix_man_generate
...
Path fixes in md2man script and README
Upstream-commit: 74a34bb1fefbb9fd97562910a6cce7324f056be6
Component: engine
2014-06-27 14:29:36 -07:00
a9eca6550a
Changed add to group command to include -a (append) flag, for safety. In response to customer email.
...
Docker-DCO-1.1-Signed-off-by: Fred Lifton <fred.lifton@docker.com > (github: fredlf)
Upstream-commit: 0acec443745a917fb8e97d50609ff01b03888512
Component: engine
2014-06-27 12:45:55 -07:00
