Commit Graph

4151 Commits

Author SHA1 Message Date
moxiegirl
bfc785bf64 Merge pull request #16428 from charleswhchan/fix-logs-doc
Touch up 'docker logs' documentation.
2015-09-22 07:17:26 -07:00
Charles Chan
eff524e19c Touch up 'docker logs' documentation.
* Update format for 'Note:' to match other pages.
* Add link to Go's RFC3339Nano timestamp information.

Signed-off-by: Charles Chan <charleswhchan@users.noreply.github.com>
2015-09-21 19:47:33 -07:00
Tibor Vass
985b7ec895 Merge pull request #16465 from albers/reference-capability-all
reference: capability `all` should be `ALL`
2015-09-21 16:49:17 -04:00
Harald Albers
d37674b44b reference: capability all should be ALL
Signed-off-by: Harald Albers <github@albersweb.de>
2015-09-21 21:09:50 +02:00
Alexandre Beslic
40edb5f97c Merge pull request #15029 from azurezk/add-version-info
Add docker version info in /info request
2015-09-21 11:44:11 -07:00
moxiegirl
f018c0430b Merge pull request #16449 from runcom/add-container-label-userguide
docs: userguide: add container labels section
2015-09-21 10:26:20 -07:00
Zhang Kun
7cf343d106 add docker server version to /info
Signed-off-by: Zhang Kun <zkazure@gmail.com>
2015-09-21 21:15:32 +08:00
Antonio Murdaca
124540c086 docs: userguide: add container labels section
Signed-off-by: Antonio Murdaca <runcom@linux.com>
2015-09-21 14:41:22 +02:00
David Calavera
4a6e8c8f3c Merge pull request #16174 from sallyom/man-restart-fix
docker restarts running OR stopped containers
2015-09-20 18:10:06 -07:00
moxiegirl
4133401bf9 Merge pull request #16425 from charleswhchan/fix-version-doc
Add missing '[OPTIONS]' arg to documentation for 'docker version'.
2015-09-20 14:33:47 -07:00
Sally O'Malley
e41753678d docker restarts running OR stopped containers, docs edit rm "running"
Signed-off-by: Sally O'Malley <somalley@redhat.com>
2015-09-20 09:16:27 -04:00
Charles Chan
8d6796f8c6 Add missing '[OPTIONS]' arg to documentation for 'docker version'.
Signed-off-by: Charles Chan <charleswhchan@users.noreply.github.com>
2015-09-19 08:53:11 -07:00
Yuan Sun
76c96da487 Add timeout description.
It is almost impossible to take serveral minutes to complete all the
test.

Signed-off-by: Yuan Sun <sunyuan3@huawei.com>
2015-09-19 10:24:16 +08:00
David Calavera
e61abac5fa Merge pull request #16349 from cpuguy83/16302_deprecate_autocreate_binds
deprecate bind path auto-create
2015-09-18 12:53:06 -07:00
Vincent Batts
4026512a2c events/jsonmessage: add and prefer TimeNano for events
This way provide both Time and TimeNano in the event. For the display of
the JSONMessage, use either, but prefer TimeNano Proving only TimeNano
would break Subscribers that are using the `Time` field, so both are set
for backwards compatibility.

The events logging uses nano formatting, but only provides a Unix()
time, therefor ordering may get lost in the output. Example:
```
2015-09-15T14:18:51.000000000-04:00 ee46febd64ac629f7de9cd8bf58582e6f263d97ff46896adc5b508db804682da: (from busybox) resize
2015-09-15T14:18:51.000000000-04:00 a78c9149b1c0474502a117efaa814541926c2ae6ec3c76607e1c931b84c3a44b: (from busybox) resize
```

By having a field just for Nano time, when set, the marshalling back to
`time.Unix(sec int64, nsec int64)` has zeros exactly where it needs to.
This does not break any existing use of jsonmessage.JSONMessage, but now
allows for use of `UnixNano()` and get event formatting that has
distinguishable order. Example:
```
2015-09-15T15:37:23.810295632-04:00 6adcf8ed9f5f5ec059a915466cd1cde86a18b4a085fc3af405e9cc9fecbbbbaf: (from busybox) resize
2015-09-15T15:37:23.810412202-04:00 6b7c5bfdc3f902096f5a91e628f21bd4b56e32590c5b4b97044aafc005ddcb0d: (from busybox) resize
```

Including tests for TimeNano and updated event API reference doc.

Signed-off-by: Vincent Batts <vbatts@redhat.com>
2015-09-18 13:15:26 -04:00
Brian Goff
249f45bcfe deprecate bind path auto-create
Signed-off-by: Brian Goff <cpuguy83@gmail.com>
2015-09-18 10:28:38 -04:00
moxiegirl
d2e7ba42b1 Merge pull request #15327 from flavio/update-suse-docs
Update SUSE docs
2015-09-17 16:46:26 -07:00
Jess Frazelle
4702d45599 Merge pull request #16271 from runcom/deprecate-cli-opts
Deprecate -c cli short variant flag in docker run
2015-09-17 11:52:59 -07:00
Yuan Sun
5e7895ee21 from make file to Makefile
Signed-off-by: Yuan Sun <sunyuan3@huawei.com>
2015-09-17 15:37:50 +00:00
Antonio Murdaca
e5a26ec081 Deprecate -c cli short variant flag in docker run
Signed-off-by: Antonio Murdaca <runcom@linux.com>
2015-09-17 15:48:48 +02:00
Tibor Vass
1ffff4c8e2 Merge pull request #15182 from mapuri/build-arg
Support for passing build-time variables in build context
2015-09-16 23:52:37 -04:00
Brian Goff
4dfa996cc2 Merge pull request #15384 from phil-monroe/15058-include-name-in-syslog-tag
log driver - Interpolate fields into log tag
2015-09-16 23:33:34 -04:00
Sebastiaan van Stijn
3394fedf32 Merge pull request #16269 from moxiegirl/fixes-15790
Clarifying use of flag
2015-09-17 00:23:25 +02:00
Philip Monroe
3be7146e14 log driver - add ability to interpolate container context into the log tag field
Signed-off-by: Philip Monroe <phil@philmonroe.com>
2015-09-16 15:19:28 -07:00
Tim Hockin
3d4685e258 Add support for DNS options
Signed-off-by: Tim Hockin <thockin@google.com>
2015-09-16 14:06:45 -07:00
Sebastiaan van Stijn
259a0fb16c Merge pull request #15786 from HuKeping/stats-network
Refactor the statistics of network in docker stats
2015-09-16 20:29:16 +02:00
Mary Anthony
a2f545c86d Clarifying use of flag
Updating with Seb's comments
Updating with comments from review

Signed-off-by: Mary Anthony <mary@docker.com>
2015-09-16 11:22:40 -07:00
David Calavera
60db152b20 Merge pull request #16292 from tpounds/fix-doc-typo
Fix minor documentation typo.
2015-09-16 11:18:17 -07:00
Jessica Frazelle
50d7fba775 Revert "Make daemon to start with no userlandproxy by default"
This reverts commit bf2b8ec816.

Signed-off-by: Jessica Frazelle <acidburn@docker.com>
2015-09-16 09:56:38 -07:00
Madhav Puri
8cfcd87380 incorporate doc review comments
Signed-off-by: Madhav Puri <madhav.puri@gmail.com>
2015-09-16 03:31:15 -07:00
Madhav Puri
54240f8da9 Support for passing build-time variables in build context
- The build-time variables are passed as environment-context for command(s)
run as part of the RUN primitve. These variables are not persisted in environment of
intermediate and final images when passed as context for RUN. The build environment
is prepended to the intermediate continer's command string for aiding cache lookups.
It also helps with build traceability. But this also makes the feature less secure from
point of view of passing build time secrets.

- The build-time variables also get used to expand the symbols used in certain
Dockerfile primitves like ADD, COPY, USER etc, without an explicit prior definiton using a
ENV primitive. These variables get persisted in the intermediate and final images
whenever they are expanded.

- The build-time variables are only expanded or passed to the RUN primtive if they
are defined in Dockerfile using the ARG primitive or belong to list of built-in variables.
HTTP_PROXY, HTTPS_PROXY, http_proxy, https_proxy, FTP_PROXY and NO_PROXY are built-in
variables that needn't be explicitly defined in Dockerfile to use this feature.

Signed-off-by: Madhav Puri <madhav.puri@gmail.com>
2015-09-16 03:31:15 -07:00
Mike Brown
96699e06dd updates to readme documents for manual page
Signed-off-by: Mike Brown <brownwm@us.ibm.com>
2015-09-15 12:08:02 -05:00
Flavio Castelli
5d6bb52976 Update SUSE docs
Clarify some parts of the document, add extra resources link.

Signed-off-by: Flavio Castelli <fcastelli@suse.com>
2015-09-15 14:46:46 +02:00
Hu Keping
d3379946ec Refactor the statistics of network in docker stats
For now docker stats will sum the rxbytes, txbytes, etc. of all
the interfaces.

It is OK for the output of CLI `docker stats` but not good for
the API response, especially when the container is in sereval
subnets.

It's better to leave these origianl data to user.

Signed-off-by: Hu Keping <hukeping@huawei.com>
2015-09-15 15:40:34 +08:00
Trevor Pounds
2eedaf0389 Fix minor documentation typo.
Signed-off-by: Trevor Pounds <trevor.pounds@gmail.com>
2015-09-14 17:08:04 -07:00
Sebastiaan van Stijn
084f8060e2 Merge pull request #16274 from opreaadrian/rest-api-documentation-syntax-error
Rest api documentation syntax error
2015-09-14 19:40:59 +02:00
moxiegirl
621143a641 Merge pull request #16253 from AmeBel/update-documentation-on-run
add a documentation note on backslash usage in shell form of RUN
2015-09-14 06:32:20 -07:00
Amen Belayneh
30164588d6 update documentation styling as per suggestions
Signed-off-by: Amen Belayneh <amenbelayneh@gmail.com>
2015-09-14 19:08:27 +08:00
Adrian Oprea
18d856f55a Fix typos in REST API documentation
Replace comma with column
Remove extra curly brace

Fix typo in REST API documentation

Replace comma with column in documentation.

Signed-off-by: Adrian Oprea <adrian@codesi.nz>

Remove extra curly brace

Remove extra curly brace from remote API docs.

Signed-off-by: Adrian Oprea <adrian@codesi.nz>
2015-09-14 11:18:41 +03:00
Sven Dowideit
21cc0ac2c6 Merge pull request #16241 from jaxgeller/fix-installation-docs
fix typo and cleanup docs for installation.
2015-09-14 09:23:33 +10:00
Charles Chan
6b16c154f5 Fix Ubuntu instalation doc.
Formatting, break `sudo ...` command into 2 lines.

Signed-off-by: Charles Chan <charleswhchan@users.noreply.github.com>
2015-09-13 13:29:50 -07:00
Amen Belayneh
6a55d95334 add a documentation note on backslash usage in shell form of RUN
Signed-off-by: Amen Belayneh <amenbelayneh@gmail.com>
2015-09-12 15:42:18 +08:00
Sebastiaan van Stijn
9d0954a83d Merge pull request #16100 from ZJU-SEL/fix-document-about-vol
fix doc about vol
2015-09-12 02:50:49 +02:00
Nalin Dahyabhai
e611a189cb Add log reading to the journald log driver
If a logdriver doesn't register a callback function to validate log
options, it won't be usable.  Fix the journald driver by adding a dummy
validator.

Teach the client and the daemon's "logs" logic that the server can also
supply "logs" data via the "journald" driver.  Update documentation and
tests that depend on error messages.

Add support for reading log data from the systemd journal to the
journald log driver.  The internal logic uses a goroutine to scan the
journal for matching entries after any specified cutoff time, formats
the messages from those entries as JSONLog messages, and stuffs the
results down a pipe whose reading end we hand back to the caller.

If we are missing any of the 'linux', 'cgo', or 'journald' build tags,
however, we don't implement a reader, so the 'logs' endpoint will still
return an error.

Make the necessary changes to the build setup to ensure that support for
reading container logs from the systemd journal is built.

Rename the Jmap member of the journald logdriver's struct to "vars" to
make it non-public, and to make it easier to tell that it's just there
to hold additional variable values that we want journald to record along
with log data that we're sending to it.

In the client, don't assume that we know which logdrivers the server
implements, and remove the check that looks at the server.  It's
redundant because the server already knows, and the check also makes
using older clients with newer servers (which may have new logdrivers in
them) unnecessarily hard.

When we try to "logs" and have to report that the container's logdriver
doesn't support reading, send the error message through the
might-be-a-multiplexer so that clients which are expecting multiplexed
data will be able to properly display the error, instead of tripping
over the data and printing a less helpful "Unrecognized input header"
error.

Signed-off-by: Nalin Dahyabhai <nalin@redhat.com> (github: nalind)
2015-09-11 16:50:03 -04:00
Jana Radhakrishnan
bf2b8ec816 Make daemon to start with no userlandproxy by default
This PR makes a user visible behavior change with userland
proxy disabled by default and rely on hairpin NAT to be enabled
by default. This may not work in older (unsupported) kernels
where the user will be forced to enable userlandproxy if needed.

      - Updated the Docs
      - Changed the integration-cli to start with userlandproxy
	desiabled by default.

Signed-off-by: Jana Radhakrishnan <mrjana@docker.com>
2015-09-11 11:58:35 -07:00
jaxgeller
9746021f1a fix typo and cleanup docs for installation.
Signed-off-by: Jackson Geller <jacksongeller@gmail.com>
2015-09-11 13:06:54 -04:00
xlgao-zju
af14c6e7aa fix doc about vol
Signed-off-by: xlgao-zju <xlgao@zju.edu.cn>
2015-09-11 10:49:39 +08:00
David Calavera
3781cde61f Add STOPSIGNAL instruction to dockerfiles.
This way, images creators can set the exit signal their programs use.

Signed-off-by: David Calavera <david.calavera@gmail.com>
2015-09-10 19:56:05 -04:00
David Calavera
0e50d946a2 Signal to stop a container.
Allow to set the signal to stop a container in `docker run`:
- Use `--stop-signal` with docker-run to set the default signal the container will use to exit.

Signed-off-by: David Calavera <david.calavera@gmail.com>
2015-09-10 19:56:05 -04:00
Rozhnov Alexandr
e9e68fa2d2 Added tags list to /images/:id/json api.
It closes #10139.

Signed-off-by: Rozhnov Alexandr <nox73@ya.ru>
2015-09-10 11:55:01 +03:00