Commit Graph
14731 Commits
Author SHA1 Message Date
moxiegirl f8af71c0cf Merge pull request #12057 from icecrime/11925_carry
Specify running `boot2docker ip` on host
Upstream-commit: 6d5a0ac11ea50cd46d6f04435e49bb1b08bd0d60
Component: engine
2015-04-03 12:11:53 -07:00
Jessie Frazelle e471adcfbf Merge pull request #12048 from tianon/auto-btrfs_noversion
Change the btrfs_noversion check to be automatic
Upstream-commit: 409ed98c3f95f90311127773baa78904ac8350b6
Component: engine
2015-04-03 19:00:57 +00:00
Jessie Frazelle bf961698dc Merge pull request #12054 from eluck/master
Update userguide/dockervolumes - fixes issue #12052
Upstream-commit: 3985dc299a5958481a9c0dcbd3bc7da69de6a19b
Component: engine
2015-04-03 18:58:52 +00:00
Jessie Frazelle bd5aac3934 Merge pull request #12037 from twhiteman/master
integration-cli: in TestPsListContainersSize, check for no containers
Upstream-commit: 3683498d6fe233f9f68fb5a6186158293b450049
Component: engine
2015-04-03 18:52:26 +00:00
Jessie Frazelle ef9deeddf0 Merge pull request #12059 from whoshuu/readme
Clean up formatting in the README
Upstream-commit: 55da2e59870b62eb2ee1830f0f67e0711494bb03
Component: engine
2015-04-03 18:49:26 +00:00
Ahmet Alp Balkan 4514e9e241 docs: Add new windows installation tutorials
Updated Windows installation documentation with newest
screencasts and Chocolatey instructions to install windows
client CLI.

Signed-off-by: Ahmet Alp Balkan <ahmetalpbalkan@gmail.com>
Upstream-commit: 2b320a230979c3222162567b9d1d3193b0806cd5
Component: engine
2015-04-03 11:33:34 -07:00
Doug Davis 938f87c2dd Remove engine.Table from docker search and fix missing field
registry/SearchResults was missing the "is_automated" field.
I added it back in.

Pull this 'table' removal one from the others because it fixed
a bug too

Signed-off-by: Doug Davis <dug@us.ibm.com>
Upstream-commit: 67b4cce0f6c835cf9e53313a026af2e825ba8b10
Component: engine
2015-04-03 11:27:30 -07:00
Michael Crosby dd7175bcb6 Merge pull request #12010 from ibuildthecloud/small
Small changes from #11967 for review comments
Upstream-commit: e64f6baf116771b22a3050cf686624dbb6b19f37
Component: engine
2015-04-03 11:27:06 -07:00
Jessie Frazelle 513240409b Merge pull request #11981 from unclejack/fix_profiler
api/server: fix profiler HTTP serving
Upstream-commit: b3e9c274ddadde302d927a866c8704be77c871e0
Component: engine
2015-04-03 18:25:12 +00:00
Antonio Murdaca 31f1448b86 Refactor ultis/utils_daemon, fixes #11908
Signed-off-by: Antonio Murdaca <me@runcom.ninja>
Upstream-commit: 01724c1cf11ce4a9e3b1978c7c07fd25656ed137
Component: engine
2015-04-03 20:20:04 +02:00
Michael Crosby c121c9b8d9 Merge pull request #12058 from duglin/RemoveTable2
Remove engine.Table from docker history and docker rmi
Upstream-commit: 326a5545d43b63c1f806c3106be884c06facd77b
Component: engine
2015-04-03 10:57:52 -07:00
moxiegirl 007282bfc1 Merge pull request #12017 from moxiegirl/distribution-man-pages
Updating with man pages for distribution
Upstream-commit: 12e77875407f4a4368f198d28d1fadc2c676401c
Component: engine
2015-04-03 09:55:08 -07:00
Huu Nguyen d13d80f01b Clean up formatting in the README
Signed-off-by: Huu Nguyen <whoshuu@gmail.com>
Upstream-commit: bfddad18ce126e1a500ffb968f4ff4a9f2683824
Component: engine
2015-04-03 09:50:35 -07:00
Arnaud Porterie b13c0e5f0a Merge pull request #11860 from maximkulkin/11575-dockerize-image-tool
Add tool to conver disk image into Docker image
Upstream-commit: 61933395ebdf0c8c54012b6b75312da595183c54
Component: engine
2015-04-03 09:32:11 -07:00
Arnaud Porterie 57ace4f0d5 Merge pull request #11881 from jrjang/master
mkimage-arch: set default C.UTF-8 locale
Upstream-commit: c8ca904f15b1649ec536c6b9660b4a2247a8c4ce
Component: engine
2015-04-03 09:28:11 -07:00
Arnaud Porterie 8827ee42d2 Specify running boot2docker ip on host
Signed-off-by: Arnaud Porterie <arnaud.porterie@docker.com>
Upstream-commit: bcbdf77ddb7dab0bf6346400eeb6a0aaaf3d7142
Component: engine
2015-04-03 08:53:44 -07:00
Alexander Morozov 579d436a86 Merge pull request #11956 from coolljt0725/add_memcg_swap_cgroup_enabled_to_check_config
add MEMCG_SWAP_ENABLED to check-config.sh
Upstream-commit: 03525d5fc647f4686728f3c6f3acf514433e07cb
Component: engine
2015-04-03 08:50:54 -07:00
Doug Davis 6eb83f4ef3 Merge pull request #12018 from sunyuan3/search
If docker search with --starts=${negative number}, it would show the war...
Upstream-commit: 2c5da7d1accdc9a2be321602285946bbe29593c2
Component: engine
2015-04-03 11:38:38 -04:00
Doug Davis 3a500e0f89 Remove engine.Table from docker history and docker rmi
Signed-off-by: Doug Davis <dug@us.ibm.com>
Upstream-commit: 0b2fa9c707ab06836cf5dd7b3ca9efac64bba925
Component: engine
2015-04-03 08:31:30 -07:00
moxiegirl 74b9d04473 Merge pull request #11997 from tiborvass/carry-11926
Carry 11926: Added information about accessing host directory on Windows.
Upstream-commit: 05753288c462b603d7979d2febf66bca7aa6741a
Component: engine
2015-04-03 06:43:38 -07:00
moxiegirl 77e454c28a Merge pull request #11775 from maximkulkin/explain-advanced-contribution-workflow
Explain advanced contribution workflow more
Upstream-commit: da61228501acf24e651e167efb7b3c25c6bf5548
Component: engine
2015-04-03 06:41:49 -07:00
Aaron Welch 45edbec150 add centos to supported distros
Signed-off-by: Aaron Welch <welch@packet.net>
Upstream-commit: a6b8f2e3fe4bdc0db8b526bff8b91bb1bd3a7bde
Component: engine
2015-04-03 08:56:26 -04:00
eluck e2ab7dec3a Update userguide/dockervolumes - fixes issue #12052
Signed-off-by: Evgeny Lukianchikov <mail@eluck.me>
Upstream-commit: 57b09068efe3a278145683ff05b5e352ee00bba3
Component: engine
2015-04-03 14:07:51 +03:00
Jamie Hannaford 5361796b1a Add documentation for exported functions and types
Signed-off-by: Jamie Hannaford <jamie.hannaford@rackspace.com>
Upstream-commit: 9a98556c2bc355170893568ca20e102cbda7d600
Component: engine
2015-04-03 11:33:34 +02:00
Tianon Gravi 3274cd15bf Change the btrfs_noversion check to be automatic
Signed-off-by: Andrew "Tianon" Page <admwiggin@gmail.com>
Upstream-commit: 3761955e8c1e7534026c469186c3f66c18e77cbc
Component: engine
2015-04-03 01:30:12 -06:00
Simei He c9d7b160f7 minor edits.
Signed-off-by: Simei He <hesimei@zju.edu.cn>
Upstream-commit: 8c578b8190a9abd5a48efa723878a12568f91e54
Component: engine
2015-04-03 14:43:21 +08:00
Arnaud Porterie d2894c5f4b Merge pull request #11883 from coolljt0725/add_missing_option_to_bash_completion
Add some missing option to bash completion
Upstream-commit: a3a45a6ec0278ac37eee7cebe57e728b2cd2165c
Component: engine
2015-04-02 22:49:58 -07:00
Alexander Morozov 231f4b47fb Merge pull request #12043 from joeygibson/12041-fix-vet-warnings
Fix vet warnings in pkg/requestdecorator/requestdecorator_test.go #12041
Upstream-commit: 4e90b47cc23a4a90063918bbc69799333d8bafde
Component: engine
2015-04-02 22:07:55 -07:00
Joey Gibson 3b7f375359 Fix vet warnings in pkg/requestdecorator/requestdecorator_test.go #12041
Signed-off-by: Joey Gibson <joey@joeygibson.com>
Upstream-commit: a9443de7c5759398804acaa3fd9ccfb196557cfe
Component: engine
2015-04-03 00:18:21 -04:00
Yuan Sun 8c6dabaae6 If docker search with --starts=${negative number}, it would show the warning.
Signed-off-by: Yuan Sun <sunyuan3@huawei.com>
Upstream-commit: 87e0e4eb431693cf1eeed777c6c4648ae0a94395
Component: engine
2015-04-03 08:55:34 +08:00
Tibor Vass 7156a27c06 Merge pull request #11995 from icecrime/test_daemon_stop
Properly stop test daemon in integration-cli
Upstream-commit: f92e88b7e0bb782badbd45d95a4013c7f1ddbb19
Component: engine
2015-04-02 20:27:20 -04:00
Phil Estes e0fc0cdcdd Merge pull request #12040 from duglin/TableFromDiff
Remove use of Table from 'docker diff'
Upstream-commit: 3f1590f6797a30dfd30010d6d2e1567ff6d53729
Component: engine
2015-04-02 17:21:40 -07:00
Doug Davis 68cf0c513e Remove use of Table from 'docker diff'
Signed-off-by: Doug Davis <dug@us.ibm.com>
Upstream-commit: 49c72506ace177e33d867123ca15f193c38bcf45
Component: engine
2015-04-02 16:55:58 -07:00
Arnaud Porterie efa6b62065 Merge pull request #11571 from noironetworks/11555-Docker-since-beginning-of-unix-time-doesnt-work
Fixes docker events since beginning of unix time
Upstream-commit: 9c505c906d318df7b5e8652c37e4df06b4f30d56
Component: engine
2015-04-02 15:03:04 -07:00
Jessie Frazelle c5aa7a43a1 Merge pull request #12036 from crosbymichael/update-libcontainer-apr2
Update libcontainaer to d00b8369852285d6a830a8d3b9
Upstream-commit: 962ded2deebaa9f4a0d8f7a8223ae099fbb5c7e1
Component: engine
2015-04-02 14:46:44 -07:00
Todd Whiteman c1f9e7351f integration-cli: add check for TestPsListContainersSize when no containers are returned
* when no containers are returned, go test would then aborts with:
  panic: runtime error: index out of range

Signed-off-by: Todd Whiteman <todd.whiteman@joyent.com>
Upstream-commit: 3e51a8147510fb59d6206fe7310feaebc2d69fbc
Component: engine
2015-04-02 14:45:52 -07:00
Michael Crosby 54f3509eb1 Update libcontainaer to d00b8369852285d6a830a8d3b9
Fixes #12015

Signed-off-by: Michael Crosby <crosbymichael@gmail.com>
Upstream-commit: d12fef1515cb3f0938ea6ed8cab8351e2df2753e
Component: engine
2015-04-02 14:12:55 -07:00
Vivek Goyal 68a3810b3c devmapper: Retry device removal after 100ms instead of 10ms
Right now we try device removal at the interval of 10ms and keep on trying
till either device is removed or 10 seconds are over. That means if device
is busy, we will try 1000 times in those 10 seconds.

Sounds too high a frequency of deivce removal retrial. All the logs are
filled easily. I think it is a good idea to slow down a bit and retry at
the interval of 100ms instead of 10ms.

Signed-off-by: Vivek Goyal <vgoyal@redhat.com>
Upstream-commit: c737800b7faced4b53854c8cb6766ebe58a3c3e9
Component: engine
2015-04-02 16:47:14 -04:00
Vivek Goyal a0411faab2 devmapper: Remove call to waitClose()
During device removal, we are first waiting for device to close() in a tight
loop for 10 seconds. I am not sure why do we need it. First of all we come
here once the umount() is successful so device should be free. For some reason
of device is temporarily busy, then removeDevice() logic retries device removal
logic in a loop for 10 seconds and that should cover it. Can't see why one
more 10 seoncds loop is required before attempting device removal.

One loop should be able to cover all the temporary device busy conditions and
if condition is not temporary then 10 seconds loop is not going to help anyway.

So instead of two loops of 10 seconds each, I am converting it to a single
loop of 20 seconds. May be 10 second loop is good enough but for now I am
keeping it 20 seconds to avoid any regressions.

Signed-off-by: Vivek Goyal <vgoyal@redhat.com>
Upstream-commit: f74d12012c21349b2bd51d9c395a99331ff0a9a5
Component: engine
2015-04-02 16:47:14 -04:00
Vivek Goyal 12beb9b276 devmapper: Remove extra wait after device removal
Currently in device removal path (device deactivation), we wait
for 10 seconds for devive to actually go away. waitRemove().

In current code this is not required. If dm removal task has completed
and one has done the wait on udev cookie, then device is gone and there
is no need to write another loop to wait for device removal.

This patch removes the waitRemove() which waits for 10 seconds after
device removal. This seems unnecessary.

Signed-off-by: Vivek Goyal <vgoyal@redhat.com>
Upstream-commit: dbf04ec4e2a6b4fe73f7f300918a906c0ff1a37b
Component: engine
2015-04-02 16:47:14 -04:00
Vivek Goyal 5b01c8abc0 devmapper: Use a pointer as argument to deferred function UdevWait()
UdevWait() is deferred and takes uint cookie as an argument. As arguments
to deferred functions are calculated at the time of call, it is possible
that any update to cookie later by libdm are not taken into account when
UdevWait() is called. Hence use a pointer to uint as argument to UdevWait()
function.

Signed-off-by: Vivek Goyal <vgoyal@redhat.com>
Upstream-commit: 665656afbb8932a11c69c0cd79e21a768aa46d38
Component: engine
2015-04-02 16:47:14 -04:00
Vivek Goyal cb8a2764e5 devicemapper: Remove debug messages from RemoveDevice()
devmapper graph driver retries device removal 1000 times in case of failure
and if this fills up console with 1000 messages (when daemon is running in
debug mode). So remove these debug messages.
 
Signed-off-by: Vivek Goyal <vgoyal@redhat.com>
Upstream-commit: cb7c893275c32ddfa775c3f22869a9c211024c71
Component: engine
2015-04-02 16:47:14 -04:00
Vivek Goyal 2b212c76e7 devmapper: Fix libdm logging
There are issues with libdm logging. Right now if docker daemon is run
in debug mode, logging by libdm is too verbose. And if a device can't 
be removed, thousands of messages fill the console and one can not see
what's going on.

This patch removes devicemapper.LogInitVerbose() call as that call will
only work if docker was not registering its own log handler with libdm.
For some reason docker registers one with libdm and libdm hands over
all the messages to docker (including debug ones). And now it is up to
devmapper backend to figure out which ones should go to console and
which ones should not.

So by default log only fatal messages from libdm. One can easily modify
the code to change it for debugging purposes.

Signed-off-by: Vivek Goyal <vgoyal@redhat.com>
Upstream-commit: e07d3cd9acf14219f33e12375fb8c2e3fe02ad0c
Component: engine
2015-04-02 16:47:14 -04:00
Tibor Vass 7a161db875 Merge pull request #12012 from jfrazelle/fix-race-volumes-from-api
TestVolumesFromHasPriority fix race
Upstream-commit: c88b2c422ff55099f8dae2a39566698c42b3d354
Component: engine
2015-04-02 16:01:09 -04:00
Tibor Vass 5a322b178c Merge pull request #12011 from jfrazelle/fix-lxc-device-test
fix device test on lxc...
Upstream-commit: 42c78550142321f4b5109118f3d2d2b8c529e83c
Component: engine
2015-04-02 16:00:39 -04:00
Alexander Morozov f437be36ca Merge pull request #12026 from cpuguy83/add_self_to_maintainers
Add cpuguy83 to maintainers.people
Upstream-commit: 104b20a133e03b66dfd663ee135b0ac1e3bc7c73
Component: engine
2015-04-02 09:20:19 -07:00
Arnaud Porterie c2b08878f0 Properly stop test daemon in integration-cli
Always stop the test daemon in an attempt to fix race conditions in
subsequent tests.

Signed-off-by: Arnaud Porterie <arnaud.porterie@docker.com>
Upstream-commit: 02c2308e39930677a7f4bb7f4215331a4d87566f
Component: engine
2015-04-02 08:53:31 -07:00
Alexander Morozov 47c06e9d44 Merge pull request #12029 from unclejack/testpsgroupportrange_fast
integration-cli: make TestPsGroupPortRange fast
Upstream-commit: ccfbe880c89719110aa124795e7f4f48857a298a
Component: engine
2015-04-02 08:48:08 -07:00
unclejack 2ebb5f4928 daemon/logger/jsonfilelog: avoid some allocations
Signed-off-by: Cristian Staretu <cristian.staretu@gmail.com>
Upstream-commit: 132da3f036287896cb3ba9f9f2573ad36bbb69cc
Component: engine
2015-04-02 18:33:23 +03:00
unclejack 1031605b86 integration-cli: make TestPsGroupPortRange fast
Signed-off-by: Cristian Staretu <cristian.staretu@gmail.com>
Upstream-commit: cfa8aaf16f1f3b777851555afc83a1112c4f8879
Component: engine
2015-04-02 18:26:29 +03:00