ac3f7c71b8
Merge pull request #14698 from duglin/AddErr
...
Add missing 'err' to Fatalf to help debug an issue
2015-07-16 21:42:42 -07:00
97c5f64001
Add missing 'err' to Fatalf to help debug an issue
...
Signed-off-by: Doug Davis <dug@us.ibm.com>
2015-07-16 20:27:14 -07:00
15cb7dfc9e
Merge pull request #14578 from mountkin/fix-rmi-image-not-found
...
don't allow deleting the image of running containers
2015-07-16 18:02:51 -07:00
c86189d554
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>
2015-07-16 16:02:26 -07:00
6c0795747b
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>
2015-07-16 14:20:07 -07:00
19515a7ad8
Update graph to use vendored distribution client for the v2 codepath
...
Signed-off-by: Derek McGowan <derek@mcgstyle.net> (github: dmcgowan)
Signed-off-by: Tibor Vass <tibor@docker.com>
2015-07-16 13:13:47 -04:00
71868228c7
Refactor : Use dockerCmd in integration-cli tests
...
Signed-off-by: Hu Keping <hukeping@huawei.com>
2015-07-17 04:07:12 +08:00
ce6410cd4c
don't allow deleting the image of running containers
...
Signed-off-by: Shijiang Wei <mountkin@gmail.com>
2015-07-16 13:14:48 +08:00
e98a881570
Merge pull request #14624 from vdemeester/14603-dockerCmd-integration-cli-1
...
Integration test refactors to use dockerCmd
2015-07-15 14:03:58 -04:00
5c295460da
Use dockerCmd when possible ( #14603 )
...
- integration-cli/docker_cli_attach_test.go
- integration-cli/docker_cli_attach_unix_test.go
- integration-cli/docker_cli_build_test.go
- integration-cli/docker_cli_build_unix_test.go
- integration-cli/docker_cli_by_digest_test.go
- integration-cli/docker_cli_commit_test.go
- integration-cli/docker_cli_config_test.go
- integration-cli/docker_cli_cp_test.go
- integration-cli/docker_cli_create_test.go
- integration-cli/docker_cli_pause_test.go
- integration-cli/docker_cli_port_test.go
- integration-cli/docker_cli_port_unix_test.go
- integration-cli/docker_cli_proxy_test.go
- integration-cli/docker_cli_ps_test.go
- integration-cli/docker_cli_pull_test.go
- integration-cli/docker_cli_push_test.go
- docker_api_attach_test.go
- docker_api_containers_test.go
- docker_api_events_test.go
- docker_api_exec_resize_test.go
- docker_api_exec_test.go
- docker_api_images_test.go
- docker_api_info_test.go
Signed-off-by: Vincent Demeester <vincent@sbr.pm>
2015-07-14 21:52:43 +02:00
4290bdefab
Add dockerCmdWithError
...
Signed-off-by: Vincent Demeester <vincent@sbr.pm>
2015-07-14 08:35:06 +02:00
35b0223921
Merge pull request #10717 from mrunalp/feature/group_add
...
Adds support for specifying additional groups.
2015-07-13 17:08:05 -07:00
0b7938e845
Adds test for additional groups.
...
Signed-off-by: Mrunal Patel <mrunalp@gmail.com>
2015-07-13 14:47:28 -04:00
d3566fa0b1
Cleanup not needed calls to deleteImages
...
Signed-off-by: Antonio Murdaca <runcom@linux.com>
2015-07-13 20:30:53 +02:00
0f466c36b9
Merge pull request #14500 from runcom/add-diff-emtpy-arg-test
...
Add diff command with emtpy string testcase
2015-07-13 11:30:31 -06:00
1f963af697
Merge pull request #14586 from Tenk42/14362-Improve-sockRequestRaw-check
...
Improve sockRequest and sockRequestRaw check
2015-07-13 15:59:39 +02:00
441ae6c943
Merge pull request #14004 from ktraghavendra/13938_container_swappiness
...
Add the memory swappiness tuning option to docker.
2015-07-13 09:22:08 -04:00
fa6925aa9b
Improve sockRequest and sockRequestRaw check
...
Signed-off-by: Quentin Tayssier <qtayssier@gmail.com>
2015-07-13 21:49:08 +09:00
26ce3f4c90
Add minor vet fixes
...
Signed-off-by: Antonio Murdaca <runcom@linux.com>
2015-07-12 19:16:38 +02:00
921da495d2
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>
2015-07-12 13:16:33 +05:30
703248da20
Merge pull request #13669 from ewindisch/readonly-proc
...
Make /proc, /sys, & /dev readonly for readonly containers
2015-07-10 15:32:13 -07:00
5bf98dd997
Merge pull request #12856 from duglin/ConfigLocation
...
Add support for DOCKER_CONFIG/--config to specify config file dir
2015-07-10 23:05:49 +02:00
daced1d303
Add support for DOCKER_CONFIG/--config to specific config file dir
...
Carry #11675
Aside from what #11675 says, to me a key usecase for this is to support
more than one Docker cli running at the same time but each may have its
own set of config files.
Signed-off-by: Doug Davis <dug@us.ibm.com>
2015-07-10 12:51:34 -07:00
20ac0e6164
Merge pull request #14306 from Microsoft/validatepsfilter
...
Validate status= filter to docker ps
2015-07-10 15:43:01 -04:00
1dd2fda394
Merge pull request #13312 from hqhq/hq_enable_cgroupfs
...
Add cgroup bind mount by default
2015-07-10 10:45:05 -07:00
72b75cd4e7
More extensive testing of new GC of execs
...
This is a follow-on to PR #14520 .
PR #14520 is the quick fix to get the testing working again.
This PR makes sure that the list of execs associated with a container goes
from zero to one (as a new exec is run), then back to zero when the exec is
finished. However, we should be able to query the exec while the container
is still around, and even though the exec isn't listed in the container's
inspect data.
Signed-off-by: Doug Davis <dug@us.ibm.com>
2015-07-10 07:27:11 -07:00
899c85b405
Minor fix to the exec inspect test
...
Signed-off-by: Doug Davis <dug@us.ibm.com>
2015-07-10 06:19:03 -07:00
f18fb5b3ef
Add cgroup bind mount by default
...
Libcontainer already supported mount container's own cgroup into
container, with this patch, we can see container's own cgroup info
in container.
Signed-off-by: Qiang Huang <h.huangqiang@huawei.com>
2015-07-10 13:12:09 +08:00
6e64e0548f
Merge pull request #14514 from hqhq/hq_fix_file_leak
...
Fix file leak in integration-cli
2015-07-09 21:52:59 -04:00
56e8a99b61
Merge pull request #14480 from Microsoft/fix-windows-ci
...
Fix Windows CI fail due to GH13866
2015-07-09 16:37:41 -07:00
a8715ea220
Port POST container attach tests
...
Signed-off-by: Megan Kostick <mkostick@us.ibm.com>
2015-07-09 12:52:45 -07:00
c1b524486c
Fix Windows CI fail due to GH13866 and patch up tests
...
Signed-off-by: John Howard <jhoward@microsoft.com>
2015-07-09 10:09:45 -07:00
9d84d4c2cc
Add diff command with emtpy string testcase
...
Signed-off-by: Antonio Murdaca <runcom@linux.com>
2015-07-09 18:46:38 +02:00
37771c122b
Merge pull request #14498 from calavera/fix_volume_from_references
...
Fix volumes-from mount references.
2015-07-09 12:34:27 -04:00
5369b6cf29
Merge pull request #14348 from sunyuan3/TestPullImageWithAllTagFromCentralRegistry
...
Add TestPullImageWithAllTagFromCentralRegistry test case.
2015-07-09 09:56:53 -06:00
3d029c3bf3
Fix volumes-from mount references.
...
Signed-off-by: David Calavera <david.calavera@gmail.com>
2015-07-09 09:01:57 -06:00
d28b0ba115
Fix file leak in integration-cli
...
Signed-off-by: Qiang Huang <h.huangqiang@huawei.com>
2015-07-09 18:52:18 +08:00
67058e388b
Remove prefix dots from inspects in tests
...
Dots prepended to key in inspectField function
Signed-off-by: Alexander Morozov <lk4d4@docker.com>
2015-07-08 12:41:05 -07:00
c9a4c1401f
Add TestPullImageWithAllTagFromCentralRegistry test case.
...
Signed-off-by: Yuan Sun <sunyuan3@huawei.com>
2015-07-08 19:47:33 +08:00
289ee90b04
Fix copy from a "created" container. Fixes #14420
...
Signed-off-by: Lei Jitang <leijitang@huawei.com>
2015-07-08 11:15:09 +08:00
2cd417df73
Merge pull request #14388 from runcom/14316-fix-events-filters
...
Fix combined image events filters
2015-07-07 18:08:56 -07:00
a5283d2ff3
Merge pull request #13866 from brahmaroutu/runOOM_13766
...
RunOOM test should check to see if Oom Control is enabled
2015-07-07 16:21:46 -07:00
e3966c1031
Merge pull request #14380 from sunyuan3/TestRunCapAddCHOWN
...
add TestRunCapAddCHOWN test case
2015-07-07 12:36:14 -07:00
10bbf62081
Merge pull request #14375 from coolljt0725/fix_test_events_default_empty
...
Fix test TestEventsDefaultEmpty. Fixes #14360
2015-07-07 10:37:40 -04:00
61418e39d5
Merge pull request #14428 from sunyuan3/TestPushBusyboxImage
...
Correct wrong comment of TestPushBusyboxImage.
2015-07-07 14:44:08 +02:00
f244ed2531
Correct wrong comment of TestPushBusyboxImage.
...
Signed-off-by: Yuan Sun <sunyuan3@huawei.com>
2015-07-07 16:10:37 +08:00
2802831218
Fix test TestEventsDefaultEmpty. Fixes #14360
...
Signed-off-by: Lei Jitang <leijitang@huawei.com>
2015-07-07 11:27:00 +08:00
e7fb38410d
RunOOM test should check to see if Oom Control is enabled
...
closes #13766
Signed-off-by: Srini Brahmaroutu <srbrahma@us.ibm.com>
2015-07-06 21:15:55 +00:00
6e4c6da819
Fix integration tests with testRequires(c, Network)
...
It seems http://hub.docker.com is not accessible anymore, so switching
to https://hub.docker.com for testRequires(c, Network).
Adds a Timeout check on the TestRequirement to *panic* if there is a
timeout (fail fast).
Signed-off-by: Vincent Demeester <vincent@sbr.pm>
2015-07-06 22:08:35 +02:00
19e6de2654
Fix combined image events filters
...
Signed-off-by: Antonio Murdaca <runcom@linux.com>
2015-07-04 00:19:08 +02:00
230179c8dc
add TestRunCapAddCHOWN test case
...
Signed-off-by: Yuan Sun <sunyuan3@huawei.com>
2015-07-03 23:25:52 +08:00
801a7fed19
api/server: Add missing json check
...
Signed-off-by: Ma Shimiao <mashimiao.fnst@cn.fujitsu.com>
2015-07-03 08:52:32 +08:00
7bf26d44b0
Validate status= filter to docker ps
...
Signed-off-by: John Howard <jhoward@microsoft.com>
2015-07-02 16:12:42 -07:00
5400d8873f
Make /proc, /sys, /dev readonly for readonly containers
...
If a container is read-only, also set /proc, /sys,
& /dev to read-only. This should apply to both privileged and
unprivileged containers.
Note that when /dev is read-only, device files may still be
written to. This change will simply prevent the device paths
from being modified, or performing mknod of new devices within
the /dev path.
Tests are included for all cases. Also adds a test to ensure
that /dev/pts is always mounted read/write, even in the case of a
read-write rootfs. The kernel restricts writes here naturally and
bad things will happen if we mount it ro.
Signed-off-by: Eric Windisch <eric@windisch.us>
2015-07-02 19:08:00 +00:00
71f8ca30ce
Merge pull request #14359 from cpuguy83/14354_events_send_resp_immediately
...
Send resp immediately on GET /events
2015-07-02 12:00:45 -07:00
d0a299c027
Send resp immediately on GET /events
...
Signed-off-by: Brian Goff <cpuguy83@gmail.com>
2015-07-02 11:45:24 -04:00
98f988f62c
Merge pull request #13187 from shishir-a412ed/docker_inspect_issue
...
Flag Addition: --type flag added for docker inspect command
2015-07-02 01:31:15 +02:00
75864dcb38
Merge pull request #14324 from aboch/ds
...
Stats API to retrieve nw stats from libnetwork
2015-07-01 15:19:46 -07:00
10a3061c5f
Fix regression in parsing capabilities list when a single string is given
...
Signed-off-by: Antonio Murdaca <runcom@linux.com>
2015-07-01 21:28:02 +02:00
8b40e44c39
Stats API to retrieve nw stats from libnetwork
...
- Container networking statistics are no longer
retrievable from libcontainer after the introduction
of libnetwork. This change adds the missing code
for docker daemon to retireve the nw stats from
Endpoint.
Signed-off-by: Alessandro Boch <aboch@docker.com>
2015-07-01 11:15:16 -07:00
53b897ce9c
Merge pull request #13744 from turtlebender/feature/whitelist-label-for-commit
...
Support LABEL as change for `docker commit`
2015-07-01 10:57:33 -07:00
5fd0563505
Merge pull request #14322 from runcom/14320-fix-regression-attach-cont-notfound
...
Return not found before hijacking in attach/wsattach
2015-07-01 13:22:03 -04:00
88d32a6109
Fix regression in containers attach/wsattach api, return not found before hijacking
...
Signed-off-by: Antonio Murdaca <runcom@linux.com>
2015-07-01 18:16:17 +02:00
2cb74e6915
Flag Addition: --type flag added for docker inspect command
...
Signed-off-by: Shishir Mahajan <shishir.mahajan@redhat.com>
2015-07-01 12:14:01 -04:00
2179dd00dd
Add the expected error verification for TestRmiBlank.
...
Signed-off-by: Yuan Sun <sunyuan3@huawei.com>
2015-07-01 19:34:43 +08:00
a2621ac6da
Merge pull request #14294 from mavenugo/bnone
...
fixed incorrect assumption on --bridge=none treated as disable network
2015-06-30 13:40:52 -07:00
caa4acc7b1
Merge pull request #14297 from pwaller/move-nat-pkg
...
Move /nat to /pkg/nat
2015-06-30 13:23:30 -07:00
c9328c6ccf
fixed incorrect assumption on --bridge=none treated as disable network
...
libnetwork host, none and bridge driver initialization is incorrectly
disabled if the daemon flag --bridge=none. The expected behavior of
setting --bridge as none is to disable the bridge driver alone and let
all other modes to be operational.
Signed-off-by: Madhu Venugopal <madhu@docker.com>
2015-06-30 13:04:28 -07:00
2de810df3f
Merge pull request #14231 from ankushagarwal/checkValidPort
...
Validate hostConfig on daemon. Check for invalid port specifications
2015-06-30 15:54:24 -04:00
2d8dd6b93e
Merge pull request #12846 from dave-tucker/network_integration
...
integration-cli: Add Tests for IPv6 and Fixed CIDR
2015-06-30 12:52:07 -07:00
f13b40f6e7
Merge pull request #13524 from calavera/plugin_json_spec
...
Plugins JSON spec.
2015-06-30 15:44:48 -04:00
477201a295
Validate Port specifications on daemon side
...
Fixes #14230
Signed-off-by: Ankush Agarwal <ankushagarwal11@gmail.com>
2015-06-30 12:14:49 -07:00
9c2374d196
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>
2015-06-30 17:43:17 +01:00
475ae0889e
Merge pull request #14218 from calavera/fix_exec_user
...
Default process user to container config user.
2015-06-29 14:31:45 -07:00
0faa4518ed
Default process user to container config user.
...
Signed-off-by: David Calavera <david.calavera@gmail.com>
2015-06-29 12:52:05 -07:00
333ac3a3eb
Plugins JSON spec.
...
Allow full configuration of external plugins via a JSON document.
Signed-off-by: David Calavera <david.calavera@gmail.com>
2015-06-29 10:32:18 -07:00
2dfb7f3b7d
integration-cli: Add Tests for IPv6 and Fixed CIDR
...
This patch adds tests for the `--ipv6` and `--fixed-cidr` daemon flags
Signed-off-by: Dave Tucker <dt@docker.com>
2015-06-29 14:45:00 +01:00
17d6f00ec2
Fix unmarshalling of Command and Entrypoint
...
Signed-off-by: Brian Goff <cpuguy83@gmail.com>
2015-06-26 09:00:57 -07:00
9bb69f9726
Fix endpoint leave failure for --net=host mode
...
When a container is started with `--net=host` with
a particular name and it is subsequently destroyed,
then all subsequent creations of the container with
the same name will fail. This is because in `--net=host`
the namespace is shared i.e the host namespace so
trying to destroy the host namespace by calling
`LeaveAll` will fail and the endpoint is left with
the dangling state. So the fix is, for this mode, do
not attempt to destroy the namespace but just cleanup
the endpoint state and return.
Signed-off-by: Jana Radhakrishnan <mrjana@docker.com>
2015-06-24 12:33:52 -07:00
aa4f495cae
Merge pull request #13966 from mountkin/fix-stats-goroutine-leak
...
fix the goroutine leak in the stats API if the container is not running
2015-06-23 10:06:35 -07:00
1cbf5a54da
fix the goroutine leak in the stats API if the container is not running
...
Signed-off-by: Shijiang Wei <mountkin@gmail.com>
2015-06-23 19:38:15 +08:00
87eae0d659
Add branch and build time to version
...
Signed-off-by: John Howard <jhoward@microsoft.com>
2015-06-22 13:00:27 -07:00
f39b9a0b0f
Merge pull request #14071 from mavenugo/mhnet
...
Vendoring libnetwork 83743db8ceb2bdbfa0960d9a54ed2f98df4ea846
2015-06-22 08:35:18 -07:00
508065a7ad
Vendoring in libnetwork for native multihost networking
...
- brings in vxlan based native multihost networking
- added a daemon flag required by libkv for dist kv operations
- moved the daemon flags to experimental
Signed-off-by: Madhu Venugopal <madhu@docker.com>
2015-06-22 04:15:41 -07:00
7491f9a9c1
Merge pull request #12099 from moysesb/12078-binary_remote_context
...
Handle binary remote contexts when creating builder jobs.
2015-06-21 13:59:26 -07:00
fef0e84b2d
Merge pull request #14051 from mavenugo/services
...
experimental services ui
2015-06-20 18:24:37 -07:00
67f9bbcbd4
Merge pull request #11907 from gcuisinier/11094-allow-import-from-file2
...
fix #11094 - Allow 'docker import' to load from local files
2015-06-20 12:17:58 -07:00
1ac350a0ec
Support for --publish-service flag in docker run
...
This commit makes use of the CNM model supported by LibNetwork and
provides an ability to let a container to publish a specified service.
Behind the scenes, if a service with the given name doesnt exist, it is
automatically created on appropriate network and attach the container.
Signed-off-by: Alessandro Boch <aboch@docker.com>
Signed-off-by: Madhu Venugopal <madhu@docker.com>
2015-06-20 11:03:38 -07:00
3f64b76d4c
work on #11094 allow import from local file
...
Signed-off-by: Gildas Cuisinier <gildas.cuisinier@gcuisinier.net>
2015-06-20 09:04:43 +02:00
e5ded9c378
Merge pull request #13997 from runcom/drop-old-client
...
Error out if client API version is too old
2015-06-19 17:05:39 -07:00
d48bface59
Support downloading remote tarball contexts in builder jobs.
...
Signed-off-by: Moysés Borges <moysesb@gmail.com>
2015-06-19 16:35:00 -03:00
7ce20fad99
Merge pull request #13780 from LK4D4/use_checkv
...
Remove timer and use -check.v for tests formatting
2015-06-19 11:34:31 -07:00
742db1737c
attaching services api and UI chain to docker parent
...
Signed-off-by: Madhu Venugopal <madhu@docker.com>
2015-06-19 09:19:09 -07:00
4253a1f87e
Remove timer and use -check.v for tests formatting
...
Signed-off-by: Alexander Morozov <lk4d4@docker.com>
2015-06-18 14:22:40 -07:00
da5a3e6dee
register libnetwork API and UI with docker parent chain
...
This commit also brings in the ability to specify a default network and its
corresponding driver as daemon flags. This helps in existing clients to
make use of newer networking features provided by libnetwork.
Signed-off-by: Madhu Venugopal <madhu@docker.com>
2015-06-18 12:07:58 -07:00
910322a893
Error out if client API version is too old
...
Signed-off-by: Antonio Murdaca <runcom@linux.com>
2015-06-18 11:03:07 +02:00
b8301005ff
Use distribution's ValidateRepositoryName for remote name validation.
...
Signed-off-by: Shishir Mahajan <shishir.mahajan@redhat.com>
2015-06-17 15:15:16 -04:00
e69df2589c
Merge pull request #13198 from rhvgoyal/extend-docker-inspect
...
docker-inspect: Extend docker inspect to export image metadata related to graph driver
2015-06-16 15:03:14 -05:00
6e2662b3ba
just adding label to whitelist for commit command ( Fixes #13738 )
...
Signed-off-by: Tom Howe <turtlebender@gmail.com>
2015-06-16 13:59:16 -05:00
b1f984a29f
Merge pull request #13970 from cpuguy83/13964_fix_tlsverify_env
...
Fix DOCKER_TLS_VERIFY being ignored
2015-06-16 10:24:41 -07:00
Alexander Morozov
Doug Davis
David Calavera
Alexander Morozov
Derek McGowan
Hu Keping
Shijiang Wei
Brian Goff
Vincent Demeester
Jessie Frazelle
Mrunal Patel
Antonio Murdaca
Antonio Murdaca
Phil Estes
Quentin Tayssier
Raghavendra K T
Sebastiaan van Stijn
Michael Crosby
Qiang Huang
Megan Kostick
John Howard
Yuan Sun
Lei Jitang
Arnaud Porterie
root
Ma Shimiao
Eric Windisch
Alessandro Boch
Shishir Mahajan
Madhu Venugopal
Ankush Agarwal
Peter Waller
Dave Tucker
Jana Radhakrishnan
Gildas Cuisinier
Moysés Borges
Vincent Batts
Tom Howe