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

21540 commits

This branch
This branch
All branches
Author SHA1 Message Date
Aleksa Sarai
cc19c7df2a integration-cli: add bad --cgroup-parent tests 
To ensure we don't regress on bad --cgroup-parent paths, add some
integration tests that check that the host hasn't toppled (or suddently
started to create files in the host).

Signed-off-by: Aleksa Sarai <asarai@suse.com>
 2016-01-22 20:16:56 +11:00
Aleksa Sarai
40b5eebb0b vendor: *: update libcontainer 
This fixes a security vulnerability in Docker, which can cause a DoS
under certain circumstances. This is from the hotfix branch, so the
vendored commit is actually bf899fef451956be4abd63de6d6141d9f9096a02 in
runc master.

Signed-off-by: Aleksa Sarai <asarai@suse.com>
 2016-01-22 20:15:09 +11:00
Vincent Demeester
c3a9ecedba Merge pull request #19574 from polonskiy/patch-2 
fixed typo
 2016-01-22 09:14:58 +01:00
Anton Polonskiy
b0873c2c50 fixed typo 
Signed-off-by: Anton Polonskiy <anton.polonskiy@gmail.com>
 2016-01-22 09:27:53 +02:00
Doug Davis
6f22d9ec4e Merge pull request #19562 from MHBauer/nospace-checktheoutput 
check the output, not the errcode
 2016-01-21 22:09:41 -05:00
Phil Estes
3233f45609 Merge pull request #19263 from jfrazelle/update-aa-parser 
refactor aaparser pkg, add unit tests
 2016-01-21 19:40:53 -05:00
Jess Frazelle
6e16ec2b9c Merge pull request #19529 from Microsoft/jjh/dockerfile 
Windows: Update dockerfile for Windows to Windows CI
 2016-01-21 15:46:08 -08:00
Morgan Bauer
bcb9adf49e
check the output, not the errcode 
- errcode of 1 can be returned for cases other than the 'no space left' case

Signed-off-by: Morgan Bauer <mbauer@us.ibm.com>
 2016-01-21 15:23:20 -08:00
Brian Goff
9ae51b3e0f Merge pull request #19383 from calavera/container_store 
Extract container store from the daemon.
 2016-01-21 17:20:47 -05:00
Sebastiaan van Stijn
45db4fa70e Merge pull request #19557 from tiborvass/karkhaz-add-dead-to-docker-ps-documentation 
Carry 19305: Added `dead` to docs for docker ps -f status=...
 2016-01-21 13:46:51 -08:00
Kareem Khazem
859262a82a Added dead to docs for docker ps -f status=... 
It is possible to invoke `docker ps -f status=dead`, but the
documentation for docker-ps does not mention `dead` as a valid option.
This commit fixes that.

Signed-off-by: Kareem Khazem <karkhaz@karkhaz.com>
 2016-01-21 16:44:33 -05:00
Jess Frazelle
e287bef453 Merge pull request #19316 from Microsoft/jjh/incontainererror 
Windows: In container build check
 2016-01-21 13:44:19 -08:00
Tibor Vass
3ecba7089b Merge pull request #19552 from aaronlehmann/vendor-distribution-3 
Vendor updated distribution package
 2016-01-21 16:21:59 -05:00
John Howard
4dbd612d47 Windows: In container build check 
Signed-off-by: John Howard <jhoward@microsoft.com>
 2016-01-21 13:15:23 -08:00
John Howard
eacd2fd4da Windows: Update dockerfile.windows 
Signed-off-by: John Howard <jhoward@microsoft.com>
 2016-01-21 12:49:03 -08:00
Tibor Vass
0b7e9ef910 Merge pull request #19550 from Microsoft/jjh/testlinksmultiplewithsamename 
Windows: Fix TestLinksMultipleWithSameName
 2016-01-21 15:38:47 -05:00
Tibor Vass
26334b7a7d Merge pull request #19551 from aaronlehmann/fix-retry-on-enospc 
Don't retry downloads when disk is full
 2016-01-21 15:37:50 -05:00
Tibor Vass
d2448a0c20 Merge pull request #19524 from LK4D4/iocopy_writeto 
Use bufio.Reader in io.Copy source for overlay.copyRegular
 2016-01-21 15:37:12 -05:00
Tibor Vass
16faf8f1fc Merge pull request #19518 from dmcgowan/unwrap-url-error-on-retry 
Unwrap URL errors on retry
 2016-01-21 15:36:41 -05:00
Aaron Lehmann
921eae9d6d Vendor updated distribution package 
Another day, another revendor.

This revision of distribution is more tolerant of incorrect Content-Type
headers when fetching manifests.

Fixes #19526

Signed-off-by: Aaron Lehmann <aaron.lehmann@docker.com>
 2016-01-21 11:01:14 -08:00
Doug Davis
b7a68d0252 Merge pull request #19548 from WeiZhang555/remove-hard-coded 
Remove hard coded 'docker' string from package
 2016-01-21 13:06:22 -05:00
Aaron Lehmann
4f13ec5551 Don't retry downloads when disk is full 
There was already a check that prevented protocol-level fallback in this
situation, but retries within a specific protocol will still happen.
This makes it take a long time for the pull to finally error out.

This fixes slowness in TestDaemonNoSpaceleftOnDeviceError, which used to
take a long time due to the backoff between retry attempts:

PASS: docker_cli_daemon_test.go:1868: DockerDaemonSuite.TestDaemonNoSpaceleftOnDeviceError	5.882s

Signed-off-by: Aaron Lehmann <aaron.lehmann@docker.com>
 2016-01-21 10:01:51 -08:00
Arnaud Porterie
eacc9fc2c3 Merge pull request #19547 from tonistiigi/revert-aufs-hardlinks 
Revert "Copy aufs hardlinks to top layer"
 2016-01-21 09:56:26 -08:00
John Howard
473a32ba8f Windows: Fix TestLinksMultipleWithSameName 
Signed-off-by: John Howard <jhoward@microsoft.com>
 2016-01-21 09:52:49 -08:00
Tibor Vass
5f9375cf39 Merge pull request #19349 from jfrazelle/add-link-to-wiki 
add warning if upgrading via script to migrate
 2016-01-21 12:51:25 -05:00
Vincent Demeester
7aef311269 Merge pull request #19541 from albers/completion-events 
Support new events in bash completion
 2016-01-21 18:40:54 +01:00
Tibor Vass
7d19ca7c40 Merge pull request #19423 from jfrazelle/apparmor-no-install 
disable install of docker-engine for 1.10, try to get ready for 1.11
 2016-01-21 12:08:50 -05:00
Alexander Morozov
3f5e1c69b3 Use pools.Copy instead of io.Copy for overlay.copyRegular 
That function is pretty heavy used on container start. Autoallocating
buffer can be painful.

Signed-off-by: Alexander Morozov <lk4d4@docker.com>
 2016-01-21 08:53:37 -08:00
David Calavera
aed5691644 Merge pull request #19507 from aaronlehmann/certificate-error-message 
Clarify error message when a .cert file is missing a corresponding key
 2016-01-21 08:29:25 -08:00
Vincent Demeester
5e143d5168 Merge pull request #19540 from A33a/A33a-patch-1 
Fixed typo in "/etc/subUid"
 2016-01-21 17:24:29 +01:00
David Calavera
8c0dd9d182 Merge pull request #19522 from aaronlehmann/vendor-distribution-2 
Vendor updated distribution
 2016-01-21 08:15:41 -08:00
Zhang Wei
d44e79a366 Remove hard coded 'docker' string from package 
Signed-off-by: Zhang Wei <zhangwei555@huawei.com>
 2016-01-22 00:14:52 +08:00
David Calavera
72c425785c Merge pull request #19534 from hqhq/hq_fix_update_swap 
Fix comment about swap limit of docker update
 2016-01-21 08:12:00 -08:00
Tonis Tiigi
98d0997894 Revert "Copy aufs hardlinks to top layer" 
This reverts commit ef05b83417.

Signed-off-by: Tonis Tiigi <tonistiigi@gmail.com>
 2016-01-21 07:52:50 -08:00
Tibor Vass
757d686700 Merge pull request #19500 from cpuguy83/fix_loading_with_containerized_plugins 
Fix loading with containerized plugins
 2016-01-21 08:57:01 -05:00
Vincent Demeester
476edba011 Merge pull request #19483 from coolljt0725/fix_19477 
Fix #19477, clean up the ports when release network
 2016-01-21 14:29:29 +01:00
Harald Albers
ab01b6f385 Refactor handling of key specific subcompletions 
The currently used idiom for handling key specific subcompletions
did not work here: behind `docker event -f type=network `, the completion
of networks triggered. The expected behaviour is not to complete
anything here.

In order to limit the scope of the corresponding PR, the new idiom is
currently only used in `docker events --filter`.

Signed-off-by: Harald Albers <github@albersweb.de>
 2016-01-21 14:24:31 +01:00
Harald Albers
fcc035848f Support new events in bash completion 
Signed-off-by: Harald Albers <github@albersweb.de>
 2016-01-21 13:57:35 +01:00
Azat Khuyiyakhmetov
935849f17a Fixed typo in "/etc/subUid" 
Signed-off-by: Azat Khuziyakhmetov <shadow_uz@mail.ru>
 2016-01-21 12:46:29 +01:00
Antonio Murdaca
db25ba1486 Merge pull request #19536 from wenchma/fix_typo 
Fixes the typo of docker_cli_network_unix_test.go
 2016-01-21 09:42:36 +01:00
Wen Cheng Ma
2e6b1eb309 Fixes the typo of docker_cli_network_unix_test.go 
Signed-off-by: Wen Cheng Ma <wenchma@cn.ibm.com>
 2016-01-21 16:37:17 +08:00
Jess Frazelle
5537a92e45 Merge pull request #19377 from jfrazelle/cleanup-build-rpm-deb 
Cleanup build rpm deb
 2016-01-20 23:58:33 -08:00
Qiang Huang
603bc69b2c Fix comment about swap limit of docker update 
The description "set `-1` to disable swap" is wrong, `build`,
`create` and `run` already fixed, we need to fix `update` as well.

Signed-off-by: Qiang Huang <h.huangqiang@huawei.com>
 2016-01-21 13:48:53 +08:00
Sebastiaan van Stijn
7db58948bf Merge pull request #19434 from HackToday/fixmntvolume 
Refine the volume mount example
 2016-01-20 20:42:24 -08:00
Sebastiaan van Stijn
13dbf52611 Merge pull request #19530 from HackToday/fixtiny 
Fix the typo in ps
 2016-01-20 20:41:35 -08:00
Kai Qiang Wu(Kennan)
c2b59b03df Fix the typo in ps 
Signed-off-by: Kai Qiang Wu(Kennan) <wkqwu@cn.ibm.com>
 2016-01-21 04:26:49 +00:00
Brian Goff
7bf776f1c3 Merge pull request #19482 from LK4D4/up_osx_sdk 
Move long compilations before Go install in Dockerfile
 2016-01-20 20:11:32 -05:00
Lei Jitang
6025517b68 Fix #19477, clean up the ports when release network 
Signed-off-by: Lei Jitang <leijitang@huawei.com>
 2016-01-20 20:09:11 -05:00
Lei Jitang
bb8d8a645a Merge pull request #19430 from keloyang/StatsNoStreamGetCpu 
remove the check of ContentLength in TestApiStatsNoStreamGetCpu
 2016-01-21 09:07:00 +08:00
Aaron Lehmann
a160dd4987 Vendor updated distribution 
The only changes are https://github.com/docker/distribution/pull/1379
and https://github.com/docker/distribution/pull/1380.

Fixes #19476

Signed-off-by: Aaron Lehmann <aaron.lehmann@docker.com>
 2016-01-20 15:46:11 -08:00