Commit graph

18276 commits

Author SHA1 Message Date
David Calavera
fedecb8c91 Merge pull request #16276 from Mashimiao/typo-fix-opts-split
opts/opts.go: fix typo
2015-09-14 13:12:16 -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
David Calavera
d25dada639 Merge pull request #15886 from xiekeyang/master
Fix: Docker Daemon didn't send actual actions client ask for to Token Server
2015-09-14 09:47:19 -07: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
Ma Shimiao
185544a4fe opts/opts.go: fix typo
Signed-off-by: Ma Shimiao <mashimiao.fnst@cn.fujitsu.com>
2015-09-14 14:48:09 +08:00
Phil Estes
dac92a8afb Merge pull request #16244 from calavera/libcontainer_0_0_4
Vendor libcontainer v0.0.4
2015-09-13 22:24:44 -04: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
Sebastiaan van Stijn
25eb101624 Merge pull request #16268 from charleswhchan/fix-ubuntu-doc
Fix Ubuntu instalation doc.
2015-09-14 00:11:16 +02: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
Doug Davis
611dbd8957 Merge pull request #16254 from dgageot/patch-5
Fix typo in ROADMAP.md
2015-09-12 06:15:00 -04:00
David Gageot
02e18c9ab3 Fix typo in ROADMAP.md
Signed-off-by: David Gageot <david@gageot.net>
2015-09-12 11:27:46 +02: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
Alexander Morozov
7fc4566c9d Merge pull request #13707 from nalind/journald-logs
Implement the "logs" endpoint for the journald log driver
2015-09-11 14:38:33 -07: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
David Calavera
6f15546f6b Merge pull request #16231 from jfrazelle/vendor-test-deps
allow vendoring of test packages
2015-09-11 13:47:03 -07:00
David Calavera
55a601e3f1 Vendor libcontainer v0.0.4
Noteworthy changes:

- Add Prestart/Poststop hook support
- Fix bug finding cgroup mount directory
- Add OomScoreAdj as a container configuration option
- Ensure the cleanup jobs in the deferrer are executed on error
- Don't make modifications to /dev when it is bind mounted

Other changes in runc:

https://github.com/opencontainers/runc/compare/v0.0.3...v0.0.4

Signed-off-by: David Calavera <david.calavera@gmail.com>
2015-09-11 16:17:59 -04:00
Jess Frazelle
9fbef808c1 Merge pull request #16243 from LK4D4/fix_import
awslogs: fix logrus import
2015-09-11 12:46:57 -07:00
Jess Frazelle
c044dadade Merge pull request #15955 from aaronlehmann/parallel-pull-race-2
Fix race condition when waiting for a concurrent layer pull
2015-09-11 12:45:25 -07:00
Jess Frazelle
f9320690d9 Merge pull request #14973 from mrjana/up
Make daemon to start with no userlandproxy by default
2015-09-11 12:39:04 -07: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
Alexander Morozov
32964def83 awslogs: fix logrus import
Signed-off-by: Alexander Morozov <lk4d4@docker.com>
2015-09-11 11:05:06 -07:00
Jess Frazelle
ec6d91ce43 Merge pull request #16240 from Microsoft/10662-stopsignal
Windows: Nice error on stopsignal
2015-09-11 11:00:12 -07:00
Aaron Lehmann
4a5d40fdb7 Make Broadcaster Wait function wait for all writers to finish before returning
Also, use the channel to determine if the broadcaster is closed,
removing the redundant isClosed variable.

Signed-off-by: Aaron Lehmann <aaron.lehmann@docker.com>
2015-09-11 10:54:40 -07:00
Aaron Lehmann
50c355777e Remove io.Pipe used for download progress
The original purpose of this was to cancel downloads if pullV2Tag
returns an error, preventing an associated crash (see #15353). The
broadcaster now accomplishes the same thing that the pipe does, making
the pipe redundant. When pullV2Tag returns, all broadcasters are closed,
which means all further writes to those broadcasters will return errors.

Signed-off-by: Aaron Lehmann <aaron.lehmann@docker.com>
2015-09-11 10:54:40 -07:00
Aaron Lehmann
64faec8269 Fix races accessing d.poolKey and d.tmpFile when pullV2Tag returns
Signed-off-by: Aaron Lehmann <aaron.lehmann@docker.com>
2015-09-11 10:54:35 -07:00
Brian Goff
bc48194ded Merge pull request #16215 from HuKeping/save
Refactor CLI docker save
2015-09-11 13:52:59 -04:00
Aaron Lehmann
23e68679f0 Fix race condition when waiting for a concurrent layer pull
Before, this only waited for the download to complete. There was no
guarantee that the layer had been registered in the graph and was ready
use. This is especially problematic with v2 pulls, which wait for all
downloads before extracting layers.

Change Broadcaster to allow an error value to be propagated from Close
to the waiters.

Make the wait stop when the extraction is finished, rather than just the
download.

This also fixes v2 layer downloads to prefix the pool key with "layer:"
instead of "img:". "img:" is the wrong prefix, because this is what v1
uses for entire images. A v1 pull waiting for one of these operations to
finish would only wait for that particular layer, not all its
dependencies.

Signed-off-by: Aaron Lehmann <aaron.lehmann@docker.com>
2015-09-11 10:52:34 -07:00
Tianon Gravi
f9e5a693ed Merge pull request #16194 from yosifkit/fix-nuke
Fix nuke script
2015-09-11 10:26:22 -07:00
Jess Frazelle
335689118b Merge pull request #16026 from vdemeester/integration-cli-utils-tests
Add unit tests for integration cli utils.go functions
2015-09-11 10:21:09 -07:00
Jess Frazelle
dc1cc46348 Merge pull request #16224 from jfrazelle/no-release-dirty
do not allow the release of a dirty binary
2015-09-11 10:08:55 -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
John Howard
8de7fcaf7e Windows: Nice error on stopsignal
Signed-off-by: John Howard <jhoward@microsoft.com>
2015-09-11 09:40:23 -07:00
David Calavera
db54c79d7c Merge pull request #15307 from calavera/stop_signal
Signal to stop a container.
2015-09-11 09:25:18 -07:00
Hu Keping
22be1e443f Refactor CLI docker save
Signed-off-by: Hu Keping <hukeping@huawei.com>
2015-09-11 15:31:55 +08:00
Brian Goff
7064fe283f Merge pull request #16226 from aaronlehmann/broadcaster-catch-up
Broadcaster writer goroutines must only finish when they are caught up
2015-09-10 22:55:44 -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
Jessica Frazelle
1ca88b2ca6 allow vendoring of test packages
Signed-off-by: Jessica Frazelle <acidburn@docker.com>
2015-09-10 19:21:46 -07: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
David Calavera
bb1996ab8f Merge pull request #13185 from NOX73/10139-tags-list-get-image-api
Added tags list to /images/:id/json api.
2015-09-10 16:40:44 -07:00
Aaron Lehmann
947519bfb3 Broadcaster writer goroutines must only finish when they are caught up
Without this change, there was a narrow race condition that would allow
writers to finish when there was still data left to write. This is
likely to be what was causing some integration tests to fail with
truncated pull output.

Signed-off-by: Aaron Lehmann <aaron.lehmann@docker.com>
2015-09-10 14:58:06 -07:00
Jessica Frazelle
b18d664692 do not allow the release of a dirty binary
Signed-off-by: Jessica Frazelle <acidburn@docker.com>
2015-09-10 12:28:09 -07:00
David Calavera
65e43593f5 Merge pull request #16191 from runcom/daemon-remove-unused-function-params
daemon: remove unused function params
2015-09-10 10:23:52 -07:00
Brian Goff
c8dc729af4 Merge pull request #16086 from cezarsa/full_stack_dump
Ensure goroutines dump is not truncated
2015-09-10 11:16:28 -04:00
Brian Goff
08a2e475bc Merge pull request #16104 from vdemeester/httputils-withmock
Update httputils tests
2015-09-10 11:00:17 -04:00
Doug Davis
727f083a37 Merge pull request #16213 from HuKeping/minor
Minor typo
2015-09-10 09:55:49 -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