clearlinux/docker
2
0
Fork 0
mirror of https://github.com/clearlinux/docker.git synced 2026-10-04 15:58:39 +00:00
Code Issues Packages Projects Releases Wiki Activity
15,237 Commits 9 Branches 112 Tags
4aff563282c4d467575aed006642a22d673d4cb7
Commit Graph
15237 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
Alexander Morozov ec51ba01db Return weird behaviour of returning json errors 
We need this, so client can get error from stream and not from status
code, which is already 200, because write to ResponseWriter was occured.

Signed-off-by: Alexander Morozov <lk4d4@docker.com>
 2015-04-23 10:27:37 -07:00
Doug Davis bb9da6ba92 Move CLI config processing out from under registry dir 
No logic changes should be in here, just moving things around.

Signed-off-by: Doug Davis <dug@us.ibm.com>
 2015-04-23 10:18:38 -07:00
Alexander Morozov fa3e2dd45e Merge pull request #12691 from runcom/remove-deleteAllContainers-call 
Remove deleteAllContainers call in test
 2015-04-23 10:01:08 -07:00
Alexander Morozov 2351b87551 Merge pull request #12505 from ZJU-SEL/remove_job_from_push 
remove job from push
 2015-04-23 09:57:17 -07:00
Alexander Morozov 71ac5b7903 Merge pull request #12681 from hqhq/hq_fix_test_in_apiserver 
fix test case name
 2015-04-23 09:21:00 -07:00
Srini Brahmaroutu 05013f1250 Move https integration tests as unit tests under client 
Addresses #12255
Signed-off-by: Srini Brahmaroutu <srbrahma@us.ibm.com>
 2015-04-23 15:40:46 +00:00
Brian Goff 455d83939a Merge pull request #12683 from tristan0x/patch-1 
Fix typo in builder reference
 2015-04-23 11:12:49 -04:00
Antonio Murdaca ee7a7b07e7 Remove deleteAllContainers call in test 
Signed-off-by: Antonio Murdaca <me@runcom.ninja>
 2015-04-23 16:32:50 +02:00
Antonio Murdaca cd6cc45d52 Fix TestRenameStoppedContainer race 
Signed-off-by: Antonio Murdaca <me@runcom.ninja>
 2015-04-23 16:11:46 +02:00
Rajdeep Dua fca4aea077 TestCase added for Container Create with HostName 
Signed-off-by: Rajdeep Dua <dua_rajdeep@yahoo.com>
 2015-04-23 06:53:34 -07:00
Brian Goff 563708d78d Fix race with TestContainerApiCommit 
Signed-off-by: Brian Goff <cpuguy83@gmail.com>
 2015-04-23 09:45:06 -04:00
Simei He d456401fe1 remove job from push 
Signed-off-by: Simei He <hesimei@zju.edu.cn>

Signed-off-by: He Simei <hesimei@zju.edu.cn>
 2015-04-23 21:21:56 +08:00
Doug Davis 1b4de6f2e8 Merge pull request #12579 from ZJU-SEL/remove_job_from_load 
remove job from load
 2015-04-23 08:20:37 -04:00
Doug Davis d59ce5cd48 Merge pull request #12663 from Mashimiao/Move-setHostConfig-to-daemon-file 
Move setHostConfig to daemon file
 2015-04-23 07:43:42 -04:00
Doug Davis f4cfaac519 Merge pull request #12680 from Mashimiao/fix-typo-push-test 
push test: fix typo
 2015-04-23 07:37:50 -04:00
Zhang Wei ab42a3a23a refactor httpError() and add 404 "not found" mapping 
When docker pull a non-existent repo, daemon will report "image xxx not found"
with an error code 500, which should be 404.
This commit add 404 "not found" mapping and refactor httpError function.

Signed-off-by: Zhang Wei <zhangwei555@huawei.com>
 2015-04-23 19:37:47 +08:00
Simei He 70bb0d8ed7 remove job from load 
Signed-off-by: Simei He <hesimei@zju.edu.cn>

Signed-off-by: He Simei <hesimei@zju.edu.cn>
 2015-04-23 19:13:12 +08:00
Qiang Huang a8d2fbe7b4 fix test case name 
Name like this will never run by go test. And this test case won't
get PAAS.

Signed-off-by: Qiang Huang <h.huangqiang@huawei.com>
 2015-04-23 18:41:30 +08:00
Tristan Carel 47263c6514 Fix typo in builder reference 
Signed-off-by: Tristan Carel <tristan.carel@gmail.com>
 2015-04-23 12:10:47 +02:00
Ma Shimiao 62f91b1d34 push test: fix typo 
Signed-off-by: Ma Shimiao <mashimiao.fnst@cn.fujitsu.com>
 2015-04-23 16:50:41 +08:00
Vincent Demeester 1f7ba6f809 Fix the design proposal link in advanced contribution page 
Signed-off-by: Vincent Demeester <vincent@sbr.pm>
 2015-04-23 09:48:11 +02:00
Tomas Tomecek d6c839cf0f v1 spec: fix typos and formatting 
Signed-off-by: Tomas Tomecek <ttomecek@redhat.com>
 2015-04-23 08:19:52 +02:00
Sven Dowideit fdc5aa2043 Merge pull request #12599 from RickWieman/10673-make-headings-consistent 
Makes headings in documentation consistent
 2015-04-23 16:15:10 +10:00
Rick Wieman 6359326761 Makes headings in documentation consistent 
Fixes #10673.

Signed-off-by: Rick Wieman <git@rickw.nl>
 2015-04-23 07:41:30 +02:00
Ma Shimiao 05418df539 sysinfo: add IPv4Forwarding check 
Signed-off-by: Ma Shimiao <mashimiao.fnst@cn.fujitsu.com>
 2015-04-23 12:19:46 +08:00
Doug Davis eae272f90e Merge pull request #12390 from hqhq/hq_fix_inspect 
fix inspect format result
 2015-04-22 23:06:13 -04:00
Ma Shimiao dde0cc78bd Move setHostConfig to daemon file 
Signed-off-by: Ma Shimiao <mashimiao.fnst@cn.fujitsu.com>
 2015-04-23 10:23:02 +08:00
Brian Goff 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
Brian Goff 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
Qiang Huang 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
Brian Goff 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
Brian Goff 3872272170 Merge pull request #12406 from runcom/remove-job-container-inspect 
Remove job from container_inspect
 2015-04-22 21:05:15 -04:00
Jessie Frazelle 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
Doug Davis 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
Alexander Morozov 3dc07162bd Merge pull request #12557 from rhatdan/journald 
Add journald as a supported logger for containers
 2015-04-22 17:20:10 -07:00
Jessie Frazelle 505788deb2 Merge pull request #10422 from cpuguy83/cleanup_daemon_volumes 
Cleanup daemon/volumes
 2015-04-22 17:13:47 -07:00
Sven Dowideit b6702116be Merge pull request #12615 from moxiegirl/update-repository-links 
Fixing a few links in registry
 2015-04-23 10:02:02 +10:00
Sven Dowideit 84a9962a63 Merge pull request #12614 from ankushagarwal/ubuntu-docs 
Add Configuring Docker article
 2015-04-23 09:41:11 +10:00
Brian Goff 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
Sven Dowideit ce7e1a4d7e Merge pull request #12586 from ankushagarwal/image-digests 
Add Image Digest doc in userguide/dockerimages
 2015-04-23 09:23:23 +10:00
Jessie Frazelle 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
Sven Dowideit 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
Antonio Murdaca 4b9fe9c298 Remove job from container_inspect 
Signed-off-by: Antonio Murdaca <me@runcom.ninja>
 2015-04-23 00:58:13 +02:00
Sven Dowideit 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
Jessie Frazelle 3c9ae03a86 Merge pull request #12650 from LK4D4/carry_12472 
remove execCreate & execStart from job
 2015-04-22 15:32:14 -07:00
Alexander Morozov 7708ab5ce2 Merge pull request #12657 from dqminh/remove-unused-utils 
remove unused utils
 2015-04-22 15:23:57 -07:00
Daniel, Dao Quang Minh 71b5a754ce remove unused utils 
Signed-off-by: Daniel, Dao Quang Minh <dqminh89@gmail.com>
 2015-04-22 21:53:45 +00:00
Dan Walsh 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
Jessica Frazelle 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
Jessica Frazelle 7a525c6cb7 add integration test for error pull nonexistent 
Signed-off-by: Jessica Frazelle <princess@docker.com>
 2015-04-22 14:11:25 -07:00