f701770bee
Fix TestRenameStoppedContainer race
...
Signed-off-by: Antonio Murdaca <me@runcom.ninja >
Upstream-commit: cd6cc45d52a135e9e123c2e8c647710a061d38a0
Component: engine
2015-04-23 16:11:46 +02:00
32da7ca556
Merge pull request #12579 from ZJU-SEL/remove_job_from_load
...
remove job from load
Upstream-commit: 1b4de6f2e8d7bfafbf8df5e13ad24e409c21edb0
Component: engine
2015-04-23 08:20:37 -04:00
f26d981f04
Merge pull request #12663 from Mashimiao/Move-setHostConfig-to-daemon-file
...
Move setHostConfig to daemon file
Upstream-commit: d59ce5cd48ddb7eec7bbf768e50dd730003dad4d
Component: engine
2015-04-23 07:43:42 -04:00
b609417259
Merge pull request #12680 from Mashimiao/fix-typo-push-test
...
push test: fix typo
Upstream-commit: f4cfaac5190bd52dc63948e781065d0519b0f686
Component: engine
2015-04-23 07:37:50 -04:00
ece94d0722
remove job from load
...
Signed-off-by: Simei He <hesimei@zju.edu.cn >
Signed-off-by: He Simei <hesimei@zju.edu.cn >
Upstream-commit: 70bb0d8ed7847d7e7850a1a864ff258767f0ad7a
Component: engine
2015-04-23 19:13:12 +08:00
0b4dffa97c
push test: fix typo
...
Signed-off-by: Ma Shimiao <mashimiao.fnst@cn.fujitsu.com >
Upstream-commit: 62f91b1d34155a58bfeb6ce8d3595149cf5147d7
Component: engine
2015-04-23 16:50:41 +08:00
701a9fb9a1
Makes headings in documentation consistent
...
Fixes #10673 .
Signed-off-by: Rick Wieman <git@rickw.nl >
Upstream-commit: 63593267619378520a03e8984c5fcf0ec8957537
Component: engine
2015-04-23 07:41:30 +02:00
0b0a96ad89
Merge pull request #12390 from hqhq/hq_fix_inspect
...
fix inspect format result
Upstream-commit: eae272f90eb6c01824112054140b5dc7d9d679ce
Component: engine
2015-04-22 23:06:13 -04:00
75c324a9e3
Move setHostConfig to daemon file
...
Signed-off-by: Ma Shimiao <mashimiao.fnst@cn.fujitsu.com >
Upstream-commit: dde0cc78bdec31be1ecbd7def6a83111224ccc55
Component: engine
2015-04-23 10:23:02 +08:00
eaff99d710
Merge pull request #12582 from ankushagarwal/add-docker-history-integration-test
...
Add integration test for history option
Upstream-commit: 6bacb4528eca2d491d261bd6fb5b76022bf0d058
Component: engine
2015-04-22 22:09:01 -04:00
f01047d748
Merge pull request #12543 from vdemeester/11584-pkg-stdcopy-test-coverage
...
Add some stdcopy_test (coverage)
Upstream-commit: 60ad23a7b3ea6a06cd8ded165ebaab5fd0cc3bd9
Component: engine
2015-04-22 22:03:15 -04:00
1c1b244ecd
fix inspect format result
...
Currently `docker inspect -f` use json.Unmarshal() unmarshal
to interface, it will store all JSON numbers in float64, so
we use `docker inspect 4f0d73b75a0d | grep Memory` and
`docker inspect -f {{.HostConfig.Memory}} 4f0d73b75a0d` will
get different values.
Signed-off-by: Qiang Huang <h.huangqiang@huawei.com >
Upstream-commit: b0ef3194aaa8c22b674ed5301c59e8e557a7e85e
Component: engine
2015-04-23 09:28:07 +08:00
2ce3beecbf
Merge pull request #12654 from jfrazelle/12135-docker-delete-multiple-tagged
...
add regression test for rmi multiple tags without f
Upstream-commit: 480d979c27228671838d8e5624cc92a576a4cacd
Component: engine
2015-04-22 21:08:07 -04:00
078d379cc0
Merge pull request #12406 from runcom/remove-job-container-inspect
...
Remove job from container_inspect
Upstream-commit: 387227217004d4ea54e2d2405aaef761752e3bdc
Component: engine
2015-04-22 21:05:15 -04:00
0f579f7454
Merge pull request #12652 from jfrazelle/update-contrib-docs-for-go-check
...
update contrib docs for gocheck
Upstream-commit: cc43263f8c2d4f2df7f99d0e375797295f672b47
Component: engine
2015-04-22 17:47:22 -07:00
9b8b781646
Merge pull request #12649 from jlhawn/fix_pull_err_explosion
...
Correctly format API error on image pull
Upstream-commit: 5ea8dc376c94de6939e35a4152b1a9a5979911dd
Component: engine
2015-04-22 20:28:24 -04:00
03223ccad9
Merge pull request #12557 from rhatdan/journald
...
Add journald as a supported logger for containers
Upstream-commit: 3dc07162bdb457c86c0d5025d1d633131fadcfd1
Component: engine
2015-04-22 17:20:10 -07:00
ee257b47ab
Merge pull request #10422 from cpuguy83/cleanup_daemon_volumes
...
Cleanup daemon/volumes
Upstream-commit: 505788deb23cc1c052e0dd575659967b9107c60f
Component: engine
2015-04-22 17:13:47 -07:00
8db174e734
Merge pull request #12615 from moxiegirl/update-repository-links
...
Fixing a few links in registry
Upstream-commit: b6702116be4c554e7856017bfde62e1a23c0e349
Component: engine
2015-04-23 10:02:02 +10:00
1fb3f6d19e
Merge pull request #12614 from ankushagarwal/ubuntu-docs
...
Add Configuring Docker article
Upstream-commit: 84a9962a6350e8e7c5a12e6825f53c202afec416
Component: engine
2015-04-23 09:41:11 +10:00
628a79ad40
Cleanup daemon/volumes
...
- Mount struct now called volumeMount
- Merged volume creation for each volume type (volumes-from, binds, normal
volumes) so this only happens in once place
- Simplified container copy of volumes (for when `docker cp` is a
volume)
Signed-off-by: Brian Goff <cpuguy83@gmail.com >
Upstream-commit: f3680e74946d3a773edb118ea3f508b8237e44a8
Component: engine
2015-04-22 19:32:10 -04:00
c2d93a9162
Merge pull request #12586 from ankushagarwal/image-digests
...
Add Image Digest doc in userguide/dockerimages
Upstream-commit: ce7e1a4d7e600f0fcff96ccc2d8bf4236916fa60
Component: engine
2015-04-23 09:23:23 +10:00
2cd5fc4ea7
Merge pull request #10992 from cpuguy83/add_volume_mounting_for_cp
...
Make `docker cp` bind-mount volumes
Upstream-commit: 1d48cccc996885fe02b4824d9421735566a52088
Component: engine
2015-04-22 15:59:28 -07:00
1563e7c4d1
Merge pull request #12513 from allingeek/patch-1
...
builder.md - Changes to bring LABEL docs in line with 1.6 release.
Upstream-commit: b2aca01d95caea18480642f48aacbe43e283fd0c
Component: engine
2015-04-23 08:58:59 +10:00
fdf9a8d629
Remove job from container_inspect
...
Signed-off-by: Antonio Murdaca <me@runcom.ninja >
Upstream-commit: 4b9fe9c298c8778855c1d14e978c791496dd7c42
Component: engine
2015-04-23 00:58:13 +02:00
519d29da21
Merge pull request #12460 from moxiegirl/fix-carry-12383
...
Putting into our new format for cloud
Upstream-commit: 20b1aa08f8112cb2176d75e9f6fa27eab0ea5e44
Component: engine
2015-04-23 08:52:56 +10:00
54ac8d85af
Merge pull request #12650 from LK4D4/carry_12472
...
remove execCreate & execStart from job
Upstream-commit: 3c9ae03a868bb86fdb3026a21ef1b9a3f6a75dfb
Component: engine
2015-04-22 15:32:14 -07:00
a57edd59f7
Merge pull request #12657 from dqminh/remove-unused-utils
...
remove unused utils
Upstream-commit: 7708ab5ce2f08bd9d3b492794d997efaccd253fe
Component: engine
2015-04-22 15:23:57 -07:00
925bb7aac9
remove unused utils
...
Signed-off-by: Daniel, Dao Quang Minh <dqminh89@gmail.com >
Upstream-commit: 71b5a754cec09b2f1bcef986bdd6fd109451b8f2
Component: engine
2015-04-22 21:53:45 +00:00
bfa8bbb7bb
Merge branch 'master' of github.com:docker/docker into journald
...
Docker-DCO-1.1-Signed-off-by: Dan Walsh <dwalsh@redhat.com > (github: rhatdan)
Upstream-commit: b88b2fa72ea4ad579478080ce6f027e55cfd5c29
Component: engine
2015-04-22 17:37:26 -04:00
9099ab32e6
add regression test for rmi multiple tags without f
...
Signed-off-by: Jessica Frazelle <princess@docker.com >
Upstream-commit: 28f5541b72a898762575a2ed0995cae7452fa275
Component: engine
2015-04-22 14:23:05 -07:00
f72daf37a9
add integration test for error pull nonexistent
...
Signed-off-by: Jessica Frazelle <princess@docker.com >
Upstream-commit: 7a525c6cb74af854d621f5560868b32694d2553b
Component: engine
2015-04-22 14:11:25 -07:00
cd9ba3cbe6
Correctly format API error on image pull
...
Docker-DCO-1.1-Signed-off-by: Josh Hawn <josh.hawn@docker.com > (github: jlhawn)
Upstream-commit: fd4f7c4e5c4460bad7baf0854f1edc1bbf93aeef
Component: engine
2015-04-22 14:11:25 -07:00
3779d0ae84
Merge pull request #12621 from LK4D4/test_push_interrupt_daemon
...
Run TestPushInterrupt on separate daemon
Upstream-commit: 29265448ecaf7721b24cbc64978bc7e2adbc4c08
Component: engine
2015-04-22 14:05:37 -07:00
f089bf1e0a
remove execCreate & execStart from job
...
Also removed the function ExecConfigFromJob
Signed-off-by: Sun Jianbo <wonderflow@zju.edu.cn >
Signed-off-by: Alexander Morozov <lk4d4@docker.com >
Upstream-commit: 24425021d26f29a475702064181e6c99fb6bd1c5
Component: engine
2015-04-22 13:51:57 -07:00
1114daff30
Wait until all pushes are done in TestPushInterrupt
...
Background pushes affects other tests
Signed-off-by: Alexander Morozov <lk4d4@docker.com >
Upstream-commit: c09765ac431a85f9ad231c52cbe562bb6f0b0b06
Component: engine
2015-04-22 13:36:43 -07:00
58808570b1
update contrib docs for gocheck
...
Signed-off-by: Jessica Frazelle <princess@docker.com >
Upstream-commit: a09ab40f0d980b2a6d6656db638f1fc5d73f5b8b
Component: engine
2015-04-22 13:19:14 -07:00
8f7ae62228
Merge pull request #12588 from hqhq/hq_fix_cpuquota_warn
...
remove redundant warning
Upstream-commit: 975e668722810646a0e260bd9fb8527fb4d9266b
Component: engine
2015-04-22 13:07:21 -07:00
e75be891ca
Add integration test for history option
...
Parse the history output to locate the size fields and check
whether they are the correct format or not. Use Column name SIZE
to mark start and end indices of the size fields
Fixes #12578
Signed-off-by: Ankush Agarwal <ankushagarwal11@gmail.com >
Upstream-commit: 08150150bbc4477cbcf8286bc15a1cf8b4428e35
Component: engine
2015-04-22 12:22:01 -07:00
73573e4387
Merge pull request #12376 from Mic92/refactor-hack
...
Refactor shellscripts
Upstream-commit: e3e1c2be42d3aa6c4da7fe4286c2937bf55c4c0d
Component: engine
2015-04-22 12:12:44 -07:00
38db3bc7c2
Merge pull request #12647 from duglin/FixTesting
...
Remove old testing stuff that slipped into master
Upstream-commit: 6f94ca6d8b9e23dc33bdf6da520f0e585b3dedf9
Component: engine
2015-04-22 14:47:37 -04:00
5f7ff29c8f
Remove old testing stuff that slipped into master
...
Signed-off-by: Doug Davis <dug@us.ibm.com >
Upstream-commit: b4988d8d75b4ee915ade6013de76bb1336917528
Component: engine
2015-04-22 11:44:54 -07:00
ae1dbb3bcd
Merge pull request #12623 from peggyl/api-client-docs
...
Fix golint errors in docker/api/client
Upstream-commit: 901ae9aaead770fade5b4367d775043cd9336076
Component: engine
2015-04-22 14:09:23 -04:00
f0797cd197
Merge pull request #12637 from sublimino/patch-1
...
Add kali to install script
Upstream-commit: 5728426f27eac479ffbb58bf886721fd84b9425f
Component: engine
2015-04-22 11:05:13 -07:00
e6ff00789e
Update with @moxiegirl's patch and add direct config
...
Signed-off-by: Ankush Agarwal <ankushagarwal11@gmail.com >
Upstream-commit: 9689aab5ec0141a70c2134d18cb581ec5a923c5f
Component: engine
2015-04-22 10:36:38 -07:00
a1213158fa
Add kali to install script
...
https://www.kali.org/ is a Debian derivative. This script completes
succesfully using the Debian install path
Signed-off-by: Andrew Martin <sublimino@gmail.com >
Upstream-commit: 2dd88af79b0e1af6df0551b993cd9fffbd5881ee
Component: engine
2015-04-22 14:56:00 +01:00
3fb10b1144
Use svg instead of png to get better image quality
...
Signed-off-by: Peter Dave Hello <hsu@peterdavehello.org >
Upstream-commit: b121d94369164391369cd02a559a7b64b482f59d
Component: engine
2015-04-22 18:45:29 +08:00
ed4e61e70a
Fix golint errors in docker/api/client
...
Signed-off-by: Peggy Li <peggyli.224@gmail.com >
Upstream-commit: 58065d0dd9adec4b2f397a453652cc8cc7237a17
Component: engine
2015-04-22 00:14:23 -07:00
18e1b423ee
Fixing a few links in registry
...
Signed-off-by: Mary Anthony <mary@docker.com >
Upstream-commit: 54ff1dcb829e67d62dd4686bdc19522d63c3e0d3
Component: engine
2015-04-21 18:36:37 -07:00
6284903b5f
Add Configuring Docker article [WIP]
...
Fixes #12088
Signed-off-by: Ankush Agarwal <ankushagarwal11@gmail.com >
Upstream-commit: 9424fc14bb7465f9874e6e3560cf62b560dbd13d
Component: engine
2015-04-21 17:49:29 -07:00
