1
0
mirror of https://github.com/docker/docs.git synced 2026-11-06 12:54:24 +03:00
Commit Graph

47845 Commits

Author SHA1 Message Date
Tibor Vass
ddbc68f564 Merge pull request #11843 from ahmetalpbalkan/win-cli/monitorttysize
windows: monitorTtySize correctly by polling
2015-03-31 11:14:04 -04:00
Xian Chaobo
fe054ba57c gofmt check and update readme
Signed-off-by: Xian Chaobo <xianchaobo@huawei.com>
2015-03-31 23:06:00 +08:00
Vivek Goyal
40945fc186 container: Do not remove contianer if any of the resource failed cleanup
Do not remove container if any of the resource could not be cleaned up. We
don't want to leak resources.

Two new states have been created. RemovalInProgress and Dead. Once container
is Dead, it can not be started/restarted. Dead container signifies the
container where we tried to remove it but removal failed. User now needs to
figure out what went wrong, corrent the situation and try cleanup again.

RemovalInProgress signifies that container is already being removed. Only
one removal can be in progress.

Also, do not allow start of a container if it is already dead or removal is
in progress.

Also extend existing force option (-f) to docker rm to not return an error
and remove container from user view even if resource cleanup failed.
This will allow a user to get back to old behavior where resources
might leak but atleast user will be able to make progress.

Signed-off-by: Vivek Goyal <vgoyal@redhat.com>
2015-03-31 09:51:19 -04:00
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
Sriram Natarajan
538e2f5b7e Validate value by checking for whitespace in constraint expression
Signed-off-by: Sriram Natarajan <natarajan.sriram@gmail.com>
2015-03-31 00:21:19 -07:00
Victor Vieux
9f8ba5118a Merge pull request #539 from snrism/fix_404_error
Fix 404 Error in Filter and Strategy README files
2015-03-30 23:36:42 -07:00
Sriram Natarajan
8a71a1d114 Fix 404 Error in Filter and Strategy README files
Signed-off-by: Sriram Natarajan <natarajan.sriram@gmail.com>
2015-03-30 23:30:52 -07:00
Victor Vieux
8d82079dff Merge pull request #532 from peggyl/500-api-pkg-godoc
Improve godocs for exported values in api pkg
2015-03-30 23:13:37 -07:00
Peggy Li
6103a94350 Improve godocs for exported values in api pkg
Signed-off-by: Peggy Li <peggyli.224@gmail.com>
2015-03-30 21:32:08 -07:00
jimmyxian
f0b19154f0 Implement 'docker commit' api
Signed-off-by: Xian Chaobo <xianchaobo@huawei.com>
2015-03-31 12:13:26 +08:00
Matt Bajor
c9dec8ba88 Closes #499: Enable golint on PRs
Signed-off-by: Matt Bajor <matt@notevenremotelydorky.com>
2015-03-30 21:39:00 -06:00
Phil Estes
97f621bcd8 Merge pull request #11861 from ZJU-SEL/11752-add-cap-list-table
Fix-11752 add capabilities list information table.
2015-03-30 23:18:30 -04:00
Harry Zhang
bf15f675b9 Revison the some columns to make table clearer
Signed-off-by: Harry Zhang <harryzhang@zju.edu.cn>
2015-03-31 02:41:49 +00:00
dalanlan
8d3d34d5e3 fix issue #11676 #11754, disable RLIMIT_AS,edit DOCKER_OPTS
Signed-off-by: Simei He <hesimei@zju.edu.cn>
2015-03-31 10:13:37 +08:00
Doug Davis
73b7cee89c Merge pull request #11946 from crosbymichael/no-pkg-init
Remove port mapper/allocator global state
2015-03-30 22:03:12 -04:00
Michael Crosby
d8c628cf08 Ensure that bridge driver does not use global mappers
This has a few hacks in it but it ensures that the bridge driver does
not use global state in the mappers, atleast as much as possible at this
point without further refactoring.  Some of the exported fields are
hacks to handle the daemon port mapping but this results in a much
cleaner approach and completely remove the global state from the mapper
and allocator.

Signed-off-by: Michael Crosby <crosbymichael@gmail.com>
2015-03-30 18:28:24 -07:00
Lewis Marshall
302e3834a0 Prevent Upstart post-start stanza from hanging
Once the job has failed and is respawned, the status becomes `docker
respawn/post-start` after subsequent failures (as opposed to `docker
stop/post-start`), so the post-start script needs to take this into
account.

I could not find specific documentation on the job transitioning to the
`respawn/post-start` state, but this was observed on Ubuntu 14.04.2.

Signed-off-by: Lewis Marshall <lewis@lmars.net>
2015-03-31 01:56:16 +01:00
Darren Shepherd
8f6a14452d Avoid ServeApi race condition
If job "acceptconnections" is called before "serveapi" the API Accept()
method will hang forever waiting for activation.  This is due to the fact
that when "acceptconnections" ran the activation channel was nil.

Signed-off-by: Darren Shepherd <darren@rancher.com>
2015-03-30 17:39:43 -07:00
Michael Crosby
62522c9853 Refactor portmapper to remove ALL global state
Signed-off-by: Michael Crosby <crosbymichael@gmail.com>
2015-03-30 17:31:21 -07:00
Michael Crosby
43a50b0618 Refactor port allocator to not have ANY global state
Signed-off-by: Michael Crosby <crosbymichael@gmail.com>
2015-03-30 17:30:59 -07:00
Jessie Frazelle
e7c48f5817 Merge pull request #11942 from crosbymichael/update-libct-mar30
Update libcontainer to c8512754166539461fd860451ff
2015-03-30 17:12:53 -07:00
Jessie Frazelle
f0ddbbaa86 Merge pull request #11933 from LK4D4/fix_err_mask
Various fixes for execdriver
2015-03-30 17:12:35 -07:00
Michael Crosby
e2d96d4304 Merge pull request #11939 from jfrazelle/fix-go1.3.3
fix basicAuth function not in go1.3.3
2015-03-30 16:51:42 -07:00
Jessie Frazelle
1ce39e234c Merge pull request #11904 from albers/completion-filters
Add missing filters to bash completion for docker images and docker ps
2015-03-30 16:37:01 -07:00
Victor Vieux
0f6a1846e2 Merge pull request #512 from abronan/doc_config_changes
Move note on top of Nodes config to avoid confusion
2015-03-30 16:33:34 -07:00
Evan Hazlett
1ae0aac23c Merge pull request #919 from crunchywelch/master
dont fail on trailing newline or empty line in ParseOsRelease()
2015-03-30 19:32:08 -04:00
Michael Crosby
17ecbcf8ff Update libcontainer to c8512754166539461fd860451ff
Signed-off-by: Michael Crosby <crosbymichael@gmail.com>
2015-03-30 16:29:10 -07:00
Nathan LeClaire
9b5f395c60 Implement upgrade functionality for boot2docker
Signed-off-by: Nathan LeClaire <nathan.leclaire@gmail.com>
2015-03-30 16:18:38 -07:00
Evan Hazlett
f7fbd39925 driver doc updates
Signed-off-by: Evan Hazlett <ejhazlett@gmail.com>
2015-03-30 19:13:05 -04:00
Alexander Morozov
2742bf5cbc Merge pull request #11938 from achanda/patch-1
Remove unused daemon.LogToDisk function
2015-03-30 15:48:03 -07:00
Aaron Welch
5c3ac31931 return empty key, val strings and nil err when given an empty string in parseLine()
add Centos test for ParseOsRelease() and blank line in test for ParseLine()
Signed-off-by: Aaron Welch <welch@packet.net>
2015-03-30 18:41:10 -04:00
Alexander Morozov
f468bbb7e8 Do not mask *exec.ExitError
Fix #11764

Signed-off-by: Alexander Morozov <lk4d4@docker.com>
2015-03-30 15:31:49 -07:00
Jessica Frazelle
4a2ef6c805 fix basicAuth function not in go1.3.3
Docker-DCO-1.1-Signed-off-by: Jessie Frazelle <jess@docker.com> (github: jfrazelle)

Docker-DCO-1.1-Signed-off-by: Jessie Frazelle <princess@docker.com> (github: jfrazelle)
2015-03-30 15:28:34 -07:00
Nathan LeClaire
a04b908fd3 Implement upgrade for Ubuntu provisioner
Signed-off-by: Nathan LeClaire <nathan.leclaire@gmail.com>
2015-03-30 15:23:25 -07:00
Michael Crosby
69b84c5be9 Merge pull request #11936 from runcom/11935-remove-duplicate-assignment
Remove duplicate assignment
2015-03-30 15:16:11 -07:00
Alexandre Beslic
a900458756 Removed useless code blocks and fixed templates
Signed-off-by: Alexandre Beslic <alexandre.beslic@gmail.com>
2015-03-30 15:16:06 -07:00
Alexandre Beslic
e421df418a Fixed indentation and template commands
Signed-off-by: Alexandre Beslic <alexandre.beslic@gmail.com>
2015-03-30 15:06:18 -07:00
Abhishek Chanda
1d23bae785 Remove unused daemon.LogToDisk function
Fixes #11937
Signed-off-by: Abhishek Chanda <abhishek.becs@gmail.com>
2015-03-30 14:54:17 -07:00
Alexandre Beslic
24745b7703 Change doc structure to better explain pre-requisites and Set-up process
Signed-off-by: Alexandre Beslic <alexandre.beslic@gmail.com>
2015-03-30 14:16:33 -07:00
Aanand Prasad
2a415ede08 When extending, build replaces image and vice versa
Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
2015-03-30 17:14:19 -04:00
Antonio Murdaca
cc46ae8eae Remove duplicate assignment
Signed-off-by: Antonio Murdaca <me@runcom.ninja>
2015-03-30 23:07:43 +02:00
Michael Crosby
fe9f3227b1 Merge pull request #11859 from HuKeping/eof
Add nice error message
2015-03-30 13:53:09 -07:00
Michael Crosby
00a15227f8 Merge pull request #11893 from runcom/11892-refactor-utils-flags
Refactor utils/flags.go
2015-03-30 13:35:40 -07:00
Alexander Morozov
5a1e5cf8c9 Get child processes before main process die
Signed-off-by: Alexander Morozov <lk4d4@docker.com>
2015-03-30 13:28:34 -07:00
Alexander Morozov
489ab77f4a Use proper wait function for --pid=host
Signed-off-by: Alexander Morozov <lk4d4@docker.com>
2015-03-30 13:27:38 -07:00
Michael Crosby
b6d6ffa1dd Merge pull request #11896 from vdemeester/9998-cp
Docker cp handles resolv.conf, hostname & hosts, fixes #9998
2015-03-30 13:15:00 -07:00
Michael Crosby
70a479dda5 Merge pull request #11900 from runcom/11899-refactor-utils-http
Refactor utils/http.go
2015-03-30 13:11:45 -07:00
Michael Crosby
a7a93fd2b2 Merge pull request #11931 from scarletmeow/11563_log_timestamp
Upgrade logrus to v0.7.2
2015-03-30 13:09:17 -07:00
Michael Crosby
72dfd6728f Merge pull request #11869 from dmcgowan/v2-push-gzipped
Compress layers on push to a v2 registry
2015-03-30 12:58:55 -07:00
Tiffany Low
711e580320 Upgrade logrus to v0.7.2
- Daemon logs now report to millisecond resolution

Signed-off-by: Tiffany Low <the.second.angel@gmail.com>
2015-03-30 12:27:03 -07:00