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
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
b22067113f
Merge pull request #12634 from PeterDaveHello/patch-2
...
Use svg instead of png to get better image quality
Upstream-commit: fd3b722928613a194508e094535c8b0f3da9967a
Component: engine
2015-04-22 10:53:47 -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
3a0cec3089
remove redundant warning
...
And warning is not supposed to have a prefix WARNING.
Signed-off-by: Qiang Huang <h.huangqiang@huawei.com >
Upstream-commit: f3dc35169780e1555b4116986649b729cb80b5d1
Component: engine
2015-04-22 08:15:00 +08:00
1b7f0b8878
Merge pull request #12611 from LK4D4/remove_eng_chain_pull
...
Remove chain of engine passing from builder to loadManifest
Upstream-commit: ccbb93e1cd38ad0a38455ad054b170f444aa9da3
Component: engine
2015-04-21 19:19:56 -04:00
be3d252948
Merge pull request #12511 from LK4D4/gocheck_suites
...
Gocheck suites
Upstream-commit: 61854b171d1e8afbbc30f268e793356996ff4c77
Component: engine
2015-04-21 15:42:33 -07:00
43e79cc411
Remove chain of engine passing from builder to loadManifest
...
Signed-off-by: Alexander Morozov <lk4d4@docker.com >
Upstream-commit: a2f74aa4b449479dc3953b129c839ca90b089494
Component: engine
2015-04-21 14:55:23 -07:00
a499d975cf
Putting into our new format for cloud
...
Adding in Seb's comments
Updating with Fred's comments
Signed-off-by: Mary Anthony <mary@docker.com >
Upstream-commit: bc7a43cb44fc0541939f10186e326e3139403605
Component: engine
2015-04-21 14:48:48 -07:00
60a0268238
Merge pull request #12536 from mountkin/remove-unsupported-instructions-from-doc
...
Remove some unsupported instructions in the docs.
Upstream-commit: 21c8d211e1bd508091c1dfecb29a32988ac2a17a
Component: engine
2015-04-21 14:08:31 -07:00
79e92cb2ff
Merge pull request #12567 from brahmaroutu/integration_test6_12255
...
moving integration tests to graph unit tests
Upstream-commit: 7ba8c3b26ffedc869c2868c3e90ef81315af6b8f
Component: engine
2015-04-21 13:58:02 -07:00
b383a47d39
Merge pull request #12600 from LK4D4/remove_image_set
...
Remove image_set engine job
Upstream-commit: 725ea8c09ef974d85f562919b6610354069e0cde
Component: engine
2015-04-21 16:51:46 -04:00
b6c443e015
Merge pull request #12564 from LK4D4/remove_jobs_trust
...
Remove engine from trust
Upstream-commit: b098a42559f8f70a56a587a06608ee00641ebdaf
Component: engine
2015-04-21 16:49:01 -04:00
490d3d47ba
Merge pull request #12609 from runcom/remove-not-needed-readHostConfig
...
Remove not needed call to container.readHostConfig()
Upstream-commit: 783dbcade36fa3816ad4be817b62bd53b74b9080
Component: engine
2015-04-21 13:45:48 -07:00
95350b9286
Remove image_set engine job
...
It was unused
Signed-off-by: Alexander Morozov <lk4d4@docker.com >
Upstream-commit: 79a7fedcd8f9aaa42ec4e7f0fdd1f915c27e850b
Component: engine
2015-04-21 13:04:28 -07:00
7c675b1db2
Remove not needed call to container.readHostConfig()
...
Signed-off-by: Antonio Murdaca <me@runcom.ninja >
Upstream-commit: a3c4801c9291c0db78c5cc0748d5d2dd5e44a98f
Component: engine
2015-04-21 22:00:33 +02:00
