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
Victor Vieux
0b24992d7c Merge pull request #815 from jimmyxian/rmi_by_name
Fix image match
2015-05-26 10:43:59 -07:00
Stephen Day
a3006e8e45 Merge pull request #556 from stevvooe/remove-uuid-dependency
Replace uuid dependency with internal library
2015-05-26 10:39:35 -07:00
Alexandre Beslic
1040ec06e4 Return last index on CAS operation
Signed-off-by: Alexandre Beslic <abronan@docker.com>
2015-05-26 10:39:26 -07:00
Arnaud Porterie
7853bd29ec Merge pull request #13480 from Microsoft/10662-fixvolumecompile
Windows: Fix volume_windows compile
2015-05-26 10:32:44 -07:00
Jessica Frazelle
a08fb73f93 fix lxc tests unshare, they dont use our apparmor profile
Signed-off-by: Jessica Frazelle <princess@docker.com>
2015-05-26 10:31:21 -07:00
Victor Vieux
59620bda11 Merge pull request #848 from vieux/health-unit-test
Health unit test
2015-05-26 10:27:47 -07:00
Victor Vieux
9c9adc59c0 use exported ErrNoHealthyNodeAvailable in tests
Signed-off-by: Victor Vieux <victorvieux@gmail.com>
2015-05-26 10:19:39 -07:00
Nathan LeClaire
47bd262260 Implement configurable Swarm options
Signed-off-by: Nathan LeClaire <nathan.leclaire@gmail.com>
2015-05-26 10:18:34 -07:00
Victor Vieux
ad8a9724e2 Merge pull request #835 from aluzzardi/leader-election
Leader election
2015-05-26 10:11:19 -07:00
Victor Vieux
e2ec55a845 Merge pull request #846 from rajdeepd/test-discovery
Added TestCase for ContainsEntry
2015-05-26 10:08:38 -07:00
Evan Hazlett
7c2a4ac12c Merge pull request #1231 from frapposelli/move-vsphere-to-main-b2d
Moved VMware vSphere driver to main b2d release tree
2015-05-26 13:05:26 -04:00
Evan Hazlett
9bf7812473 Merge pull request #1090 from ehazlett/redhat-provisioning
RedHat provisioning
2015-05-26 12:52:29 -04:00
Evan Hazlett
12de02a16e merge nathanleclaire/ehazlett-redhat-provisioning
Signed-off-by: Evan Hazlett <ejhazlett@gmail.com>
2015-05-26 12:48:50 -04:00
Jeffrey Morgan
52f388fce6 Check for library namespace instead of is_official flag 2015-05-26 09:47:28 -07:00
Aanand Prasad
ef6555f084 Merge branch 'release' into bump-1.3.0 2015-05-26 17:45:28 +01:00
John Howard
1dc0499b64 Windows: Fix volume_windows compile
Signed-off-by: John Howard <jhoward@microsoft.com>
2015-05-26 09:43:21 -07:00
Jeffrey Morgan
38cf06f111 Tweaking setup timer 2015-05-26 09:38:05 -07:00
John Howard
5d207de509 Windows: Fix up container again
Signed-off-by: John Howard <jhoward@microsoft.com>
2015-05-26 09:33:55 -07:00
Aanand Prasad
1344099e29 Merge pull request #1444 from aanand/migrate-in-dependency-order
Migrate containers in dependency order
2015-05-26 17:30:14 +01:00
Brian Goff
0fccc40307 Merge pull request #13471 from ibuildthecloud/no-nil
Preinitialize MountPoints to avoid assigning to a nil map
2015-05-26 12:26:49 -04:00
Evan Hazlett
74de38d97f Merge pull request #1232 from frapposelli/move-fusion-to-main-b2d
[PR for 1.7.0] Move VMware Fusion driver to the official boot2docker release.
2015-05-26 12:26:34 -04:00
Evan Hazlett
a8e2cd7297 ssh: add -t to force tty allocation
Signed-off-by: Evan Hazlett <ejhazlett@gmail.com>
2015-05-26 12:22:28 -04:00
Evan Hazlett
0530ab3640 centos: update config path
Signed-off-by: Evan Hazlett <ejhazlett@gmail.com>
2015-05-26 12:22:28 -04:00
Evan Hazlett
97b6cd1197 centos: add provisioner
Signed-off-by: Evan Hazlett <ejhazlett@gmail.com>
2015-05-26 12:22:28 -04:00
Evan Hazlett
6426ec86ec fedora: remove configure repo
Signed-off-by: Evan Hazlett <ejhazlett@gmail.com>
2015-05-26 12:22:28 -04:00
Evan Hazlett
a0fe65256c fedora: provisioner based off of redhat
Signed-off-by: Evan Hazlett <ejhazlett@gmail.com>
2015-05-26 12:22:28 -04:00
Evan Hazlett
a0e40ab757 fedora: use proper location for config file
Signed-off-by: Evan Hazlett <ejhazlett@gmail.com>
2015-05-26 12:22:28 -04:00
Evan Hazlett
c2952175ad fedora: remove configure repo
Signed-off-by: Evan Hazlett <ejhazlett@gmail.com>
2015-05-26 12:22:28 -04:00
Evan Hazlett
25c3e3a200 fedora: provisioner based off of redhat
Signed-off-by: Evan Hazlett <ejhazlett@gmail.com>
2015-05-26 12:22:28 -04:00
Evan Hazlett
9bdd11e99b redhat: remove aws check; update docs
Signed-off-by: Evan Hazlett <ejhazlett@gmail.com>
2015-05-26 12:22:28 -04:00
Evan Hazlett
d2ca73c4cc redhat: update before docker install; use simpler config in proper location
Signed-off-by: Evan Hazlett <ejhazlett@gmail.com>
2015-05-26 12:22:28 -04:00
Evan Hazlett
467cb605e5 redhat: remove configure repo as we use our own rpms now
Signed-off-by: Evan Hazlett <ejhazlett@gmail.com>
2015-05-26 12:22:27 -04:00
Evan Hazlett
86687cfa6a redhat: update RPM path
Signed-off-by: Evan Hazlett <ejhazlett@gmail.com>
2015-05-26 12:22:27 -04:00
Evan Hazlett
d993437069 redhat: use docker RPMs for install
Signed-off-by: Evan Hazlett <ejhazlett@gmail.com>
2015-05-26 12:22:27 -04:00
Evan Hazlett
3ef6af1a8d redhat: install official docker
Signed-off-by: Evan Hazlett <ejhazlett@gmail.com>
2015-05-26 12:22:27 -04:00
Evan Hazlett
5707f13689 redhat: update for generic provisioner
Signed-off-by: Evan Hazlett <ejhazlett@gmail.com>
2015-05-26 12:22:27 -04:00
Evan Hazlett
619fcfb6f6 redhat: updated docs to explain base operating systems
Signed-off-by: Evan Hazlett <ejhazlett@gmail.com>
2015-05-26 12:22:26 -04:00
Evan Hazlett
fb35d58977 redhat: add redhat provisioning
Signed-off-by: Evan Hazlett <ejhazlett@gmail.com>
2015-05-26 12:21:33 -04:00
Evan Hazlett
b43a72f91a ssh: allocate pty for sudo over ssh for those that have requiretty
Signed-off-by: Evan Hazlett <ejhazlett@gmail.com>
2015-05-26 12:21:33 -04:00
Daniel Nephin
48f3d41947 Merge pull request #1447 from aanand/fix-convergence-when-service-not-created
Fix regression in `docker-compose up`
2015-05-26 10:54:28 -05:00
Sebastiaan van Stijn
aee9ac302d Merge pull request #13335 from jfrazelle/add-apparmor-unshare-test
add unshare apparmor profile test
2015-05-26 17:32:45 +02:00
Evan Hazlett
98e38006c0 Merge pull request #1218 from ehazlett/vbox-intel-nic
vbox: use intel driver for nic
2015-05-26 11:04:19 -04:00
Aanand Prasad
7da8e6be3b Migrate containers in dependency order
This fixes a bug where migration would fail with an error if a
downstream container was migrated before its upstream dependencies, due
to `check_for_legacy_containers()` being implicitly called when we fetch
`links`, `volumes_from` or `net` dependencies.

Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
2015-05-26 16:03:06 +01:00
Aanand Prasad
4795fd874f Fix regression in docker-compose up
When an upstream dependency (e.g. a db) has a container but a downstream
service (e.g. a web app) doesn't, a web container is not created on
`docker-compose up`.

Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
2015-05-26 16:01:05 +01:00
Aanand Prasad
276fee105b Merge pull request #1459 from bfirsh/update-description
Update description of Compose
2015-05-26 15:57:26 +01:00
Ben Firshman
8af4ae7935 Merge pull request #1441 from aanand/abort-on-legacy-containers
Bail out immediately if there are legacy containers
2015-05-26 15:45:08 +01:00
Ben Firshman
91ceb33d5a Update description of Compose
"Define and run multi-container applications with Docker"

Not just development environments, and "complex" is not clear and
not really true.

Signed-off-by: Ben Firshman <ben@firshman.co.uk>
2015-05-26 15:42:55 +01:00
Rajdeep Dua
d4c95f67b0 Added a New use case for Conflicting Affinity
Signed-off-by: Rajdeep Dua <dua_rajdeep@yahoo.com>
2015-05-26 07:42:21 -07:00
Oilbeater
b78b395ae2 Fix typo
Signed-off-by: Mengxin Liu <liumengxinfly@gmail.com>
2015-05-26 21:19:49 +08:00
Alexey Guskov
9e00e34092 Make hack/make.sh work on FreeBSD
Signed-off-by: Alexey Guskov <lexag@mail.ru>
2015-05-26 15:59:36 +03:00