Commit Graph

323 Commits

Author SHA1 Message Date
db8c3bf836 proper rebase
Docker-DCO-1.1-Signed-off-by: Victor Vieux <vieux@docker.com> (github: vieux)
Upstream-commit: fe5ab5b058e33d2d8577f1803448078e8eb92345
Component: engine
2014-07-11 23:27:23 +00:00
91c66dc425 update CLI & api docs
Docker-DCO-1.1-Signed-off-by: Adrien Folie <folie.adrien@gmail.com> (github: folieadrien)
Upstream-commit: 5ba11e6890e51fd01f674160473af3ac432622c5
Component: engine
2014-07-11 23:26:08 +00:00
c1e9ed3e53 Merge pull request #6985 from vieux/fix_api_1.14
bump api to 1.14 & update docs 
Upstream-commit: 00c1668011d26245e73f9faeb5d461a925948b71
Component: engine
2014-07-11 15:35:25 -07:00
1e36ca4638 proper rebase
Docker-DCO-1.1-Signed-off-by: Victor Vieux <vieux@docker.com> (github: vieux)
Upstream-commit: cdfdbe9bc61b157b0390bce26c4d6e41673ad495
Component: engine
2014-07-11 22:39:43 +00:00
c15db86f61 Add --device flag to allow additional host devices in container
We add a --device flag which can be used like:

 docker run --device /dev/sda:/dev/xvda:rwm ubuntu /bin/bash

To allow the container to have read write permissions to access the host's /dev/sda via a node named /dev/xvda in the container.

Note: Much of this code was written by Dinesh Subhraveti dineshs@altiscale.com (github: dineshs-altiscale) and so he deserves a ton of credit.

Docker-DCO-1.1-Signed-off-by: Timothy <timothyhobbs@seznam.cz> (github: timthelion)
Upstream-commit: e855c4b92170534864b920ec1e267b3a815764f9
Component: engine
2014-07-10 10:35:53 -07:00
323df0e24b Fix typos
Docker-DCO-1.1-Signed-off-by: Bryan Bess <squarejaw@bsbess.com> (github: squarejaw)
Upstream-commit: 1df4049e17e4a3edf4487b072f2085bc2dd2ee0b
Component: engine
2014-07-09 23:14:06 -05:00
952492cc20 bump api to 1.14 & update docs
Docker-DCO-1.1-Signed-off-by: Adrien Folie <folie.adrien@gmail.com> (github: folieadrien)
Upstream-commit: 680e27d6ec7662462594fd5264a00c09bcb14da4
Component: engine
2014-07-10 03:24:01 +02:00
34b700c7bf Updated docker logs timestamp to RFC3339
Currently the docker logs timestamp flag generates log entries like:

    $ sudo docker logs -ft daemon_dave
    [May 10 13:06:17.934] hello world

It uses Go's StampMilli timestamp to generate the timestamp. The entry
is also wrapped in [ ].

This is non-standard operational timestamp and one that will require
custom parsing.

The new timestamp is RFC3999Nano and generates entries like:

    2014-05-10T17:42:14.999999999Z07:00 hello world

These are readily parsed by tools like ELK.

Docker-DCO-1.1-Signed-off-by: James Turnbull <james@lovedthanlost.net> (github: jamtur01)

Docker-DCO-1.1-Signed-off-by: Tibor Vass <teabee89@gmail.com> (github: tiborvass)
Upstream-commit: aa0eca03e6662c5f6b4f0f47190a45f49b61e357
Component: engine
2014-07-09 11:59:06 -04:00
e3ec85f712 Merge pull request #6835 from OddBloke/master
Explain ADD invalidation more accurately
Upstream-commit: 037a869919a686cd18c7a5873842f523ff4b492e
Component: engine
2014-07-08 20:41:59 -04:00
16bd2397f1 Merge pull request #6870 from andreaturli/doc/jclouds-client
add jclouds-docker client reference
Upstream-commit: d20367c2164e21035b105a9fe2edd30afc2d6b71
Component: engine
2014-07-08 09:29:27 +10:00
bdbe2e1a2a Merge pull request #6452 from mheon/selinux_btrfs_fix
Error if Docker daemon starts with BTRFS graph driver and SELinux enabled
Upstream-commit: 219a3345deade869a415436c2b5c24c0c523ca08
Component: engine
2014-07-07 11:34:50 -07:00
e2109c74a8 add jclouds-docker client reference
Docker-DCO-1.1-Signed-off-by: Andrea Turli <andrea.turli@gmail.com> (github: andreaturli)

Docker-DCO-1.1-Signed-off-by: Andrea Turli <andrea.turli@gmail.com> (github: )
Upstream-commit: 2f13d3a8e541b918135ea0bf0153f56927dd0511
Component: engine
2014-07-07 15:14:41 +02:00
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
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
8174c1b3a9 Explain ADD invalidation more accurately
And also move it in to the `ADD` section, rather than being hidden in the `RUN` section.

Docker-DCO-1.1-Signed-off-by: Daniel Watkins <daniel@daniel-watkins.co.uk> (github: OddBloke)
Upstream-commit: 20a77aeeb8855ca0189fe9e3292d92b165b08905
Component: engine
2014-07-04 16:40:23 +01: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
9b1af46554 Error if Docker daemon starts with BTRFS graph driver and SELinux enabled
The Docker btrfs graph driver does not interact well with SELinux at present.
If btrfs mounts the same file in several locations, the same SELinux label will
be applied to all mountpoints. In the context of the graph driver, things such
as shared libraries become inaccessible to containers due to SELInux, causing
all dynamically linked applications to fail when run in a container.

Consequently, error when we detect the daemon is being run with SELinux enabled
and the btrfs driver. Documentation has been added for this behavior.

Docker-DCO-1.1-Signed-off-by: Matthew Heon <mheon@redhat.com> (github: mheon)
Upstream-commit: 4318802f645cdd4fa63a894160f153a69a97af59
Component: engine
2014-07-03 08:11:18 -04: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
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
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
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
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
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
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
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
3090f44756 Merge pull request #6579 from vieux/dockerignore
Rebased Dockerignore
Upstream-commit: 6e3fe9314801baf9e4d162619fabfca5b61456fa
Component: engine
2014-06-26 21:00:43 -04:00
7af08aef44 Merge pull request #6683 from vieux/add_links_inspect
add links to inspect for 'linking' containers
Upstream-commit: e35a9a7def6113ffff2c624142ef194abfa7e916
Component: engine
2014-06-26 17:33:02 -07:00
1d3a6ac762 add doc
Docker-DCO-1.1-Signed-off-by: Victor Vieux <vieux@docker.com> (github: vieux)
Upstream-commit: 250b0d070c7d8fce3d75bafc02c31ab3e356ba2e
Component: engine
2014-06-26 23:36:29 +00:00
a23ad7fc08 Add .dockerignore support
Fixes #2224

Docker-DCO-1.1-Signed-off-by: Travis Cline <travis.cline@gmail.com> (github: tmc)
Upstream-commit: 9189db3aff3e9d72b215b5e204cfac018b2acc5d
Component: engine
2014-06-26 22:49:08 +00:00
10316c12ae Merge pull request #6640 from ostezer/commands.go-linguistics-1
docker help -> grammatical correction (pos. adj. apost.)
Upstream-commit: 56a0f49dcc3ef134abc9a05723c961233f6242b0
Component: engine
2014-06-26 11:59:49 -07:00
befb61a0bc Anglicanisms: Grammatical correction (pos. adj. apost.)
Docker-DCO-1.1-Signed-off-by: O.S. Tezer <ostezer@gmail.com> (github: ostezer)
Upstream-commit: 714c1bd8ca49c6fc5e7939d6a7abf6a54d56b06a
Component: engine
2014-06-26 08:41:58 +01:00
51f8aff176 Add the missing paren to the documentation for docker commit too
Docker-DCO-1.1-Signed-off-by: Sven Dowideit <SvenDowideit@docker.com> (github: SvenDowideit)
Upstream-commit: 389916bf9ae62ded0e497512da22faba75d0cf2d
Component: engine
2014-06-26 11:06:45 +10:00
f6a0457a3f Merge pull request #6649 from vieux/fix_api_return_codes_start_stop
return 304 is status isn't modified in start and stop
Upstream-commit: 5743151118d5b6965f573743ecaddf72792df034
Component: engine
2014-06-25 19:10:19 -04:00
a8f5e76a89 Update documentation noting that SIGCHLD is not proxied.
Docker's --sig-proxy option sends all signals but one to a container. The
exception s SIGCHLD, which is deliberately ignored as it doesn't make sense to
send such a signal to a process in a container. Documentation updates will make
this less confusing if anyone does attempt to do this.

Docker-DCO-1.1-Signed-off-by: Matt Heon <mheon@redhat.com> (github: mheon)
Upstream-commit: be4f4599a6d2a517e615dc1f64527a3f2ad2f683
Component: engine
2014-06-25 09:08:02 -04:00
f728e9c8d0 Document the pause and unpause commands available on API v1.12 onwards
Docker-DCO-1.1-Signed-off-by: Abel Muiño <amuino@gmail.com> (github: amuino)
Upstream-commit: 901a47daff63a4a7f22cbe556741081334c76572
Component: engine
2014-06-25 00:41:57 +02:00
986327e6e1 return 304 is status isn't modified in start and stop
Docker-DCO-1.1-Signed-off-by: Victor Vieux <vieux@docker.com> (github: vieux)
Upstream-commit: 53b036032d783c0a05362ef5722e2c55af503bb1
Component: engine
2014-06-24 18:31:56 +00:00
4369605adb move api docs to APIv1.13
Docker-DCO-1.1-Signed-off-by: SvenDowideit <SvenDowideit@home.org.au> (github: SvenDowideit)
Upstream-commit: cf513185b0803ac02bbd8cef05e3372e7fc3b269
Component: engine
2014-06-24 12:25:18 +10:00
90c80009e3 Add Sockets (-H) list to docker -D info.
This will allow us to _know_ what the user's -H settings are, which may
be useful for debugging later.

Docker-DCO-1.1-Signed-off-by: Sven Dowideit <SvenDowideit@fosiki.com> (github: SvenDowideit)
Upstream-commit: f54823bf05af1d549aee4f0d1f56f9a8995eb268
Component: engine
2014-06-24 12:25:17 +10:00
04e0cbb118 Merge pull request #6624 from jezenielzapanta/patch-1
Fix typo in the docs.
Upstream-commit: 664ba0c0315770b6a6608ee308d46b4b8fb82e76
Component: engine
2014-06-23 19:20:20 -07:00
794a8c5ccb api/client/build: allow tar as context for docker build -
Docker-DCO-1.1-Signed-off-by: Johan Euphrosine <proppy@google.com> (github: proppy)
Upstream-commit: edcb41451aa388abe03d4f837ab5ee316a53a030
Component: engine
2014-06-23 13:34:09 -07:00
87588f265b Fix typo in the docs.
Fix a minor typographical error inside `run.md`.
Upstream-commit: cf6834d797627208a9ec34326a85d594cdf1c918
Component: engine
2014-06-24 03:26:22 +08:00
3557053e47 Merge pull request #6532 from jonboulle/fix_capitals
be consistent in capitalization of Docker
Upstream-commit: 62b2b1bac3f44adb1281e134ecaa8ebcd09ffaf6
Component: engine
2014-06-23 11:14:27 -07:00