beenull/moby
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity
23255 commits 14 branches 412 tags 338 MiB
Commit graph

23255 commits

This branch
This branch
All branches
Author SHA1 Message Date
Steve Durrheimer
f8009d10bb Add zsh completion for 'docker load -q --quiet' 
Signed-off-by: Steve Durrheimer <s.durrheimer@gmail.com>
 2016-03-25 18:36:45 +01:00
Brian Goff
7307998a44 Merge pull request #21399 from LK4D4/fix_builder_race 
builder: replace cancelled channel with net/context
 2016-03-25 13:09:23 -04:00
Arnaud Porterie
f7cd8b2da0 Merge pull request #21515 from albers/completion-logopt-fluentd 
bash completion for new fluentd log driver options
 2016-03-25 09:56:53 -07:00
Alexander Morozov
d7b341bc06 Merge pull request #21477 from cpuguy83/better_logging_on_integration 
Better logging for errors in some tests
 2016-03-25 09:16:18 -07:00
Alexander Morozov
f2401a0f69 builder: replace cancelled channel with net/context 
Also stop execution of run immediately if request was cancelled.

Signed-off-by: Alexander Morozov <lk4d4@docker.com>
 2016-03-25 08:19:29 -07:00
Brian Goff
42df9edc4a Better logging for errors in some tests 
Signed-off-by: Brian Goff <cpuguy83@gmail.com>
 2016-03-25 10:02:52 -04:00
Brian Goff
e80f8364bf Merge pull request #21432 from vikstrous/fix_volume_store_race2 
fix race condition between list and remove volume
 2016-03-25 09:47:49 -04:00
Harald Albers
06e357da35 bash completion for new fluentd log driver options 
Signed-off-by: Harald Albers <github@albersweb.de>
 2016-03-25 03:31:48 -07:00
Vincent Demeester
9fbe1d9917 Merge pull request #21465 from runcom/fix-test 
integration-cli: fix wrong test and add log
 2016-03-25 10:22:01 +01:00
Sebastiaan van Stijn
36458b5787 Merge pull request #21501 from tonistiigi/fix-deb-init-symlinks 
Fix symlink copying for deb init scripts
 2016-03-25 01:08:09 -07:00
Vincent Demeester
2de29fb9c2 Merge pull request #21361 from HackToday/addfilter 
Add name/driver filter support for volume
 2016-03-25 08:07:38 +01:00
Tonis Tiigi
61277c395b Fix symlink copying for deb init scripts 
Signed-off-by: Tonis Tiigi <tonistiigi@gmail.com>
 2016-03-24 23:15:17 -07:00
Alexander Morozov
d5019972e5 Merge pull request #21499 from cyli/hardware-signing-experimental-again 
Move hardware signing back to experimental again
 2016-03-24 23:03:13 -07:00
Sebastiaan van Stijn
f3d824771a Merge pull request #21487 from tonistiigi/fix-old-dind 
Fix setting cgroup permission to user/privileged devices
 2016-03-24 22:56:39 -07:00
Arnaud Porterie
b35aaa9d1e Merge pull request #21489 from calavera/downgrade_go 
Downgrade to Go 1.5.3.
 2016-03-24 22:44:49 -07:00
Alexander Morozov
641bd7652f Merge pull request #20589 from coolljt0725/fix_restore_terminal 
cli: move setRawTerminal and restoreTerminal to holdHijackedConnection
 2016-03-24 22:42:24 -07:00
cyli
dd33d18045 Revert "Merge pull request #21003 from riyazdf/hardware-signing-ga" 
This reverts commit e6d3a9849c, reversing
changes made to d3afe34b51.

Signed-off-by: cyli <cyli@twistedmatrix.com>
 2016-03-24 21:12:52 -07:00
Sebastiaan van Stijn
de4cc7cd13 Merge pull request #21484 from albers/docs-load--quiet 
add docs for `docker load --quiet`
 2016-03-24 18:59:53 -07:00
Tibor Vass
9ff767bcc0 Merge pull request #21492 from mavenugo/civ6 
Add "--ipv6" flag in IT for network create when using ipv6 subnets
 2016-03-24 21:26:08 -04:00
Lei Jitang
66d3dcc6f7 cli: move setRawTerminal and restoreTerminal to holdHijackedConnection 
In this way, we can restore the Terminal as soon as possible once the hijacked
connection end. This not only fix weird output if cli enable -D, but also
remove duplicate code.

Signed-off-by: Lei Jitang <leijitang@huawei.com>
 2016-03-24 21:25:50 -04:00
Kai Qiang Wu(Kennan)
8e9305ef94 Add name/driver filter support for volume 
This change include filter `name` and `driver`,
and also update related docs to reflect that filters usage.

Closes: #21243

Signed-off-by: Kai Qiang Wu(Kennan) <wkqwu@cn.ibm.com>
 2016-03-25 01:11:17 +00:00
Madhu Venugopal
ec77c124de Add "--ipv6" flag in IT for network create when using ipv6 subnets 
Signed-off-by: Madhu Venugopal <madhu@docker.com>
 2016-03-24 16:19:59 -07:00
David Calavera
3e0bd74a3d Downgrade to Go 1.5.3. 
To not hit the issue with the request Host header.

Signed-off-by: David Calavera <david.calavera@gmail.com>
 2016-03-24 19:15:10 -04:00
Alexander Morozov
6748ecb005 Merge pull request #21456 from calavera/remove_unecessary_hardcoded_version 
Remove unnecessary hardcoded version.
 2016-03-24 14:31:59 -07:00
Tibor Vass
ed25df9a07 Merge pull request #21387 from kencochrane/change_packages 
Packaging changes required for new containerd binaries
 2016-03-24 17:29:55 -04:00
Tonis Tiigi
8784bd6fde Fix wrong variable name on blkio resources 
Signed-off-by: Tonis Tiigi <tonistiigi@gmail.com>
 2016-03-24 14:16:40 -07:00
Tonis Tiigi
ee61235880 Fix setting cgroup permission to user/privileged devices 
Signed-off-by: Tonis Tiigi <tonistiigi@gmail.com>
 2016-03-24 14:16:33 -07:00
Sebastiaan van Stijn
f2847f8ab3 Merge pull request #21315 from hqhq/hq_check_quota 
Add validation for cpu period and quota
 2016-03-24 14:10:48 -07:00
Sebastiaan van Stijn
1e8d1b5faa Merge pull request #21463 from yongtang/21445-too-long-hostname 
More descriptive error when running a container with a too long hostname (#21445)
 2016-03-24 13:42:28 -07:00
David Calavera
9558d249e9 Merge pull request #21478 from albers/ignore-bashrc 
re-add .bashrc to .gitignore
 2016-03-24 13:29:46 -07:00
Ken Cochrane
bb66d7144f Packaging changes required for new containerd binaries 
These are the changes required due to the new binaries that containerd introduced.
The rpm, and deb packages now include 5 binaries.

docker, containerd, containerd-shim, ctr, and runc

The tar files also include all 5 binaries.

Signed-off-by: Ken Cochrane <KenCochrane@gmail.com>
 2016-03-24 16:25:33 -04:00
Viktor Stanchev
800b9c5a26 fix race condition between list and remove volume 
This was done by making List not populate the cache.

fixes #21403

Signed-off-by: Viktor Stanchev <me@viktorstanchev.com>
 2016-03-24 11:37:18 -07:00
David Calavera
68c920883e Merge pull request #21483 from albers/completion-load--quiet 
bash completion for `docker load --quiet`
 2016-03-24 11:03:50 -07:00
Harald Albers
610ec8c739 add docs for docker load --quiet 
Signed-off-by: Harald Albers <github@albersweb.de>
 2016-03-24 18:57:44 +01:00
Harald Albers
8850b223ed re-add .bashrc to .gitignore 
.bashrc was removed in 29fbc9cc1d
but is still needed. It serves as a hook to customize the build environment.

Signed-off-by: Harald Albers <github@albersweb.de>
 2016-03-24 18:43:41 +01:00
Yong Tang
fa44b4e81e More descriptive error when running a container with a too long hostname (#21445) 
This fix tries to fix issues encountered when running a container with a hostname
that is longer than HOST_NAME_MAX(64).

Previously, `could not synchronise with container process` was generated as the
length of the regex check was missing.

This fix covers the length check so that a hostname that is longer than
HOST_NAME_MAX(64) will be given a correct error message.

Several unit tests cases and additional integration test cases are added as well.

This fix closes #21445.

Signed-off-by: Yong Tang <yong.tang.github@outlook.com>
 2016-03-24 17:42:28 +00:00
Harald Albers
aa9170f066 bash completion for docker load --quiet 
Signed-off-by: Harald Albers <github@albersweb.de>
 2016-03-24 18:39:57 +01:00
Vincent Demeester
1ab51e44e6 Merge pull request #21481 from albers/completion-ps-filter-volumes 
bash completion for `docker ps -f volume`
 2016-03-24 18:39:26 +01:00
David Calavera
e88dff6bb4 Merge pull request #21435 from vdemeester/remove-verbose-copy-containerd 
Remove the verbosity of copy_containerd
 2016-03-24 10:34:37 -07:00
Vincent Demeester
2b6b2e1af8 Merge pull request #21464 from coolljt0725/cleanup_dot 
Cleanup: remove redundant period
 2016-03-24 18:34:20 +01:00
David Calavera
731c59f545 Merge pull request #21471 from allencloud/fix-typos-in-daemon-unix 
fix typos in daemon_unix.go
 2016-03-24 10:32:59 -07:00
Harald Albers
ef0570abfc bash completion for docker ps -f volume 
Signed-off-by: Harald Albers <github@albersweb.de>
 2016-03-24 18:23:25 +01:00
David Calavera
accf28a7db Remove unnecessary hardcoded version. 
The server configuration already keeps the current version
if the daemon. This patch changes the middleware logic
to use it rather than using the global value.

This removes the dockerversion package dependency from the api.

Signed-off-by: David Calavera <david.calavera@gmail.com>
 2016-03-24 12:33:40 -04:00
allencloud
25c9bd81f6 fix typos in daemon_unix.go 
Signed-off-by: allencloud <allen.sun@daocloud.io>
 2016-03-24 23:57:11 +08:00
Brian Goff
57575a2695 Merge pull request #21460 from tonistiigi/exec-ulimits 
Add ulimit support to libcontainerd addprocess
 2016-03-24 09:38:21 -04:00
Lei Jitang
cb5b8767b6 Cleanup: remove redundant period 
Signed-off-by: Lei Jitang <leijitang@huawei.com>
 2016-03-24 08:26:04 -04:00
Vincent Demeester
2131558963 Merge pull request #21428 from estesp/reenable-shared-nstests-userns 
Re-enable shared namespace tests for userns CI runs
 2016-03-24 12:31:27 +01:00
Antonio Murdaca
e73152bf27 integration-cli: fix wrong test and add log 
Signed-off-by: Antonio Murdaca <runcom@redhat.com>
 2016-03-24 11:10:41 +01:00
Arnaud Porterie
b64627b798 Merge pull request #21457 from tonistiigi/update-runc 
Update runc/containerd
 2016-03-23 19:56:27 -07:00
Tonis Tiigi
8891afd838 Add ulimit support to libcontainerd addprocess 
Signed-off-by: Tonis Tiigi <tonistiigi@gmail.com>
 2016-03-23 19:54:32 -07:00