clearlinux/docker
2
0
Fork 0
mirror of https://github.com/clearlinux/docker.git synced 2026-10-04 07:48:44 +00:00
Code Issues Packages Projects Releases Wiki Activity
14,243 Commits 9 Branches 112 Tags
d322cd5dcb0ad480c974f4cc58d9d01c3d2801a7
Commit Graph
14243 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
Pavel Tikhomirov d322cd5dcb docker-tests: mount hierarchies and make symlinks for subsystems 
Docker does not know about our named cpuacct,cpu,cpuset cgroup
hierarchy with multiple subsystems in it. So to use them with docker
in integration-cli test TestRunWithCpuset inside docker container
we need to add symlinks to them in hack/dind script.

Example:
old version of parser will do:
	cat /proc/1/cgroup
	11:cpu,cpuacct,name=my_cpu_cpuacct:/
	...
and create and mount this hierarchy to directory
	/cgroup/cpu,cpuacct,name=my_cpu_cpuacct/
so docker cannot find it because it has strange name

in new parser directory will be same as on host
	/cgroup/my_cpu_cpuacct
and have symlinks for docker to find it
	/cgroup/cpu	-> /cgroup/my_cpu_cpuacct
	/cgroup/cpuacct	-> /cgroup/my_cpu_cpuacct

in other case if where is no name
	cat /proc/1/cgroup
	11:cpu,cpuacct:/
	...
mount will be same for both parsers
	/cgroup/cpu,cpuacct
and new one will also create symlinks
	/cgroup/cpu	-> /cgroup/cpu,cpuacct
	/cgroup/cpuacct	-> /cgroup/cpu,cpuacct

Signed-off-by: Pavel Tikhomirov <ptikhomirov@parallels.com>
 2015-03-31 15:49:10 +03:00
Doug Davis d95fae062b Merge pull request #11912 from sunyuan3/typo 
Fix a typo in daemon/networkdriver/ipallocator/allocator.go
 2015-03-29 21:59:50 -04:00
Yuan Sun 08331294bc Fix a typo in daemon/networkdriver/ipallocator/allocator.go 
Signed-off-by: Yuan Sun <sunyuan3@huawei.com>
 2015-03-30 08:31:46 +08:00
moxiegirl 41e47bbf34 Merge pull request #11678 from botchagalupe/docker-11465 
Closes #11465 - Add additional doc for local registries on pull command
 2015-03-29 14:10:20 -07:00
moxiegirl 4edf8e1e53 Merge pull request #11798 from amylindburg/11792-fix-typo 
Fixing typo in cd instruction
 2015-03-29 14:01:35 -07:00
moxiegirl 3bf9869234 Merge pull request #11897 from ankushagarwal/glossary 
Add Glossary to documentation
 2015-03-29 13:49:22 -07:00
moxiegirl 8b3d8f21a0 Merge pull request #11885 from bobrik/fix-formatting 
Fixed code formatting on docs.docker.com
 2015-03-29 13:21:26 -07:00
moxiegirl 3ff71c24c1 Merge pull request #11875 from ahmetalpbalkan/docs/boot2docker-windows 
Update Documentation for Windows Installation
 2015-03-29 13:18:00 -07:00
moxiegirl 584df44d42 Merge pull request #11870 from dekobon/master 
11558 - Documentation fixes and improvements for Riak Dockerfile
 2015-03-29 12:42:54 -07:00
Ankush Agarwal 567f723721 Add Glossary to documentation 
Closes #11057

Signed-off-by: Ankush Agarwal <ankushagarwal11@gmail.com>
 2015-03-29 12:24:54 -07:00
moxiegirl 1f27ebc2c7 Merge pull request #11880 from miwest929/feature/add_man_pages_docs 
Feature/add man pages docs
 2015-03-29 09:39:56 -07:00
Ian Babrou 0dc996a7d7 fixed code formatting on docs.docker.com 
Signed-off-by: Ian Babrou <ibobrik@gmail.com>
 2015-03-28 14:32:53 +03:00
Phil Estes 61069d8b69 Merge pull request #11281 from coolljt0725/fix_ipc_from_non_exist_container 
Fix error from daemon no such image even when the image exist
 2015-03-28 06:58:48 -04:00
Michael West b4905859d5 Add a missing definite article 
Signed-off-by: Michael West <mwest@mdsol.com>
 2015-03-27 23:35:37 -04:00
Michael West f7d75cc08a Add man pages generation instructions. 
Signed-off-by: Michael West <mwest@mdsol.com>
 2015-03-27 23:35:13 -04:00
Lei Jitang 013fb87543 Fix error from daemon no such image even when the image exist 
Signed-off-by: Lei Jitang <leijitang@huawei.com>
 2015-03-28 09:07:20 +08:00
Michael Crosby 789a67e931 Merge pull request #11805 from runcom/11804-remove-err-field-job-struct 
Remove err field from Job struct
 2015-03-27 16:27:04 -07:00
Jessie Frazelle e3b0014987 Merge pull request #11708 from coolljt0725/add_cgroup_parent_to_bash_completion 
Add new docker run option to bash completion
 2015-03-27 15:06:10 -07:00
Jessie Frazelle 221ff368df Merge pull request #11852 from clnperez/doc-dev-container 
Fix typo in doc at /set-up-dev-env
 2015-03-27 15:03:36 -07:00
Michael Crosby c088486093 Merge pull request #11845 from lobatt/master 
Issue #11836
 2015-03-27 14:55:04 -07:00
Ahmet Alp Balkan de09c55394 Update boot2docker on Windows documentation 
Boot2Docker experience is updated now that we have a Docker
client on Windows. Instead of running `boot2docker ssh`, users
can also use boot2docker on Windows Command Prompt (`cmd.exe`)
and PowerShell.

Updated documentation and screenshots, added a few details,
reorganized sections by importance, fixed a few errors.

Remaining: the video link in the Demonstration section needs
to be updated once I shoot a new video.

Signed-off-by: Ahmet Alp Balkan <ahmetalpbalkan@gmail.com>
 2015-03-27 14:54:37 -07:00
Michael Crosby 7cc73607a2 Merge pull request #11853 from EricR/doc-PkgSysInfo 
Add some basic doc for SysInfo
 2015-03-27 14:52:20 -07:00
Michael Crosby cc609c7556 Merge pull request #11871 from NinjaTrappeur/dry-run-test 
Fix vet warning in devicemapper.
 2015-03-27 14:48:55 -07:00
Alexander Morozov 240f3e14c7 Merge pull request #11848 from duglin/CleanupIntTests 
Clean up integration-cli tests
 2015-03-27 14:11:56 -07:00
Alexander Morozov 37241db5f3 Merge pull request #11872 from ankushagarwal/11825 
Replace fmt.Fprint* with io.WriteString
 2015-03-27 14:05:15 -07:00
Ahmet Alp Balkan 986ae5d52a docs: remove unused windows images 
These images was just sitting around and referenced from
nowhere, nor they seemed any useful.

Signed-off-by: Ahmet Alp Balkan <ahmetalpbalkan@gmail.com>
 2015-03-27 13:59:35 -07:00
Alexander Morozov 8c58bdd3a7 Merge pull request #11842 from brahmaroutu/events_tests 
Events tests
 2015-03-27 13:45:11 -07:00
Ankush Agarwal 6d21b2ba80 Replace fmt.Fprint* with io.WriteString 
This fixes vet warnings in api/client/stats.go

Fixes #11825

Signed-off-by: Ankush Agarwal <ankushagarwal11@gmail.com>
 2015-03-27 13:08:20 -07:00
Félix Baylac-Jacqué 6b764bba8a Fix vet warning in devicemapper. 
Issue #11828

Signed-off-by: Félix Baylac-Jacqué <baylac.felix@gmail.com>
 2015-03-27 20:16:25 +01:00
Elijah Zupancic de45aacc32 Added updated working Riak Dockerfile and documentation. 
Signed-off-by: Elijah Zupancic <elijah@zupancic.name>
 2015-03-27 12:03:46 -07:00
Elijah Zupancic 31c5041157 Removed references to creating an OpenSSH server. This method of accessing the Docker container is no longer needed now that the exec command is available. 
Signed-off-by: Elijah Zupancic <elijah@zupancic.name>
 2015-03-27 12:03:34 -07:00
Elijah Zupancic 17303b18b8 Removed ulimit steps from Dockerfile because they aren't applied according to @cpuguy83. 
Signed-off-by: Elijah Zupancic <elijah@zupancic.name>
 2015-03-27 12:03:24 -07:00
Antonio Murdaca 60085e22ff Remove err field from Job struct, fixes #11804 
Signed-off-by: Antonio Murdaca <me@runcom.ninja>
 2015-03-27 19:08:53 +01:00
Eric Rafaloff 3716df57c0 Update inline doc for New 
Signed-off-by: Eric Rafaloff <erafaloff@gmail.com>
 2015-03-27 13:55:22 -04:00
Jessie Frazelle 121de9e4e3 Merge pull request #11850 from kytrinyx/11796-git-mental-model 
Clarify git instructions in project guide. Fixes #11796
 2015-03-27 09:02:03 -07:00
Brian Goff da5c863d20 Merge pull request #11788 from reikani/pchoi 
Changed snake case naming to camelCase.
 2015-03-26 23:55:50 -07:00
Eric Rafaloff 6abe160eae Add missing . in comment 
Signed-off-by: Eric Rafaloff <erafaloff@gmail.com>
 2015-03-26 23:22:05 -04:00
Eric Rafaloff 01bbc3fbb9 Add some basic doc for SysInfo 
Signed-off-by: Eric Rafaloff <erafaloff@gmail.com>
 2015-03-26 23:05:07 -04:00
Srini Brahmaroutu f5ad895ba6 Use common code to test all events, when using filter that expect all lifecycle events. 
Addresses: #10654

Signed-off-by: Srini Brahmaroutu <srbrahma@us.ibm.com>
 2015-03-27 02:47:46 +00:00
Christy Perez dd6f988b23 Fix typo in doc at /set-up-dev-env 
Save a whale!

Signed-off-by: Christy Perez <christy@linux.vnet.ibm.com>
 2015-03-26 21:46:35 -05:00
Katrina Owen 54c9ae187f Clarify git instructions in project guide. Fixes #11796 
The git model uses `upstream master` to refer to the branch on
the remote repository, and `upstream/master` to refer to the
local cache of the upstream branch.

I did not explain the difference in the docs (that seemed a bit
excessive), but I did clarify the instructions so that it refers
to the correct concept in each place.

Signed-off-by: Katrina Owen <katrina.owen@gmail.com>
 2015-03-26 19:24:14 -07:00
moxiegirl d2df901be3 Merge pull request #11846 from voltaic/master 
Update set-up-dev-env.md
 2015-03-26 18:09:28 -07:00
moxiegirl cd8ea1d17e Merge pull request #11793 from lolilo/update-project-doc 
fix typos, grammar, more concise wording
 2015-03-26 17:57:45 -07:00
Doug Davis 9a9d23dbc4 Clean up integration-cli tests 
My AR couldn't take it any more:
- one logDone per test
- PASSED lines don't wrap

Signed-off-by: Doug Davis <dug@us.ibm.com>
 2015-03-26 17:25:50 -07:00
Brian Goff 756b8f2fde Merge pull request #11841 from runcom/11762-replace-aliased-logrus-imports 
Replace aliased imports of logrus
 2015-03-26 16:49:01 -07:00
Daniel S ddcb3ad061 Update set-up-dev-env.md 
Signed-off-by: graycoder <patgray1127@gmail.com>
 2015-03-26 19:41:31 -04:00
Olivier Gambier be5fd157d5 Merge pull request #11813 from miminar/show-verified-status 
Consider tag updated also in case repo does not exist
 2015-03-26 16:29:13 -07:00
Jessie Frazelle cf7104a0e8 Merge pull request #11840 from ahmetalpbalkan/win-cli/term-resize-fix 
term/winconsole: Identify tty correctly, fix resize problem
 2015-03-26 16:19:27 -07:00
chli f581f74209 Issue #11836 
Signed-off-by: chli <chli@freewheel.tv>
 2015-03-26 19:18:23 -04:00
moxiegirl 8c1118a8f9 Merge pull request #11832 from jamiehannaford/patch-1 
Fix spelling
 2015-03-26 15:47:27 -07:00