Shuwei Hao
e719c9225c
Modufy docker inspect client to check statusCode instead of strings contains
...
Signed-off-by: Shuwei Hao <haosw@cn.ibm.com>
2015-12-07 10:03:46 +00:00
Zhang Wei
8edb941b79
Better error message for network connect
...
Use better error message when user want to connect container with same
name to one network, this can help avoid confusion.
Signed-off-by: Zhang Wei <zhangwei555@huawei.com>
2015-12-07 17:39:13 +08:00
Sebastiaan van Stijn
91657008f2
Merge pull request #18458 from vdemeester/fix-volume-test
...
Fix DockerSuite.TestVolumeCliInspectMulti
2015-12-07 10:26:18 +01:00
Harald Albers
d7c9ae60e6
Improve bash completion for `docker network disconnect`
...
Signed-off-by: Harald Albers <github@albersweb.de>
2015-12-07 09:55:00 +01:00
Vincent Demeester
d125ddaeda
Fix DockerSuite.TestVolumeCliInspectMulti
...
Use dockerCmdWithError now that it actually returns an error code.
Signed-off-by: Vincent Demeester <vincent@sbr.pm>
2015-12-07 08:34:18 +01:00
James Turnbull
78d8df73b5
Merge pull request #18460 from thaJeztah/fix-pull-by-digest
...
docs: fix pull by digest example
2015-12-06 18:08:51 -06:00
Sebastiaan van Stijn
f27572312f
Fix pull by digest example
...
Also reduced the column spacing in the output, so
that more output is visible in the documentation.
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2015-12-07 00:58:46 +01:00
John Howard
c07e79fa8a
Windows CI Fix: Allow bash v4
...
Signed-off-by: John Howard <jhoward@microsoft.com>
2015-12-06 14:40:29 -08:00
James Turnbull
6b8d8bfbf8
Merge pull request #18454 from dcylabs/master
...
added albatros library
2015-12-06 15:01:55 -06:00
dcylabs
a94bede2aa
added albatros library
...
Signed-off-by: dcylabs <dcylabs@gmail.com>
2015-12-06 20:40:42 +01:00
Sebastiaan van Stijn
715f6a135c
Merge pull request #17741 from dhiltgen/pull_token
...
Add token pass-thru for AuthConfig
2015-12-06 16:40:06 +01:00
Vincent Demeester
32f08e06e6
Merge pull request #18349 from mrfuxi/cli-specific-errors-in-api
...
Remove CLI specific information for API error messages. Issue #17147
2015-12-06 16:02:40 +01:00
Sebastiaan van Stijn
5b4734aaa5
Merge pull request #17788 from haoshuwei/modify-volume-inspect-multi
...
Modify docker volume inspect to return existed volumes and the names of the unexsited volumes
2015-12-06 14:03:46 +01:00
Jess Frazelle
b98577af83
Merge pull request #18446 from LK4D4/vendor_pkg_dockerignore
...
Add vendor/pkg to .dockerignore
2015-12-05 10:06:52 -08:00
Jess Frazelle
87a614ed55
Merge pull request #17989 from jfrazelle/initial-seccomp-support
...
Phase 1: Initial seccomp support
2015-12-05 08:33:58 -08:00
Doug Davis
540c607972
Merge pull request #18450 from runcom/typo-ocd
...
integration-cli: fix test name typo
2015-12-05 09:15:51 -05:00
Antonio Murdaca
09c4643ce1
integration-cli: fix test name typo
...
Signed-off-by: Antonio Murdaca <runcom@redhat.com>
2015-12-05 11:42:46 +01:00
Lei Jitang
a2d348968f
pkg/plugins/client.go: don't try to encode os decode if it's nil
...
When user call the `Call()` method, they don't always want to sent
some args or get the return value, so they use `nil` when call `Call()`
method and this will casue an error. It's better to not trying to
encode or decode if it's nil.
Signed-off-by: Lei Jitang <leijitang@huawei.com>
2015-12-05 02:55:50 -05:00
Alexander Morozov
9c8d6edbf1
Add vendor/pkg to .dockerignore
...
It's in .gitignore too, so why not
Signed-off-by: Alexander Morozov <lk4d4@docker.com>
2015-12-04 17:03:24 -08:00
David Calavera
82c47088db
Merge pull request #18418 from aaronlehmann/no-head-requests
...
Avoid a HEAD request for each layer in a v2 pull
2015-12-04 14:51:54 -08:00
David Calavera
a4817b8b21
Merge pull request #18443 from tonistiigi/fix-images-delete
...
Fix image deletion conflicts with search
2015-12-04 14:49:18 -08:00
Tonis Tiigi
fcb083c6ac
Fix image deletion conflicts with search
...
Removed images were not cleaned up from the
digest-set that is used for the search index.
Fixes #18437
Signed-off-by: Tonis Tiigi <tonistiigi@gmail.com>
2015-12-04 13:15:54 -08:00
Alexander Morozov
23f00624a1
Merge pull request #18408 from tonistiigi/disable-systemd-timeout
...
Disable timeout for systemd
2015-12-04 12:34:19 -08:00
Jess Frazelle
a56f258c8a
Merge pull request #18436 from estesp/fix-initlayer-perms
...
Fix init layer chown of existing dir ownership
2015-12-04 11:53:09 -08:00
Phil Estes
51b0f23127
Merge pull request #18398 from calavera/system_backend
...
Move docker system information to a dedicated router and backend.
2015-12-04 12:56:57 -05:00
Aaron Lehmann
39589800b4
Avoid a HEAD request for each layer in a v2 pull
...
We were calling Stat for each layer to get the size so we could indicate
progress, but https://github.com/docker/distribution/pull/1226 made it
possible to get the length from the GET request that Open initiates.
Saving one round-trip per layer should make pull operations slightly
faster and more robust.
Signed-off-by: Aaron Lehmann <aaron.lehmann@docker.com>
2015-12-04 09:32:16 -08:00
Jess Frazelle
e29f208547
Merge pull request #18404 from jfrazelle/cleanup-maintainers
...
cleanup people in maintainers file
2015-12-04 09:25:43 -08:00
Phil Estes
23b771782a
Fix init layer chown of existing dir ownership
...
This solves a bug where /etc may have pre-existing permissions from
build time, but init layer setup (reworked for user namespaces) was
assuming root ownership. Adds a test as well to catch this situation in
the future.
Minor fix to wrong ordering of chown/close on files created during the
same initlayer setup.
Docker-DCO-1.1-Signed-off-by: Phil Estes <estesp@linux.vnet.ibm.com> (github: estesp)
2015-12-04 12:18:05 -05:00
André Martins
6eef5ab42d
Fixed 80-docker.rules file permissions to 644
...
Signed-off-by: André Martins <aanm90@gmail.com>
2015-12-04 15:31:44 +00:00
Sebastiaan van Stijn
5a9bf3a3d3
Merge pull request #18434 from haugene/master
...
docs: fix typo in bash_history mount example
2015-12-04 16:15:36 +01:00
Kristian Haugene
655766ed95
docs: fix typo in bash_history mount example
...
Signed-off-by: Kristian Haugene <kristian.haugene@capgemini.com>
2015-12-04 16:09:25 +01:00
Sebastiaan van Stijn
e3fbd6922f
Merge pull request #18325 from RsrchBoy/topic/newtorks
...
newtork -> network (minor spelling correction)
2015-12-04 14:03:55 +01:00
Sebastiaan van Stijn
c60c0c4e9b
docs: markdown and textual fixups in reference/run.md
...
This fixes markdown formatting, and formatting of tables;
- Our markdown engine doesn't support spanning rows, so
re-wrapped table contents.
- Added a CSS-styles to prevent "code" blocks in tables
from wrapping
- The "logging drivers" table didn't have a header
- Aligned table borders in source code for better readability.
- Standardize on using `-it` in stead of -i -t or -ti
- Some markup issues
- Some minor textual fixups
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2015-12-04 13:46:22 +01:00
Sebastiaan van Stijn
cb6a1a6042
Merge pull request #14466 from Mashimiao/add-support-blkio_throtte_bps
...
Add support for blkio read/write bps device
2015-12-04 12:29:58 +01:00
Sebastiaan van Stijn
605c56295f
Merge pull request #18384 from Mashimiao/weight-device-docs-fix
...
docs: fix blkio-weight-device option args
2015-12-04 12:04:23 +01:00
Wen Cheng Ma
c424c8c32c
Correct the message of ErrorCodeNoSuchContainer to "No such container"
...
Fixes issue #18424
Signed-off-by: Wen Cheng Ma <wenchma@cn.ibm.com>
2015-12-04 15:00:08 +08:00
Alexander Morozov
7c1c96551d
Merge pull request #18412 from aaronlehmann/runcommand-race
...
Fix race in RunCommandWithOutputForDuration
2015-12-03 19:35:04 -08:00
Jess Frazelle
a65502f751
Merge pull request #18413 from jfrazelle/update-go-version
...
update go version
2015-12-03 18:18:47 -08:00
Doug Davis
c80d03db77
Merge pull request #18409 from tonistiigi/fix-sha-prefix-inspect
...
Vendor distribution and fix inspect by sha256 prefix
2015-12-03 20:59:47 -05:00
Ma Shimiao
cc0e407e17
docs: fix weight-deivce option args
...
Signed-off-by: Ma Shimiao <mashimiao.fnst@cn.fujitsu.com>
2015-12-04 09:28:35 +08:00
Ma Shimiao
3f15a055e5
Add support for blkio read/write bps device
...
Signed-off-by: Ma Shimiao <mashimiao.fnst@cn.fujitsu.com>
2015-12-04 09:26:03 +08:00
Jessica Frazelle
19e5c01230
remove parallel we no longer use it
...
Signed-off-by: Jessica Frazelle <acidburn@docker.com>
2015-12-03 17:04:01 -08:00
Jessica Frazelle
b7b707af2e
update go version
...
Signed-off-by: Jessica Frazelle <acidburn@docker.com>
2015-12-03 16:37:13 -08:00
Alexander Morozov
4e6bea5964
Merge pull request #18411 from aaronlehmann/unit-test-timing
...
Adjust TestDockerCmdWithTimeout timeout to improve reliability
2015-12-03 16:34:36 -08:00
Aaron Lehmann
2704fd9156
Fix race in RunCommandWithOutputForDuration
...
This function was starting a goroutine that modifies one of its return
values. The intent is for the goroutine to only influence the return
value when it's causing the function to return, but it's racy and can
also modify the return value when the function is returning due to the
timeout. Fix the goroutine to not modify return values directly.
Also, give the channel a buffer so that the goroutine doesn't block
forever after a timeout.
Fixes #18305
Signed-off-by: Aaron Lehmann <aaron.lehmann@docker.com>
2015-12-03 16:34:01 -08:00
Jessica Frazelle
831af89991
add docs
...
Signed-off-by: Jessica Frazelle <acidburn@docker.com>
2015-12-03 16:30:52 -08:00
Jessica Frazelle
ec6d3392f1
hacky workaround for dockerinit static binary needing libseccomp.a for debs and rpms
...
Signed-off-by: Jessica Frazelle <acidburn@docker.com>
2015-12-03 16:30:51 -08:00
Jessica Frazelle
cde9e8bc83
update packagers.md and kernel config check
...
Signed-off-by: Jessica Frazelle <acidburn@docker.com>
2015-12-03 16:30:50 -08:00
Jessica Frazelle
ae76f7e23e
update bash completion for seccomp
...
Signed-off-by: Jessica Frazelle <acidburn@docker.com>
2015-12-03 16:30:49 -08:00
Jessica Frazelle
ed5853de40
update hack/vendor.sh scripts and run vendor
...
Signed-off-by: Jessica Frazelle <acidburn@docker.com>
2015-12-03 16:30:48 -08:00