0236ca4bfe
Merge pull request #13617 from Microsoft/10662-sql
...
Windows: Statically linkable SQLite3
Upstream-commit: 943bf44686f18e2888a2a9b986d787e6ed728986
Component: engine
2015-07-21 10:12:40 -07:00
f8dc4be64b
Windows: Statically linkable SQLite3
...
Signed-off-by: John Howard <jhoward@microsoft.com >
Upstream-commit: 10bcaca914b32af29d8ce9974c5f5656a2f8cc1d
Component: engine
2015-07-21 09:33:46 -07:00
a69da4951f
Merge pull request #14762 from LK4D4/lint_reexec
...
Add docstring to reexec.Command
Upstream-commit: 4d0990a753abbf1c7709dec7ea48a74ff87845fd
Component: engine
2015-07-20 20:37:27 -04:00
2f038465a8
Add docstring to reexec.Command
...
Signed-off-by: Alexander Morozov <lk4d4@docker.com >
Upstream-commit: 9738b9319b7a5133653c4912db8ec361af5847fc
Component: engine
2015-07-20 17:00:18 -07:00
0388c1eb6b
move nat tests from container's unit test to nat's ones
...
Signed-off-by: Antonio Murdaca <runcom@linux.com >
Upstream-commit: f2aff584830db5257489bcf76a4b364b79534b77
Component: engine
2015-07-21 00:29:24 +02:00
8a425b30fb
Merge pull request #14693 from LK4D4/update_libcontainer
...
Update libcontainer
Upstream-commit: 98ed9a55f42f7c86c7c9cddb27f6807e7e77c889
Component: engine
2015-07-17 13:02:04 -07:00
4daf251bed
Merge pull request #13951 from calavera/plugins_path
...
Separate plugin sockets and specs.
Upstream-commit: a763637eae7dcf5d870e9d035be5baf94d72e2c5
Component: engine
2015-07-17 21:11:31 +02:00
4b2f3f5f76
Merge pull request #14605 from brahmaroutu/gccgo_scheduler
...
Go Scheduler issue with sync.Mutex
Upstream-commit: 7b83b0e15c4507871ed411aca5610aa7da751bd9
Component: engine
2015-07-17 08:16:32 -07:00
d905b9673f
Go Scheduler issue with sync.Mutex using gccgo
...
Signed-off-by: Srini Brahmaroutu <srbrahma@us.ibm.com >
Upstream-commit: 9ca913d0f168d943f6e15f32f52f777732b354a7
Component: engine
2015-07-17 01:33:58 +00:00
d9e652a366
Update libcontainer
...
Replaced github.com/docker/libcontainer with
github.com/opencontainers/runc/libcontaier.
Also I moved AppArmor profile generation to docker.
Main idea of this update is to fix mounting cgroups inside containers.
After updating docker on CI we can even remove dind.
Signed-off-by: Alexander Morozov <lk4d4@docker.com >
Upstream-commit: c86189d554ba14aa04b6314970d3699e5ddbf4de
Component: engine
2015-07-16 16:02:26 -07:00
12460b884d
Separate plugin sockets and specs.
...
Check if there is a plugin socket first under `/run/docker/plugins/NAME.sock`.
If there is no socket for a plugin, check `/etc/docker/plugins/NAME.spec` and
`/usr/lib/docker/plugins/NAME.spec` for spec files.
Signed-off-by: David Calavera <david.calavera@gmail.com >
Upstream-commit: 6c0795747b00589641eb34eb7adce05a56d8840f
Component: engine
2015-07-16 14:20:07 -07:00
0a78587632
remove pkg/transport and use the one from distribution
...
Signed-off-by: Tibor Vass <tibor@docker.com >
Upstream-commit: 276c640be4b4335e3b8d684cb3562a56d3337b39
Component: engine
2015-07-16 13:13:46 -04:00
89b6e2370a
Merge pull request #14661 from LK4D4/vet_warns
...
Fix some formatting calls
Upstream-commit: cd642973fa50531d3da6c13eb0255b6f4cc8aa9c
Component: engine
2015-07-15 16:41:18 -07:00
46a0415407
Fix some formatting calls
...
Signed-off-by: Alexander Morozov <lk4d4@docker.com >
Upstream-commit: a5142f6ac31c6c21b96c6895fff525c46e8056a6
Component: engine
2015-07-15 12:25:50 -07:00
22fa301a78
add support for base path in docker cli -H
...
Signed-off-by: Victor Vieux <victorvieux@gmail.com >
Upstream-commit: 47a7f770f42bc0fd9b0a594b72a8f20fb4b874d1
Component: engine
2015-07-08 15:42:40 -07:00
d0e6da9737
Don't use time.After if there is no timeout
...
Signed-off-by: Alexander Morozov <lk4d4@docker.com >
Upstream-commit: bc6ad1608c37b56aa031760cc07e9a30ebe030d8
Component: engine
2015-07-14 09:14:51 -07:00
2c3627f184
Add docstring to pubsub.Publisher
...
Signed-off-by: Alexander Morozov <lk4d4@docker.com >
Upstream-commit: 7080f5d1cf2c9f86d89a84424394b2c61e925843
Component: engine
2015-07-14 09:10:14 -07:00
90ddc78ef7
Merge pull request #14595 from LK4D4/pubsub_bench
...
Benchmark and race test for pkg/pubsub
Upstream-commit: 154820aca6076803e4541d12e46db66214994455
Component: engine
2015-07-13 23:04:44 -04:00
a1ee4d8815
Merge pull request #14021 from rhvgoyal/detect-pool-loopback-devices
...
devicemapper: Check loop devices of existing pool
Upstream-commit: 5ca3e7c54c9140f2b8553060fdd75d3986e6db6e
Component: engine
2015-07-13 21:15:23 -04:00
d604057959
Merge pull request #14599 from brahmaroutu/gccgo_timeduration
...
time duration should be nano seconds, gccgo treats it as zero
Upstream-commit: 60b34cb957b224e28e6350bbebd629bec61730b5
Component: engine
2015-07-13 16:44:45 -06:00
76ff8db2cc
Merge pull request #14205 from YanFeng-Adam/patch
...
update testcase mount/sharedsubtree_linux_test.go
Upstream-commit: 363cc51e82cd69e91f81086f50a31c0ecc61f4b1
Component: engine
2015-07-13 14:28:30 -07:00
6ee4a354ae
time duration should be nano seconds, gccgo treats it as zero
...
Signed-off-by: Srini Brahmaroutu <srbrahma@us.ibm.com >
Upstream-commit: 6c4e14b3e233ba7359dfa51045937d761e28268e
Component: engine
2015-07-13 18:01:43 +00:00
13164e4231
Merge pull request #14583 from sagarhani/patch-1
...
Added entry for Sir M.Visvesvaraya
Upstream-commit: e13f9edfed5d431edddec0662ede132b797d94e4
Component: engine
2015-07-13 10:47:08 -06:00
6e65c312b4
Merge pull request #14569 from vdemeester/pkg-fileutils-tests
...
Add missing tests and docs for pkg/fileutils
Upstream-commit: 7ba54a46284d6658d0686ad0040c0ad99cb2c66f
Component: engine
2015-07-13 09:29:30 -07:00
9a60e47a81
Race test for pkg/pubsub package
...
Signed-off-by: Alexander Morozov <lk4d4@docker.com >
Upstream-commit: 8aa7ba731a954ffb626c2a07f524c8116ab3f212
Component: engine
2015-07-13 09:05:47 -07:00
4765b9898c
Merge pull request #14554 from Ajeey/added-notable-indian-scientists
...
Added notable indian scientists to names-generator.go
Upstream-commit: 161f5b27906af792a241bffb8537af66b268d715
Component: engine
2015-07-13 09:05:47 -07:00
71018bb017
Benchmark for pkg/pubsub package
...
Signed-off-by: Alexander Morozov <lk4d4@docker.com >
Upstream-commit: e5da4d62efe17c03ccca3c2707eb19b76afdc150
Component: engine
2015-07-13 09:02:16 -07:00
383889c82f
Added entry for Sir M.Visvesvaraya
...
Signed-off-by: Sagar Hani <sagarhani33@gmail.com >
Upstream-commit: 45dbdabdc737ca85926a03ea33df673979d2f18f
Component: engine
2015-07-13 17:20:45 +05:30
90e3aa44eb
Add missing tests and docs for pkg/fileutils
...
Signed-off-by: Vincent Demeester <vincent@sbr.pm >
Upstream-commit: 09adf87f23b3de97f90612c9bc08413053b81a14
Component: engine
2015-07-12 22:43:42 +02:00
11e2c4a554
Add the memory swappiness tuning option to docker.
...
Memory swappiness option takes 0-100, and helps to tune swappiness
behavior per container.
For example, When a lower value of swappiness is chosen
the container will see minimum major faults. When no value is
specified for memory-swappiness in docker UI, it is inherited from
parent cgroup. (generally 60 unless it is changed).
Signed-off-by: Raghavendra K T <raghavendra.kt@linux.vnet.ibm.com >
Upstream-commit: 921da495d24695dda66d3f58e78887dd0bc2402e
Component: engine
2015-07-12 13:16:33 +05:30
400b116f99
Added notable indian scientists to names-generator.go
...
Signed-off-by: Ajey Charantimath <ajey.charantimath@gmail.com >
Upstream-commit: c27b93ea26f3a168971360c4f54286ea8653528b
Component: engine
2015-07-11 20:11:22 +05:30
13ea01e391
Fix copy from a "created" container. Fixes #14420
...
Signed-off-by: Lei Jitang <leijitang@huawei.com >
Upstream-commit: 289ee90b04a2315cd36d6ff363b41c89f8ebf2aa
Component: engine
2015-07-08 11:15:09 +08:00
33df474b64
Merge pull request #13835 from cpuguy83/gen-prc
...
generate plugin clients via template
Upstream-commit: 806b3fa14529a97dfad8fad8ed2a21b26de94492
Component: engine
2015-07-07 17:17:39 -07:00
017d6047d5
added ability to iterate over all indexes and use index.Iterate() instead of ReadDir() to walk over the graph
...
Signed-off-by: Roman Strashkin <roman.strashkin@gmail.com >
Upstream-commit: cc955ae73c8aa234e0c41bdb65f111be79b32b90
Component: engine
2015-07-07 22:13:28 +03:00
9752456dbb
Merge pull request #14094 from rghv/master
...
Added entries of a few ancient Indian mathematicians who did cool things centuries ago.
Upstream-commit: bfc5966d0b787a059320c927d4cf530e301667b7
Component: engine
2015-07-07 12:03:28 -07:00
5ce830016b
devicemapper: Check loop devices of existing pool
...
Often it happens that docker is not able to shutdown/remove the thin
pool it created because some device has leaked into some mount name
space. That means device is in use and that means pool can't be removed.
Docker will leave pool as it is and exit. Later when user starts the
docker, it finds pool is already there and docker uses it. But docker
does not know it is same pool which is using the loop devices. Now
docker thinks loop devices are not being used. That means it does not
display the data correctly in "docker info", giving user wrong information.
This patch tries to detect if loop devices as created by docker are
being used for pool and fills in the right details in "docker info".
Signed-off-by: Vivek Goyal <vgoyal@redhat.com >
Upstream-commit: bebf53443981c70a6a714ea518dc966a0e2b6558
Component: engine
2015-07-07 14:13:29 -04:00
800d4df14d
Windows: Win32 event for sigusr1 linux equivalence
...
Signed-off-by: John Howard <jhoward@microsoft.com >
Upstream-commit: f4b08c7f5eed2eece239086f260eee9e736ee227
Component: engine
2015-07-06 18:58:53 -07:00
07c93dcdba
Merge pull request #14127 from vbatts/vbatts-dm-active-external
...
pkg/devicemapper: external device activation
Upstream-commit: c7492126ef68786a4c57e5e2affb7cba293be652
Component: engine
2015-07-06 14:07:33 -04:00
699674f3d1
Fixed outdated comment.
...
Synchronized the comment for httputils/mimetype.DetectContentType
with the actual code.
Signed-off-by: Moysés Borges <moysesb@gmail.com >
Upstream-commit: 8b0e40bb3840a755f60fdc823fbd1963aaa0c402
Component: engine
2015-07-02 08:17:11 -03:00
b22691d84a
Fix windows tag in pkg/term
...
Signed-off-by: Alexander Morozov <lk4d4@docker.com >
Upstream-commit: 7b3492df0c3c92215c2ed6f3e8b6cd8f7cf11855
Component: engine
2015-07-01 13:16:16 -07:00
67a917ff70
Merge pull request #14238 from rileytg/fix-graphdb-test-typo
...
fixed typo in graphdb_test failure message
Upstream-commit: bb2cd98b28249a9e98757f1a5591a9fc0ff3a2f7
Component: engine
2015-06-30 14:15:02 -07:00
7f4872fe6c
Merge pull request #14297 from pwaller/move-nat-pkg
...
Move /nat to /pkg/nat
Upstream-commit: caa4acc7b11cbefb74d0b066d4a0752f4a11c5ee
Component: engine
2015-06-30 13:23:30 -07:00
335520845a
Merge pull request #13524 from calavera/plugin_json_spec
...
Plugins JSON spec.
Upstream-commit: f13b40f6e7678753f3414a75a6b0d175bc4d1d3f
Component: engine
2015-06-30 15:44:48 -04:00
d99f89f02c
Merge pull request #14268 from unclejack/lower_allocations_execdriver
...
daemon: lower allocations
Upstream-commit: bb364ff459e8ebcc601a13057a1477336646474b
Component: engine
2015-06-30 12:12:06 -07:00
9161e24479
Move /nat to /pkg/nat
...
By convention /pkg is safe to use from outside the docker tree, for example
if you're building a docker orchestrator.
/nat currently doesn't have any dependencies outside of /pkg, so it seems
reasonable to move it there.
This rename was performed with:
```
gomvpkg -vcs_mv_cmd="git mv {{.Src}} {{.Dst}}" \
-from github.com/docker/docker/nat \
-to github.com/docker/docker/pkg/nat
```
Signed-off-by: Peter Waller <p@pwaller.net >
Upstream-commit: 9c2374d19623581028f070bc93fa4c60a660dce4
Component: engine
2015-06-30 17:43:17 +01:00
b565b94e85
daemon: lower allocations
...
Signed-off-by: Cristian Staretu <cristian.staretu@gmail.com >
Upstream-commit: c1477db04fc32621652cf6a8fd2976b6bbf2066e
Component: engine
2015-06-30 01:45:31 +03:00
009fa2d15e
Merge pull request #14269 from vdemeester/pkg-parsers-test-coverage
...
Add and refactor tests for pkg/parsers{,*}
Upstream-commit: 20467faf132b113a4771fe665e2ce7335de94063
Component: engine
2015-06-29 15:24:14 -07:00
bfd9d20e79
Add test coverage to pkg/parsers
...
Signed-off-by: Vincent Demeester <vincent@sbr.pm >
Upstream-commit: b81472a6d861b335d968a1e970d9aebc314530f2
Component: engine
2015-06-29 22:30:11 +02:00
7b3bea6e05
Plugins JSON spec.
...
Allow full configuration of external plugins via a JSON document.
Signed-off-by: David Calavera <david.calavera@gmail.com >
Upstream-commit: 333ac3a3eb09c29c42fe2cea1680621700b67b2f
Component: engine
2015-06-29 10:32:18 -07:00
972e3c452c
fixed typo in graphdb_test failure message
...
Signed-off-by: Riley Guerin <rileytg.dev@gmail.com >
Upstream-commit: c9175d681bcd2e3c4d8c3fee7cc8114731bb07a7
Component: engine
2015-06-28 16:54:05 -07:00
