1
0
mirror of https://github.com/docker/docs.git synced 2026-11-14 04:50:52 +03:00
Commit Graph

47845 Commits

Author SHA1 Message Date
Arnaud Porterie
bd18d86250 Merge pull request #13492 from calavera/donot_force_syscall_unmount_on_cleanup
Do not force `syscall.Unmount` on container cleanup.
2015-05-26 15:23:16 -07:00
Sean Li
f868e110c8 Merge pull request #534 from kitematic/hub
Added new icons.
2015-05-26 15:19:53 -07:00
Sean Li
d84028fcdb New icons. 2015-05-26 15:03:11 -07:00
Alexandre Beslic
142030f65d Fix comment
Signed-off-by: Alexandre Beslic <abronan@docker.com>
2015-05-26 15:03:03 -07:00
Andrea Luzzardi
fa2809d431 Merge pull request #841 from abronan/consul_ttl_check
Additional check for ttl < 10s and Consul
2015-05-26 15:00:22 -07:00
Alexandre Beslic
dedb0ed906 Fix zookeeper watch that was triggered only once
Signed-off-by: Alexandre Beslic <abronan@docker.com>
2015-05-26 14:59:38 -07:00
Victor Vieux
62e46100cb Merge pull request #851 from aluzzardi/discovery-prefix
discovery: KV Path is now an optional prefix.
2015-05-26 14:57:56 -07:00
Evan Hazlett
53d0da039a debian: rebase and fix configureSwarm
Signed-off-by: Evan Hazlett <ejhazlett@gmail.com>
2015-05-26 17:55:38 -04:00
Evan Hazlett
3e1a6ed98c debian: rebase and streamline sudo install
Signed-off-by: Evan Hazlett <ejhazlett@gmail.com>
2015-05-26 17:54:47 -04:00
Evan Hazlett
290ead9ea0 debian: use proper location for config
Signed-off-by: Evan Hazlett <ejhazlett@gmail.com>
2015-05-26 17:54:47 -04:00
Evan Hazlett
c318008aea add debian provisioner
Signed-off-by: Evan Hazlett <ejhazlett@gmail.com>
2015-05-26 17:54:47 -04:00
Jeffrey Morgan
85f515dc36 Merge branch 'master' of github.com:kitematic/kitematic 2015-05-26 14:28:41 -07:00
David Calavera
f78dce152c Do not force syscall.Unmount on container cleanup.
This is not necessary and it's a regression from the old behavior.

Signed-off-by: David Calavera <david.calavera@gmail.com>
2015-05-26 14:28:26 -07:00
Jeffrey Morgan
aa2e55f9b7 Bump version to 0.6.0 2015-05-26 14:28:13 -07:00
Jeffrey Morgan
ba34f67c3e Merge pull request #533 from justinleveck/fix_faq_typo
Fix typo in FAQ
2015-05-26 14:26:43 -07:00
Andrea Luzzardi
1a58a85b44 discovery: KV Path is now an optional prefix.
"consul://addr1" will store discovery entries into "docker/swarm/nodes"
"consul://addr2/foo" will store entries in "foo/docker/swarm/nodes"

Signed-off-by: Andrea Luzzardi <aluzzardi@gmail.com>
2015-05-26 14:25:23 -07:00
Alexander Morozov
de318d8c1d Merge pull request #13489 from cpuguy83/cleanup_rm_funcs
Cleanup container rm funcs
2015-05-26 14:24:02 -07:00
Justin Leveck
fa73459f73 Fix typo in FAQ
Fixes typo in FAQ to increase readability.
2015-05-26 14:15:02 -07:00
Jessica Frazelle
40b71adee3 Revert "Add docker exec run a command in privileged mode"
This reverts commit 72a500e9e5.

Signed-off-by: Jessica Frazelle <princess@docker.com>

Conflicts:
	daemon/execdriver/native/exec.go
	integration-cli/docker_cli_exec_test.go
	runconfig/exec.go
2015-05-26 14:12:16 -07:00
Arnaud Porterie
47e727d1fc Merge pull request #13440 from LK4D4/fix_bridge_none
Fix network with -b none
2015-05-26 14:08:21 -07:00
Jeffrey Morgan
9f469d5f7b Bump version to 0.6 2015-05-26 14:08:05 -07:00
Jeffrey Morgan
1e5a210ab5 Merge branch 'master' into opt-in-binaries 2015-05-26 13:57:52 -07:00
Jeffrey Morgan
ac3b7ef4f6 Opt in binary setup 2015-05-26 13:57:41 -07:00
Jeffrey Morgan
01c95b7b81 Merge pull request #529 from kitematic/hub
Docker Hub Integration
2015-05-26 13:38:11 -07:00
Jeffrey Morgan
5b5c3e9c07 Removing empty function 2015-05-26 13:35:59 -07:00
Isabel Jimenez
920897defb disable mesos in the cli
Signed-off-by: Isabel Jimenez <contact.isabeljimenez@gmail.com>
2015-05-26 16:23:08 -04:00
Victor Vieux
300932b2d5 add slave_test.go, add tast_test.go
add basic network mode support

Signed-off-by: Victor Vieux <victorvieux@gmail.com>
Signed-off-by: Isabel Jimenez <contact.isabeljimenez@gmail.com>
Signed-off-by: Timothy Chen <tnachen@gmail.com>
2015-05-26 16:22:34 -04:00
Isabel Jimenez
19c14fde2e Adding integration tests, decline offers after 'SWARM_MESOS_OFFER_TIMEOUT', Tracking tasks and managing offers, refactoring list of slaves, queue create requests before processing them
Signed-off-by: Isabel Jimenez <contact.isabeljimenez@gmail.com>
Signed-off-by: Victor Vieux <vieux@docker.com>
2015-05-26 16:21:54 -04:00
Timothy Chen
20a5a7e588 Support port and address for Mesos.
Signed-off-by: Timothy Chen <tnachen@gmail.com>
Signed-off-by: Victor Vieux <vieux@docker.com>
Signed-off-by: Isabel Jimenez <contact.isabeljimenez@gmail.com>
2015-05-26 16:19:08 -04:00
Doug Davis
0a6a6f5b81 Move ErrorCode logic to new errcode package
Make HTTP status codes match the ErrorCode by looking it up in the Descriptors

Signed-off-by: Doug Davis <dug@us.ibm.com>
2015-05-26 13:18:54 -07:00
Isabel Jimenez
18235bee97 cluster mesos with engine
Signed-off-by: Timothy Chen <tnachen@gmail.com>
Signed-off-by: Isabel Jimenez <contact.isabeljimenez@gmail.com>
Signed-off-by: Victor Vieux <vieux@docker.com>
2015-05-26 16:18:33 -04:00
Victor Vieux
9db6bce98b Merge pull request #823 from vieux/containers
create containers.go
2015-05-26 13:05:26 -07:00
Tianon Gravi
3b795e035b Merge pull request #13409 from LK4D4/add_opts_to_checkconfig
Add some opts to checkconfig
2015-05-26 13:54:23 -06:00
boucher
4509f91b26 Update vendored libcontainer to v2.1
Docker-DCO-1.1-Signed-off-by: Ross Boucher <rboucher@gmail.com> (github: boucher)
2015-05-26 12:47:57 -07:00
Brian Goff
f8628ba891 Cleanup container rm funcs
Signed-off-by: Brian Goff <cpuguy83@gmail.com>
2015-05-26 15:38:52 -04:00
Evan Hazlett
0a0bbf7dc0 Merge pull request #1138 from nathanleclaire/swarm_options
Implement configurable Swarm options
2015-05-26 15:33:06 -04:00
Alexandre Beslic
814932ccb7 Simplify check
Signed-off-by: Alexandre Beslic <abronan@docker.com>
2015-05-26 12:32:00 -07:00
Victor Vieux
1e44801ba6 Merge pull request #850 from vieux/file_watch
Fix test for file watch
2015-05-26 12:04:25 -07:00
Victor Vieux
b5094bde55 create Containers type
Signed-off-by: Victor Vieux <victorvieux@gmail.com>
2015-05-26 12:01:48 -07:00
Derek McGowan
1f015478a0 Merge pull request #565 from stevvooe/uuid-testcase
Remove trailing spaces from range check on UUID parser
2015-05-26 11:49:36 -07:00
Victor Vieux
be10798096 use proper append in test
Signed-off-by: Victor Vieux <victorvieux@gmail.com>
2015-05-26 11:49:36 -07:00
Stephen J Day
f1c0f011f8 Remove trailing spaces from range check on UUID parser
Signed-off-by: Stephen J Day <stephen.day@docker.com>
2015-05-26 11:41:53 -07:00
Jeffrey Morgan
3e49f9953a Revert to personal repos 2015-05-26 11:38:10 -07:00
Derek McGowan
17ba3c0585 Merge pull request #564 from oilbeater/oilbeater-fixtypo
Fix typo
2015-05-26 11:30:49 -07:00
Victor Vieux
41c2060ab5 use heatbeat in second, not ms
Signed-off-by: Victor Vieux <victorvieux@gmail.com>
2015-05-26 11:19:04 -07:00
Derek McGowan
c19962ade1 Allow mirroring only for the official index
Strip authconfig from session to keep credentials from being sent to the mirror.

Signed-off-by: Derek McGowan <derek@mcgstyle.net> (github: dmcgowan)
2015-05-26 11:08:19 -07:00
Richard
13deed3801 Registry v2 mirror support.
The v2 registry will act as a pull-through cache, and needs to be
handled differently by the client to the v1 registry mirror.

See docker/distribution#459 for details

Configuration

Only one v2 registry can be configured as a mirror. Acceptable configurations
in this chanage are: 0...n v1 mirrors or 1 v2 mirror. A mixture of v1 and v2
mirrors is considered an error.

Pull

If a v2 mirror is configured, all pulls are redirected to that mirror. The
mirror will serve the content locally or attempt a pull from the upstream mirror,
cache it locally, and then serve to the client.

Push

If an image is tagged to a mirror, it will be pushed to the mirror and be
stored locally there. Otherwise, images are pushed to the hub. This is
unchanged behavior.

Signed-off-by: Richard Scothern <richard.scothern@gmail.com>
2015-05-26 11:08:19 -07:00
Alexandre Beslic
96241c6b79 pull out the log.Fatal from pkg/store to the discovery level
Signed-off-by: Alexandre Beslic <abronan@docker.com>
2015-05-26 11:01:17 -07:00
Jeffrey Morgan
2d403816c4 Fixing small ui bugs 2015-05-26 10:55:54 -07:00
David Calavera
fc679bebb9 Merge pull request #13479 from Microsoft/10662-fixcontaineragain
Windows: Fix up container again
2015-05-26 10:49:48 -07:00