4354b348ad
fix default shm size in test
...
Signed-off-by: Jessica Frazelle <acidburn@docker.com>
2015-12-02 12:43:51 -08:00
aa2ca5d93c
Merge pull request #18371 from sallyom/dontReturnNonError
...
don't return error if can't delete non-existing container
2015-12-02 11:59:50 -08:00
8f1f53f735
Merge pull request #16277 from runcom/add-oom-score-adj
...
Add OomScoreAdj
2015-12-02 11:49:51 -08:00
f411b101ac
Merge pull request #18285 from hqhq/hq_fix_swappiness
...
Set default MemorySwappiness when adapt
2015-12-02 14:25:08 -05:00
d4be46def4
Merge pull request #13587 from rhatdan/volume-tmpfs
...
Add tmpfs as a valid volume source command.
2015-12-02 11:16:49 -08:00
bfa5027e96
don't return error if can't delete non-existing container
...
Signed-off-by: Sally O'Malley <somalley@redhat.com>
2015-12-02 13:48:59 -05:00
fcccf2dae4
Merge pull request #18350 from duglin/Issue9798a
...
Deprecate -f flag from docker tag
2015-12-02 08:16:09 -08:00
3241b564a5
Differentiate integration test error messages
...
Makes it easier to debug in the future given three different docker run
executions were all outputting the same error string.
Docker-DCO-1.1-Signed-off-by: Phil Estes <estesp@linux.vnet.ibm.com> (github: estesp)
2015-12-02 10:25:00 -05:00
b3e527dfd2
This patch adds --tmpfs as a option for mounting tmpfs on directories
...
It will Tar up contents of child directory onto tmpfs if mounted over
This patch will use the new PreMount and PostMount hooks to "tar"
up the contents of the base image on top of tmpfs mount points.
Signed-off-by: Dan Walsh <dwalsh@redhat.com>
2015-12-02 10:06:59 -05:00
2969abc6c5
Move defaultSHMSize in daemon pkg
...
Signed-off-by: Antonio Murdaca <runcom@redhat.com>
2015-12-02 10:28:10 +01:00
8d4fe141c4
Deprecate -f flag from docker tag
...
Closes #9798
@maintainers please note that this is a change to the UX. We no longer
require the -f flag on `docker tag` to move a tag from an existing image.
However, this does make us more consistent across our commands,
see https://github.com/docker/docker/issues/9798 for the history.
Signed-off-by: Doug Davis <dug@us.ibm.com>
2015-12-01 19:53:49 -08:00
4089b4e440
Set default MemorySwappiness when adapt
...
It makes the inspect result consistent between cli and REST api
when MemorySwappiness is not set.
Signed-off-by: Qiang Huang <h.huangqiang@huawei.com>
2015-12-02 10:53:52 +08:00
da0c9286a9
Merge pull request #18315 from jfrazelle/change-frozen-image-v2
...
update download-frozen-image.sh to v2 registry
2015-12-01 17:12:00 -05:00
359d0c247f
update download-frozen-image.sh to v2 registry
...
Signed-off-by: Jessica Frazelle <acidburn@docker.com>
2015-12-01 13:16:42 -08:00
ef1d410b02
fix shm size handling
...
Signed-off-by: Antonio Murdaca <runcom@redhat.com>
2015-12-01 16:29:40 +01:00
c247b3d104
Merge pull request #18318 from calavera/fix_dns_setting_on_hostconfig_start
...
Make sure container start doesn't make the DNS fields nil.
2015-12-01 12:43:16 +01:00
657085dfdb
Merge pull request #18198 from aditirajagopal/16756-docker_api_inspect_test
...
Checkers on docker_api_inspect_test.go
2015-12-01 09:56:01 +01:00
d7117a1b71
Make sure container start doesn't make the DNS fields nil.
...
Signed-off-by: David Calavera <david.calavera@gmail.com>
2015-11-30 22:46:31 -05:00
85e5b05018
Checkers on docker_api_inspect_test.go
...
Applying #16756 to integration-cli/docker_api_inspect_test.go
Signed-off-by: Aditi Rajagopal <arajagopal@us.ibm.com>
2015-11-30 16:23:46 -06:00
dc9f9d9445
Merge pull request #18216 from aditirajagopal/16756-docker_api_containers_test
...
Checkers on docker_api_containers_test
2015-11-30 14:04:54 -08:00
4bdf957c26
Checkers on docker_api_containers_test
...
Applying #16756 to integration-cli/docker_api_containers_test.go
Signed-off-by: Aditi Rajagopal <arajagopal@us.ibm.com>
2015-11-30 14:31:48 -06:00
54733abba3
Merge pull request #18148 from aditirajagopal/16756-docker_api_info_test
...
Checkers on integration-cli/docker_api_info_test
2015-11-30 11:06:15 -08:00
7bef428110
Merge pull request #18306 from runcom/add-test-suffix
...
integration-cli: add _test suffix to test file
2015-11-30 17:02:15 +01:00
a26accfb5d
Merge pull request #18226 from duglin/Issue18170
...
Fix for zero-sized layers
2015-11-30 09:57:37 -06:00
f3ff09f578
Merge pull request #18272 from hqhq/hq_fix_kernel_memory
...
Fix kernel memory limit
2015-11-30 10:01:45 -05:00
1f0f41e8d7
integration-cli: add _test suffix to test file
...
Signed-off-by: Antonio Murdaca <runcom@redhat.com>
2015-11-30 11:33:57 +01:00
d3af7f283d
Add OomScoreAdj to configure container oom killer preferences
...
libcontainer v0.0.4 introduces setting `/proc/self/oom_score_adj` to
better tune oom killing preferences for container process. This patch
simply integrates OomScoreAdj libcontainer's config option and adjust
the cli with this new option.
Signed-off-by: Antonio Murdaca <amurdaca@redhat.com>
Signed-off-by: Antonio Murdaca <runcom@redhat.com>
2015-11-30 11:19:04 +01:00
0a426c47c8
Update cgroup integration tests
...
Cgroup integtaion tests should cover:
- docker can run sucessfully with these options
- these cgroup options are set to HostConfig as expected
- these cgroup options are really set to cgroup files as expected
- other cases (wrong value, combinations etc..)
Signed-off-by: Qiang Huang <h.huangqiang@huawei.com>
2015-11-30 08:40:47 +08:00
dd7b4fd651
Fix kernel memory limit
...
Signed-off-by: Qiang Huang <h.huangqiang@huawei.com>
2015-11-28 09:47:25 +08:00
4c3c3fedf8
integration-cli: docker_cli_pull_local_test.go: remove not needed Commentf(s)
...
Signed-off-by: Antonio Murdaca <runcom@redhat.com>
2015-11-27 17:10:09 +01:00
a415b0c220
Merge pull request #18199 from aditirajagopal/16756-docker_cli_pull_local_test
...
Checkers on docker_cli_pull_local_test.go
2015-11-27 17:04:28 +01:00
b8c21783f0
Merge pull request #17108 from coolljt0725/fix_remove_image
...
Fix docker rmi trying to remove a being used parent
2015-11-26 12:21:30 -08:00
7bb9fc415a
Fix for zero-sized layers
...
Moved a defer up to a better spot.
Fixed TestUntarPathWithInvalidDest to actually fail for the right reason
Closes #18170
Signed-off-by: Doug Davis <dug@us.ibm.com>
2015-11-25 18:02:03 -08:00
0bbc9f1d2d
Fix docker rmi trying to remove a being used parent
...
Signed-off-by: Lei Jitang <leijitang@huawei.com>
2015-11-26 09:57:20 +08:00
49088b0b89
Merge pull request #18243 from jfrazelle/fix-test
...
fix consistetly failing TestContainerRestartSuccess
2015-11-25 17:07:17 -05:00
f91115e3a2
fix consistetly failing TestContainerRestartSuccess on windows it looks up pids and does unixy things
...
Signed-off-by: Jessica Frazelle <acidburn@docker.com>
2015-11-25 13:04:59 -08:00
1beb450fa6
Merge pull request #18215 from mountkin/test-for-18181
...
add a test to make sure port is allowed in images filter
2015-11-25 10:14:09 -05:00
899caaca9c
Fix spelling of 'existent'
...
Signed-off-by: Bryan Boreham <bjboreham@gmail.com>
2015-11-25 13:45:37 +00:00
8819b530db
add a test to make sure port is allowed in images filter
...
Signed-off-by: Shijiang Wei <mountkin@gmail.com>
2015-11-25 10:46:23 +08:00
bc2682badc
Checkers on docker_cli_pull_local_test.go
...
Applying #16756 to integration-cli/docker_cli_pull_local_test.go
Signed-off-by: Aditi Rajagopal <arajagopal@us.ibm.com>
2015-11-24 12:53:43 -05:00
4352da7803
Update daemon and docker core to use new content addressable storage
...
Add distribution package for managing pulls and pushes. This is based on
the old code in the graph package, with major changes to work with the
new image/layer model.
Add v1 migration code.
Update registry, api/*, and daemon packages to use the reference
package's types where applicable.
Update daemon package to use image/layer/tag stores instead of the graph
package
Signed-off-by: Aaron Lehmann <aaron.lehmann@docker.com>
Signed-off-by: Tonis Tiigi <tonistiigi@gmail.com>
2015-11-24 09:40:25 -08:00
d53a9bcb13
Checkers on docker_api_inspect_unix_test.go
...
Applying #16756 to integration-cli/docker_api_inspect_unix_test.go
Signed-off-by: Aditi Rajagopal <arajagopal@us.ibm.com>
2015-11-23 22:03:14 -05:00
5cfa13ae48
Checkers on integration-cli/docker_api_info_test
...
Applying #16756 to integration-cli/docker_api_info_test.go
Signed-off-by: Aditi Rajagopal <arajagopal@us.ibm.com>
2015-11-23 14:28:41 -05:00
463c53c715
Checkers on integration-cli/docker_api_images_test
...
Applying #16756 to integration-cli/docker_api_images_test.go
Signed-off-by: Aditi Rajagopal <arajagopal@us.ibm.com>
2015-11-23 10:33:32 -05:00
a600bf4eab
Merge pull request #17489 from WeiZhang555/network-rm-multi
...
Enhance `docker network rm` to delete multi net
2015-11-23 08:25:33 +01:00
e7eb6687ef
Enhance `docker network rm` to delete multi net
...
This commit enhance `docker network rm` command to allow user to delete
multi networks at the same time.
Signed-off-by: Zhang Wei <zhangwei555@huawei.com>
2015-11-22 05:37:00 +08:00
3ff9bb5332
Merge pull request #16613 from WeiZhang555/docker-cp-symlink
...
Add option `-L` to allow `docker cp` follow symbol link
2015-11-21 17:03:24 +01:00
048280ca42
Merge pull request #18134 from hypriot/17802-fix-integration-tests-for-arm
...
Increase timeouts to fix integration-cli tests on ARM
2015-11-20 15:05:26 -08:00
6653f82796
Merge pull request #17495 from mikebrow/docker-tz-and-nanosecond-updates
...
modifying docker --since and --until to support nanoseconds and time …
2015-11-20 23:37:44 +01:00
88c1bc10c4
Increase timeouts to fix test on ARM
...
Signed-off-by: Stefan Scherer <scherer_stefan@icloud.com>
2015-11-20 23:12:12 +01:00
Jessica Frazelle
David Calavera
Arnaud Porterie
Brian Goff
Sally O'Malley
Jess Frazelle
Phil Estes
Dan Walsh
Antonio Murdaca
Doug Davis
Qiang Huang
Phil Estes
Tibor Vass
Vincent Demeester
Aditi Rajagopal
Vincent Batts
Antonio Murdaca
Antonio Murdaca
Alexander Morozov
Lei Jitang
Bryan Boreham
Shijiang Wei
Tonis Tiigi
Zhang Wei
Michael Crosby
Stefan Scherer