fdc5aa2043
Merge pull request #12599 from RickWieman/10673-make-headings-consistent
...
Makes headings in documentation consistent
2015-04-23 16:15:10 +10:00
6359326761
Makes headings in documentation consistent
...
Fixes #10673 .
Signed-off-by: Rick Wieman <git@rickw.nl>
2015-04-23 07:41:30 +02:00
05418df539
sysinfo: add IPv4Forwarding check
...
Signed-off-by: Ma Shimiao <mashimiao.fnst@cn.fujitsu.com>
2015-04-23 12:19:46 +08:00
eae272f90e
Merge pull request #12390 from hqhq/hq_fix_inspect
...
fix inspect format result
2015-04-22 23:06:13 -04:00
dde0cc78bd
Move setHostConfig to daemon file
...
Signed-off-by: Ma Shimiao <mashimiao.fnst@cn.fujitsu.com>
2015-04-23 10:23:02 +08:00
6bacb4528e
Merge pull request #12582 from ankushagarwal/add-docker-history-integration-test
...
Add integration test for history option
2015-04-22 22:09:01 -04:00
60ad23a7b3
Merge pull request #12543 from vdemeester/11584-pkg-stdcopy-test-coverage
...
Add some stdcopy_test (coverage)
2015-04-22 22:03:15 -04:00
b0ef3194aa
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>
2015-04-23 09:28:07 +08:00
480d979c27
Merge pull request #12654 from jfrazelle/12135-docker-delete-multiple-tagged
...
add regression test for rmi multiple tags without f
2015-04-22 21:08:07 -04:00
3872272170
Merge pull request #12406 from runcom/remove-job-container-inspect
...
Remove job from container_inspect
2015-04-22 21:05:15 -04:00
cc43263f8c
Merge pull request #12652 from jfrazelle/update-contrib-docs-for-go-check
...
update contrib docs for gocheck
2015-04-22 17:47:22 -07:00
5ea8dc376c
Merge pull request #12649 from jlhawn/fix_pull_err_explosion
...
Correctly format API error on image pull
2015-04-22 20:28:24 -04:00
3dc07162bd
Merge pull request #12557 from rhatdan/journald
...
Add journald as a supported logger for containers
2015-04-22 17:20:10 -07:00
505788deb2
Merge pull request #10422 from cpuguy83/cleanup_daemon_volumes
...
Cleanup daemon/volumes
2015-04-22 17:13:47 -07:00
b6702116be
Merge pull request #12615 from moxiegirl/update-repository-links
...
Fixing a few links in registry
2015-04-23 10:02:02 +10:00
84a9962a63
Merge pull request #12614 from ankushagarwal/ubuntu-docs
...
Add Configuring Docker article
2015-04-23 09:41:11 +10:00
f3680e7494
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>
2015-04-22 19:32:10 -04:00
ce7e1a4d7e
Merge pull request #12586 from ankushagarwal/image-digests
...
Add Image Digest doc in userguide/dockerimages
2015-04-23 09:23:23 +10:00
1d48cccc99
Merge pull request #10992 from cpuguy83/add_volume_mounting_for_cp
...
Make `docker cp` bind-mount volumes
2015-04-22 15:59:28 -07:00
b2aca01d95
Merge pull request #12513 from allingeek/patch-1
...
builder.md - Changes to bring LABEL docs in line with 1.6 release.
2015-04-23 08:58:59 +10:00
4b9fe9c298
Remove job from container_inspect
...
Signed-off-by: Antonio Murdaca <me@runcom.ninja>
2015-04-23 00:58:13 +02:00
20b1aa08f8
Merge pull request #12460 from moxiegirl/fix-carry-12383
...
Putting into our new format for cloud
2015-04-23 08:52:56 +10:00
3c9ae03a86
Merge pull request #12650 from LK4D4/carry_12472
...
remove execCreate & execStart from job
2015-04-22 15:32:14 -07:00
7708ab5ce2
Merge pull request #12657 from dqminh/remove-unused-utils
...
remove unused utils
2015-04-22 15:23:57 -07:00
71b5a754ce
remove unused utils
...
Signed-off-by: Daniel, Dao Quang Minh <dqminh89@gmail.com>
2015-04-22 21:53:45 +00:00
b88b2fa72e
Merge branch 'master' of github.com:docker/docker into journald
...
Docker-DCO-1.1-Signed-off-by: Dan Walsh <dwalsh@redhat.com> (github: rhatdan)
2015-04-22 17:37:26 -04:00
28f5541b72
add regression test for rmi multiple tags without f
...
Signed-off-by: Jessica Frazelle <princess@docker.com>
2015-04-22 14:23:05 -07:00
7a525c6cb7
add integration test for error pull nonexistent
...
Signed-off-by: Jessica Frazelle <princess@docker.com>
2015-04-22 14:11:25 -07:00
fd4f7c4e5c
Correctly format API error on image pull
...
Docker-DCO-1.1-Signed-off-by: Josh Hawn <josh.hawn@docker.com> (github: jlhawn)
2015-04-22 14:11:25 -07:00
29265448ec
Merge pull request #12621 from LK4D4/test_push_interrupt_daemon
...
Run TestPushInterrupt on separate daemon
2015-04-22 14:05:37 -07:00
24425021d2
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>
2015-04-22 13:51:57 -07:00
c09765ac43
Wait until all pushes are done in TestPushInterrupt
...
Background pushes affects other tests
Signed-off-by: Alexander Morozov <lk4d4@docker.com>
2015-04-22 13:36:43 -07:00
a09ab40f0d
update contrib docs for gocheck
...
Signed-off-by: Jessica Frazelle <princess@docker.com>
2015-04-22 13:19:14 -07:00
975e668722
Merge pull request #12588 from hqhq/hq_fix_cpuquota_warn
...
remove redundant warning
2015-04-22 13:07:21 -07:00
08150150bb
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>
2015-04-22 12:22:01 -07:00
e3e1c2be42
Merge pull request #12376 from Mic92/refactor-hack
...
Refactor shellscripts
2015-04-22 12:12:44 -07:00
6f94ca6d8b
Merge pull request #12647 from duglin/FixTesting
...
Remove old testing stuff that slipped into master
2015-04-22 14:47:37 -04:00
b4988d8d75
Remove old testing stuff that slipped into master
...
Signed-off-by: Doug Davis <dug@us.ibm.com>
2015-04-22 11:44:54 -07:00
901ae9aaea
Merge pull request #12623 from peggyl/api-client-docs
...
Fix golint errors in docker/api/client
2015-04-22 14:09:23 -04:00
5728426f27
Merge pull request #12637 from sublimino/patch-1
...
Add kali to install script
2015-04-22 11:05:13 -07:00
fd3b722928
Merge pull request #12634 from PeterDaveHello/patch-2
...
Use svg instead of png to get better image quality
2015-04-22 10:53:47 -07:00
9689aab5ec
Update with @moxiegirl's patch and add direct config
...
Signed-off-by: Ankush Agarwal <ankushagarwal11@gmail.com>
2015-04-22 10:36:38 -07:00
eeb8ceb9ed
Fix TestEventsImageImport racy, fixes #12499
...
Signed-off-by: Antonio Murdaca <me@runcom.ninja>
2015-04-22 17:30:30 +02:00
2dd88af79b
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>
2015-04-22 14:56:00 +01:00
b121d94369
Use svg instead of png to get better image quality
...
Signed-off-by: Peter Dave Hello <hsu@peterdavehello.org>
2015-04-22 18:45:29 +08:00
58065d0dd9
Fix golint errors in docker/api/client
...
Signed-off-by: Peggy Li <peggyli.224@gmail.com>
2015-04-22 00:14:23 -07:00
90a8e45604
Append icc related iptables rules, not INSERT
...
Signed-off-by: Gosuke Miyashita <gosukenator@gmail.com>
2015-04-22 11:45:46 +09:00
54ff1dcb82
Fixing a few links in registry
...
Signed-off-by: Mary Anthony <mary@docker.com>
2015-04-21 18:36:37 -07:00
9424fc14bb
Add Configuring Docker article [WIP]
...
Fixes #12088
Signed-off-by: Ankush Agarwal <ankushagarwal11@gmail.com>
2015-04-21 17:49:29 -07:00
f3dc351697
remove redundant warning
...
And warning is not supposed to have a prefix WARNING.
Signed-off-by: Qiang Huang <h.huangqiang@huawei.com>
2015-04-22 08:15:00 +08:00
Sven Dowideit
Rick Wieman
Ma Shimiao
Doug Davis
Brian Goff
Qiang Huang
Jessie Frazelle
Alexander Morozov
Antonio Murdaca
Daniel, Dao Quang Minh
Dan Walsh
Jessica Frazelle
Josh Hawn
jianbosun
Alexander Morozov
Ankush Agarwal
Doug Davis
Tianon Gravi
Andrew Martin
Peter Dave Hello
Peggy Li
Gosuke Miyashita
Mary Anthony