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
14,461 Commits 9 Branches 112 Tags
ce18734c2cffebe112d06dca9117150ceaa08e15
Commit Graph
14461 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
Doug Davis 67b4cce0f6 Remove engine.Table from docker search and fix missing field 
registry/SearchResults was missing the "is_automated" field.
I added it back in.

Pull this 'table' removal one from the others because it fixed
a bug too

Signed-off-by: Doug Davis <dug@us.ibm.com>
 2015-04-03 11:27:30 -07:00
Michael Crosby e64f6baf11 Merge pull request #12010 from ibuildthecloud/small 
Small changes from #11967 for review comments
 2015-04-03 11:27:06 -07:00
Jessie Frazelle b3e9c274dd Merge pull request #11981 from unclejack/fix_profiler 
api/server: fix profiler HTTP serving
 2015-04-03 18:25:12 +00:00
Michael Crosby 326a5545d4 Merge pull request #12058 from duglin/RemoveTable2 
Remove engine.Table from docker history and docker rmi
 2015-04-03 10:57:52 -07:00
moxiegirl 12e7787540 Merge pull request #12017 from moxiegirl/distribution-man-pages 
Updating with man pages for distribution
 2015-04-03 09:55:08 -07:00
Huu Nguyen bfddad18ce Clean up formatting in the README 
Signed-off-by: Huu Nguyen <whoshuu@gmail.com>
 2015-04-03 09:50:35 -07:00
Arnaud Porterie 61933395eb Merge pull request #11860 from maximkulkin/11575-dockerize-image-tool 
Add tool to conver disk image into Docker image
 2015-04-03 09:32:11 -07:00
Arnaud Porterie c8ca904f15 Merge pull request #11881 from jrjang/master 
mkimage-arch: set default C.UTF-8 locale
 2015-04-03 09:28:11 -07:00
Arnaud Porterie bcbdf77ddb Specify running boot2docker ip on host 
Signed-off-by: Arnaud Porterie <arnaud.porterie@docker.com>
 2015-04-03 08:53:44 -07:00
Alexander Morozov 03525d5fc6 Merge pull request #11956 from coolljt0725/add_memcg_swap_cgroup_enabled_to_check_config 
add MEMCG_SWAP_ENABLED to check-config.sh
 2015-04-03 08:50:54 -07:00
Doug Davis 2c5da7d1ac Merge pull request #12018 from sunyuan3/search 
If docker search with --starts=${negative number}, it would show the war...
 2015-04-03 11:38:38 -04:00
Doug Davis 0b2fa9c707 Remove engine.Table from docker history and docker rmi 
Signed-off-by: Doug Davis <dug@us.ibm.com>
 2015-04-03 08:31:30 -07:00
moxiegirl 05753288c4 Merge pull request #11997 from tiborvass/carry-11926 
Carry 11926: Added information about accessing host directory on Windows.
 2015-04-03 06:43:38 -07:00
moxiegirl da61228501 Merge pull request #11775 from maximkulkin/explain-advanced-contribution-workflow 
Explain advanced contribution workflow more
 2015-04-03 06:41:49 -07:00
eluck 57b09068ef Update userguide/dockervolumes - fixes issue #12052 
Signed-off-by: Evgeny Lukianchikov <mail@eluck.me>
 2015-04-03 14:07:51 +03:00
Jamie Hannaford 9a98556c2b Add documentation for exported functions and types 
Signed-off-by: Jamie Hannaford <jamie.hannaford@rackspace.com>
 2015-04-03 11:33:34 +02:00
Tianon Gravi 3761955e8c Change the btrfs_noversion check to be automatic 
Signed-off-by: Andrew "Tianon" Page <admwiggin@gmail.com>
 2015-04-03 01:30:12 -06:00
Simei He 8c578b8190 minor edits. 
Signed-off-by: Simei He <hesimei@zju.edu.cn>
 2015-04-03 14:43:21 +08:00
Arnaud Porterie a3a45a6ec0 Merge pull request #11883 from coolljt0725/add_missing_option_to_bash_completion 
Add some missing option to bash completion
 2015-04-02 22:49:58 -07:00
Alexander Morozov 4e90b47cc2 Merge pull request #12043 from joeygibson/12041-fix-vet-warnings 
Fix vet warnings in pkg/requestdecorator/requestdecorator_test.go #12041
 2015-04-02 22:07:55 -07:00
Joey Gibson a9443de7c5 Fix vet warnings in pkg/requestdecorator/requestdecorator_test.go #12041 
Signed-off-by: Joey Gibson <joey@joeygibson.com>
 2015-04-03 00:18:21 -04:00
Yuan Sun 87e0e4eb43 If docker search with --starts=${negative number}, it would show the warning. 
Signed-off-by: Yuan Sun <sunyuan3@huawei.com>
 2015-04-03 08:55:34 +08:00
Tibor Vass f92e88b7e0 Merge pull request #11995 from icecrime/test_daemon_stop 
Properly stop test daemon in integration-cli
 2015-04-02 20:27:20 -04:00
Phil Estes 3f1590f679 Merge pull request #12040 from duglin/TableFromDiff 
Remove use of Table from 'docker diff'
 2015-04-02 17:21:40 -07:00
Doug Davis 49c72506ac Remove use of Table from 'docker diff' 
Signed-off-by: Doug Davis <dug@us.ibm.com>
 2015-04-02 16:55:58 -07:00
Arnaud Porterie 9c505c906d Merge pull request #11571 from noironetworks/11555-Docker-since-beginning-of-unix-time-doesnt-work 
Fixes docker events since beginning of unix time
 2015-04-02 15:03:04 -07:00
Jessie Frazelle 962ded2dee Merge pull request #12036 from crosbymichael/update-libcontainer-apr2 
Update libcontainaer to d00b8369852285d6a830a8d3b9
 2015-04-02 14:46:44 -07:00
Todd Whiteman 3e51a81475 integration-cli: add check for TestPsListContainersSize when no containers are returned 
* when no containers are returned, go test would then aborts with:
  panic: runtime error: index out of range

Signed-off-by: Todd Whiteman <todd.whiteman@joyent.com>
 2015-04-02 14:45:52 -07:00
Michael Crosby d12fef1515 Update libcontainaer to d00b8369852285d6a830a8d3b9 
Fixes #12015

Signed-off-by: Michael Crosby <crosbymichael@gmail.com>
 2015-04-02 14:12:55 -07:00
Tibor Vass c88b2c422f Merge pull request #12012 from jfrazelle/fix-race-volumes-from-api 
TestVolumesFromHasPriority fix race
 2015-04-02 16:01:09 -04:00
Tibor Vass 42c7855014 Merge pull request #12011 from jfrazelle/fix-lxc-device-test 
fix device test on lxc...
 2015-04-02 16:00:39 -04:00
Alexander Morozov 104b20a133 Merge pull request #12026 from cpuguy83/add_self_to_maintainers 
Add cpuguy83 to maintainers.people
 2015-04-02 09:20:19 -07:00
Arnaud Porterie 02c2308e39 Properly stop test daemon in integration-cli 
Always stop the test daemon in an attempt to fix race conditions in
subsequent tests.

Signed-off-by: Arnaud Porterie <arnaud.porterie@docker.com>
 2015-04-02 08:53:31 -07:00
Alexander Morozov ccfbe880c8 Merge pull request #12029 from unclejack/testpsgroupportrange_fast 
integration-cli: make TestPsGroupPortRange fast
 2015-04-02 08:48:08 -07:00
unclejack 132da3f036 daemon/logger/jsonfilelog: avoid some allocations 
Signed-off-by: Cristian Staretu <cristian.staretu@gmail.com>
 2015-04-02 18:33:23 +03:00
unclejack cfa8aaf16f integration-cli: make TestPsGroupPortRange fast 
Signed-off-by: Cristian Staretu <cristian.staretu@gmail.com>
 2015-04-02 18:26:29 +03:00
Brian Goff 6ac845edad Add cpuguy83 to maintainers.people 
Signed-off-by: Brian Goff <cpuguy83@gmail.com>
 2015-04-02 08:51:47 -04:00
Tibor Vass 9707286a5c Merge pull request #11149 from duglin/8667-AdvancedVars 
Add support for advanced ${} uses
 2015-04-02 08:25:49 -04:00
Chen Hanxiao 8fa03df885 docs: keep the style of docker-commit consistent with docker-import 
add a pair of accent mark around dockerfile commands
in docker-commit, as the same thing in docker-import.

Signed-off-by: Chen Hanxiao <chenhanxiao@cn.fujitsu.com>
 2015-04-02 05:01:14 -04:00
unclejack 3bea892d54 api/server: fix profiler HTTP serving 
Signed-off-by: Cristian Staretu <cristian.staretu@gmail.com>
 2015-04-02 09:53:40 +03:00
Mary Anthony b6d55ebcbc Updating with man pages for distribution 
Went through the man pages to update for the
v2 instance. Checked against the commands.

Signed-off-by: Mary Anthony <mary@docker.com>
 2015-04-01 21:02:19 -07:00
Jessica Frazelle c447fd339a TestVolumesFromHasPriority fix race 
Docker-DCO-1.1-Signed-off-by: Jessie Frazelle <hugs@docker.com> (github: jfrazelle)
 2015-04-01 18:06:28 -07:00
Jessica Frazelle f472c7236f fix device test on lxc, on lxc in contianers there are no dirs with devices in /dev, but this works outside a container... 
Docker-DCO-1.1-Signed-off-by: Jessie Frazelle <princess@docker.com> (github: jfrazelle)
 2015-04-01 17:47:36 -07:00
Lei Jitang a9588158b5 Add MEMCG_SWAP_ENABLED to check-config.sh 
Signed-off-by: Lei Jitang <leijitang@huawei.com>
 2015-04-02 08:38:39 +08:00
Darren Shepherd 7433c9c92a Make server_windows.go consistent with server_linux.go 
Signed-off-by: Darren Shepherd <darren@rancher.com>
 2015-04-01 17:31:15 -07:00
Darren Shepherd 34f44c642f Infer type 
Signed-off-by: Darren Shepherd <darren@rancher.com>
 2015-04-01 17:31:09 -07:00
Andrea Luzzardi b9be50b578 Merge pull request #10745 from jfrazelle/device-dir 
Mounting a dir of devices like /dev/snd should mount all child devices
 2015-04-01 16:53:01 -07:00
Sebastiaan van Stijn 37c7f3a204 docs: fix bullet list and missing label filter 
Some bullet lists didn't render as bullet-lists because
of a missing newline.

Also added missing "label" filter for `docker ps` and
slightly re-worded the header above the supported filters.

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
 2015-04-02 01:48:28 +02:00
Arnaud Porterie 3f77f627d0 Merge pull request #12007 from crosbymichael/fix-oom-hang 
Return closed channel if oom notification fails
 2015-04-01 15:59:20 -07:00
Jessica Frazelle 664004ed0c Mounting a directory of devices like /dev/snd should mount all child devices. 
I have seen a lot of people try to do this and reach out to me on how to mount
/dev/snd because it is returning "not a device node". The docs imply you can
_just_ mount /dev/snd and that is not the case. This fixes that. It also allows
for coolness if you want to mount say /dev/usb.

Docker-DCO-1.1-Signed-off-by: Jessie Frazelle <hugs@docker.com> (github: jfrazelle)

Docker-DCO-1.1-Signed-off-by: Jessie Frazelle <princess@docker.com> (github: jfrazelle)

Docker-DCO-1.1-Signed-off-by: Jessie Frazelle <jess@docker.com> (github: jfrazelle)

Docker-DCO-1.1-Signed-off-by: Jessica Frazelle <jess@docker.com> (github: jfrazelle)
 2015-04-01 15:57:41 -07:00