docker/docs
1
0
Fork 0
mirror of https://github.com/docker/docs.git synced 2026-11-05 00:14:17 +03:00
Code Activity
47,845 Commits 92 Branches 28 Tags
c16b77e4a204da17037641db2eadff84035cee92
Commit Graph

47845 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Jonathan Boulle
23b1b12b10 README: fix formatting of docker-registry link 
Signed-off-by: Jonathan Boulle <jonathanboulle@gmail.com>
 2015-11-20 17:18:25 -08:00
Alexandre Beslic
f2944386df Update Docker version in swarm-test-env Dockerfile 
Update the version of docker to 1.9.0 because of helpers
removal in hack/dind script that was mounting the cgroups.

It's now done automatically inside the containers as of
1.8.0.

Signed-off-by: Alexandre Beslic <abronan@docker.com>
 2015-11-20 16:53:54 -08:00
Alexander Morozov
afe6c1f30c Merge pull request #18135 from calavera/exec_store 
Move exec store to its own package inside the daemon.
 2015-11-20 16:36:18 -08:00
Brandon Burton
13081d4516 Fixing matrix include so os: linux goes to trusty 
Signed-off-by: Brandon Burton <brandon@inatree.org>
 2015-11-20 16:07:37 -08:00
Nathan LeClaire
863e51709a Merge pull request #2369 from dgageot/detect-multiple-host-only 
Detect multiple host only
 2015-11-20 15:23:38 -08:00
Michael Crosby
048280ca42 Merge pull request #18134 from hypriot/17802-fix-integration-tests-for-arm 
Increase timeouts to fix integration-cli tests on ARM
 2015-11-20 15:05:26 -08:00
Daniel Nephin
2351e11cc8 Make sure we always have the latest busybox image, so that build --pull tests don't flake. 
Signed-off-by: Daniel Nephin <dnephin@docker.com>
 2015-11-20 17:51:36 -05:00
David Calavera
9ca2e4e81c Move exec store to its own package inside the daemon. 
Remove double reference between containers and exec configurations by
keeping only the container id.

Signed-off-by: David Calavera <david.calavera@gmail.com>
 2015-11-20 17:40:16 -05:00
David Calavera
7caa313c82 Merge pull request #18127 from KostyaSha/patch-1 
Add Dead state to Container Inspect 1.21 API
 2015-11-20 14:39:25 -08:00
Antonio Murdaca
6653f82796 Merge pull request #17495 from mikebrow/docker-tz-and-nanosecond-updates 
modifying docker --since and --until to support nanoseconds and time …
 2015-11-20 23:37:44 +01:00
Michael Crosby
8022e6292e Merge pull request #18131 from hypriot/18124-use-startwithbusybox 
Fix integration-cli tests
 2015-11-20 14:20:12 -08:00
Stefan Scherer
88c1bc10c4 Increase timeouts to fix test on ARM 
Signed-off-by: Stefan Scherer <scherer_stefan@icloud.com>
 2015-11-20 23:12:12 +01:00
Daniel Nephin
64447879d2 Reduce complexity of merge_service_dicts 
Signed-off-by: Daniel Nephin <dnephin@docker.com>
 2015-11-20 17:09:55 -05:00
Daniel Nephin
d1adbb9b25 Refactor parallel_execute. 
Signed-off-by: Daniel Nephin <dnephin@docker.com>
 2015-11-20 17:09:51 -05:00
Michael Crosby
b5c507750f Merge pull request #18051 from calavera/extract_streams 
Extract StreamConfig struct out of the daemon package.
 2015-11-20 13:45:13 -08:00
Stefan Scherer
aef344dcf8 Replace s.d.Start() with s.d.StartWithBusybox() 
Signed-off-by: Stefan Scherer <scherer_stefan@icloud.com>
 2015-11-20 22:16:19 +01:00
Kanstantsin Shautsou
836d0127fd Add Dead state to Container Inspect 1.21 API 
Signed-off-by: Kanstantsin Shautsou <kanstantsin.sha@gmail.com>
 2015-11-21 00:06:37 +03:00
Jeffrey Morgan
b1eea914d0 Merge branch 'master' of github.com:docker/toolbox 2015-11-20 15:57:55 -05:00
Jeffrey Morgan
ad38e79c4f Bump versions 
Signed-off-by: Jeffrey Morgan <jmorganca@gmail.com>
 2015-11-20 15:57:27 -05:00
moxiegirl
d395134b3d Merge pull request #18094 from tophj-ibm/faq-link-fix 
Fixed docker network link in faq
 2015-11-20 12:13:07 -08:00
David Calavera
3f5b8f712d Extract StreamConfig struct out of the daemon package. 
This is a small configuration struct used in two scenarios:

1. To attach I/O pipes to a running containers.
2. To attach to execution processes inside running containers.

Although they are similar, keeping the struct in the same package
than exec and container can generate cycled dependencies if we
move any of them outside the daemon, like we want to do
with the container.

Signed-off-by: David Calavera <david.calavera@gmail.com>
 2015-11-20 15:04:27 -05:00
Jeffrey Morgan
2fd411d964 Merge pull request #283 from sirkkalap/master 
Fail fast in case we are run without a terminal
 2015-11-20 14:54:12 -05:00
Jeffrey Morgan
8b5876470a Merge pull request #308 from jeanlaurent/docker-machine-0.5.1 
Bump docker-machine to 0.5.1
 2015-11-20 14:53:18 -05:00
Antonio Murdaca
3e7405aea8 Deprecate HostConfig at API container start 
Signed-off-by: Antonio Murdaca <runcom@redhat.com>
 2015-11-20 20:45:55 +01:00
Vincent Demeester
f064b9941c Merge pull request #18073 from runcom/hostconfig-resources 
runconfig: split resources into a struct
 2015-11-20 20:29:44 +01:00
David Calavera
8fa09749fb Merge pull request #17718 from wenchma/17716_before_filter_doc 
Re-implement --before and --since as options for --filter
 2015-11-20 11:24:19 -08:00
Michael Crosby
6e49343202 Merge pull request #18067 from cpuguy83/fix_pull_space_test 
Make TestDaemonNoSpaceleftOnDeviceError linux only
 2015-11-20 10:51:21 -08:00
Alexander Morozov
6980113d10 Merge pull request #18126 from tiborvass/merge_release_v1.9.1 
Merge release v1.9.1
 2015-11-20 10:45:59 -08:00
Nathan LeClaire
c2496593fe Merge pull request #2359 from dgageot/test-vbox-version 
Reject VirtualBox version<=3
 2015-11-20 10:42:33 -08:00
Tibor Vass
75cb2dfe91 Bump version back to 1.10.0-dev 
Signed-off-by: Tibor Vass <tibor@docker.com>
 2015-11-20 13:40:25 -05:00
Antonio Murdaca
1a0b483e02 runconfig: split resources into a struct 
Signed-off-by: Antonio Murdaca <runcom@redhat.com>
 2015-11-20 19:40:01 +01:00
Tibor Vass
fefbb507a9 Bump version to v1.9.1 
Signed-off-by: Tibor Vass <tibor@docker.com>

Conflicts:
	VERSION
 2015-11-20 13:38:15 -05:00
David Gageot
5918bd1817 Merge pull request #2313 from nathanleclaire/release_process 
Start documenting release process
 2015-11-20 19:19:43 +01:00
Jess Frazelle
c1f11f8144 Merge pull request #18109 from phemmer/yum-docs-fix 
remove unnecessary echo from yum docs
 2015-11-20 13:10:55 -05:00
Alexander Morozov
a76bdea21b Merge pull request #16168 from NIWAHideyuki/16164-shm-size 
Addition of "--shm-size" to which size of /dev/shm is changed
 2015-11-20 10:01:48 -08:00
Nathan LeClaire
2d8c9eeeae Start documenting release process 
Signed-off-by: Nathan LeClaire <nathan.leclaire@gmail.com>
 2015-11-20 09:58:42 -08:00
David Gageot
8d47fe746e Reject VirtualBox version<=3 
Signed-off-by: David Gageot <david@gageot.net>
 2015-11-20 18:57:26 +01:00
David Gageot
bf52eceed5 FIX #2231 - Detect duplicate interfaces 
Signed-off-by: David Gageot <david@gageot.net>
 2015-11-20 18:47:39 +01:00
David Gageot
35b2b042e1 Merge pull request #2374 from dgageot/more-vb-tests 
Add more tests to the VirtualBox driver
 2015-11-20 18:47:20 +01:00
Brian Goff
44d3f2f71a Make TestDaemonNoSpaceleftOnDeviceError linux only 
Adds SameHostDaemon and DaemonIsLinux req's to
TestDaemonNoSpaceleftOnDeviceError

Signed-off-by: Brian Goff <cpuguy83@gmail.com>
 2015-11-20 12:44:49 -05:00
David Gageot
076bbf8bce Merge pull request #2373 from jeanlaurent/paused 
Fixes #2372, add test for #2356 ( stop and remove paused vm )
 2015-11-20 18:19:14 +01:00
Vincent Demeester
f9a4751eeb Merge pull request #18115 from wenchma/16756-docker_api_exec_test 
Use checker Assert for integration-cli/docker_api_exec_test.go
 2015-11-20 18:14:21 +01:00
Tibor Vass
6e727a4c80 Merge pull request #17456 from Microsoft/TestChtimesFix 
Fix ChTimes to prevent setting times past the Unix Max Time
 2015-11-20 18:07:09 +01:00
Daniel Nephin
c4096525c2 Merge pull request #2364 from dnephin/handle_signals_properly 
Handle SIGTERM/SIGINT properly for up and run
 2015-11-20 11:58:04 -05:00
Jean-Laurent de Morlhon
ade5911b32 Fixes #2372, add test for #2356 
Signed-off-by: Jean-Laurent de Morlhon <jeanlaurent@morlhon.net>
 2015-11-20 17:48:53 +01:00
Daniel Nephin
8bc84c74e7 Merge pull request #2417 from dnephin/inlude_git_sha_in_version 
Add the git sha to version output
 2015-11-20 11:39:38 -05:00
Daniel Nephin
331450dace Merge pull request #2390 from dnephin/fix_extra_warnings_on_masked_volumes 
Fix extra warnings on masked volumes
 2015-11-20 11:37:54 -05:00
Zhang Wei
92600bdec1 Add '-L' option for cp 
Fixes #16555

Original docker `cp` always copy symbol link itself instead of target,
now we provide '-L' option to allow docker to follow symbol link to real
target.

Signed-off-by: Zhang Wei <zhangwei555@huawei.com>
 2015-11-21 00:36:56 +08:00
Daniel Nephin
91fb6156c6 Merge pull request #2393 from seguins/1814-restart-stopped-containers 
Fix restart with stopped containers.
 2015-11-20 11:35:24 -05:00
Daniel Nephin
46446111e5 Merge pull request #2400 from dnephin/fix_stream_with_empty_object 
Fix a bug in progress_stream when an `ADD <url>` was used
 2015-11-20 11:33:45 -05:00