Michael Crosby
faf5ef6f80
Change version to v1.0.0-dev
...
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com > (github: crosbymichael)
2014-06-09 07:14:51 -07:00
Michael Crosby
07e9ac9ffe
Merge branch 'release' into merge_release_v1.0.0
...
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com > (github: crosbymichael)
2014-06-09 07:14:40 -07:00
Michael Crosby
d9939758e6
Merge pull request #6303 from crosbymichael/bump_v1.0.0
...
Bump version to v1.0.0
2014-06-09 07:12:42 -07:00
James Turnbull
5dc6339e33
Merge pull request #6302 from Costent/patch-1
...
Update windows.md
2014-06-09 06:14:16 -07:00
William Riancho
875d0b776d
Update windows.md
...
Replace "OS X" by "Windows"
2014-06-09 11:23:54 +02:00
Solomon Hykes
2230f44558
Merge pull request #61 from aanand/fix-forward-spawn
2014-06-08 22:55:21 -07:00
Solomon Hykes
ccbef39934
Merge pull request #63 from shykes/pr_out_add_a_rackspace_cloud_backend_based_on_gophercloud_https_github_com_rackspace_gophercloud
2014-06-08 22:53:38 -07:00
John Hopper
b44dba9051
Add a Rackspace Cloud backend based on Gophercloud https://github.com/rackspace/gophercloud .
...
Signed-off-by: John Hopper john.hopper@jpserver.net
[solomon@docker.com: manually resolved conflicts]
Signed-off-by: Solomon Hykes <solomon@docker.com>
2014-06-09 05:51:54 +00:00
d11wtq
1d1e23611b
Rename --keep-old to --no-recreate
...
Signed-off-by: Chris Corbyn <chris@w3style.co.uk >
2014-06-09 01:31:51 +00:00
d11wtq
74e067c6e6
Document --keep-old flag in CLI reference
...
Signed-off-by: Chris Corbyn <chris@w3style.co.uk >
2014-06-09 01:31:50 +00:00
d11wtq
85b9619799
Document 'auto_start' in fig.yml
...
Signed-off-by: Chris Corbyn <chris@w3style.co.uk >
2014-06-09 01:31:50 +00:00
d11wtq
ab1fbc96c3
Move keep_old check up into Project
...
Signed-off-by: Chris Corbyn <chris@w3style.co.uk >
2014-06-09 01:31:50 +00:00
d11wtq
a04143e2a7
Remove unused: from __future__ import unicode_literals.
...
This is not being used and it confuses the Command class. Rather
than try to fix the Command class, I've taken the pragmatic
approach and removed the trigger that confuses it.
Signed-off-by: Chris Corbyn <chris@w3style.co.uk >
2014-06-09 01:31:50 +00:00
d11wtq
6c4299039a
Write integration tests for --keep-old in the CLI
...
Signed-off-by: Chris Corbyn <chris@w3style.co.uk >
2014-06-09 01:31:49 +00:00
d11wtq
655d347ea2
Write integration tests on new fig run linking behaviour
...
Signed-off-by: Chris Corbyn <chris@w3style.co.uk >
2014-06-09 01:31:49 +00:00
d11wtq
94a3164248
Re-add missing import for patch
...
Signed-off-by: Chris Corbyn <chris@w3style.co.uk >
2014-06-09 01:31:49 +00:00
d11wtq
18728a64b9
Write tests for --no-links changes to fig up
...
Signed-off-by: Chris Corbyn <chris@w3style.co.uk >
2014-06-09 01:31:48 +00:00
d11wtq
d8b0fa294e
Add integration tests for Project.up() w/ start_links and keep_old
...
Signed-off-by: Chris Corbyn <chris@w3style.co.uk >
2014-06-09 01:31:48 +00:00
d11wtq
a6c8319b5d
Add integration tests for Service.recreate_containers() with keep_old
...
Signed-off-by: Chris Corbyn <chris@w3style.co.uk >
2014-06-09 01:31:48 +00:00
d11wtq
5d92f12f8e
Add unit tests for include_links in get_services()
...
Signed-off-by: Chris Corbyn <chris@w3style.co.uk >
2014-06-09 01:31:48 +00:00
d11wtq
c0231bdb70
Rename _prepend_with_links() -> _inject_links()
...
Signed-off-by: Chris Corbyn <chris@w3style.co.uk >
2014-06-09 01:31:47 +00:00
d11wtq
ac541e208f
Remove obsolete method _get_linked_service_names()
...
Signed-off-by: Chris Corbyn <chris@w3style.co.uk >
2014-06-09 01:31:47 +00:00
d11wtq
3d8ce448b8
Spike: Re-use existing containers for fig run
...
Signed-off-by: Chris Corbyn <chris@w3style.co.uk >
2014-06-09 01:31:47 +00:00
d11wtq
949df97726
Fix issue with infinite recursion when service_names is empty
...
Signed-off-by: Chris Corbyn <chris@w3style.co.uk >
2014-06-09 01:31:46 +00:00
d11wtq
14cbe40543
Update doc string to reflect new behaviour.
...
Signed-off-by: Chris Corbyn <chris@w3style.co.uk >
2014-06-09 01:31:46 +00:00
d11wtq
9dd53ecdaa
Fix bug with duplicate service entries in fig up
...
Signed-off-by: Chris Corbyn <chris@w3style.co.uk >
2014-06-09 01:31:46 +00:00
d11wtq
6bfe5e049d
Spike: Implement --no-links for fig up
...
Signed-off-by: Chris Corbyn <chris@w3style.co.uk >
2014-06-09 01:31:46 +00:00
d11wtq
b672861ffd
Spike: Start linked containers on fig run by default
...
Signed-off-by: Chris Corbyn <chris@w3style.co.uk >
2014-06-09 01:31:45 +00:00
d11wtq
b081077f2b
Remove FIXME, as there's nothing to fix :)
...
Signed-off-by: Chris Corbyn <chris@w3style.co.uk >
2014-06-09 01:31:45 +00:00
d11wtq
13a296049b
Update cli integration test for 'auto_start' behaviour
...
Signed-off-by: Chris Corbyn <chris@w3style.co.uk >
2014-06-09 01:31:45 +00:00
d11wtq
22c531dea7
Add unit tests for Project.get_services()
...
Signed-off-by: Chris Corbyn <chris@w3style.co.uk >
2014-06-09 01:31:44 +00:00
d11wtq
dfc74e2a77
Write integration test for 'auto_start' behaviour
...
Signed-off-by: Chris Corbyn <chris@w3style.co.uk >
2014-06-09 01:31:44 +00:00
d11wtq
0c12db06ec
Move 'auto_start' option default to Service and add unit tests
...
Signed-off-by: Chris Corbyn <chris@w3style.co.uk >
2014-06-09 01:31:44 +00:00
d11wtq
edf6b56016
Spike: Add --up option to fig run
...
Signed-off-by: Chris Corbyn <chris@w3style.co.uk >
2014-06-09 01:31:43 +00:00
d11wtq
8b4ed0c1a8
Spike: Add 'auto_start' option to fig.yml
...
Signed-off-by: Chris Corbyn <chris@w3style.co.uk >
2014-06-09 01:31:27 +00:00
Sven Dowideit
e2fce7d612
Merge pull request #6299 from jamtur01/12link
...
Fixed API 1.12 links and misc other fixes
2014-06-08 18:06:27 -07:00
James Turnbull
135ced208c
Merge pull request #6297 from jamtur01/hub
...
Updated Docker Hub documentation
2014-06-08 18:03:28 -07:00
James Turnbull
871299de0d
Updated Docker Hub documentation
...
Docker-DCO-1.1-Signed-off-by: James Turnbull <james@lovedthanlost.net > (github: jamtur01)
2014-06-08 18:01:44 -07:00
James Turnbull
11fee48c2d
Fixed API 1.12 links and misc other fixes
...
Docker-DCO-1.1-Signed-off-by: James Turnbull <james@lovedthanlost.net > (github: jamtur01)
2014-06-08 17:59:22 -07:00
James Turnbull
3b0ae3ec68
Merge pull request #6298 from fredlf/copyedits
...
Edits to Win and OSX install
2014-06-08 17:56:34 -07:00
Aanand Prasad
f0f78738c9
Fix bug when spawning multiple Forward instances
...
`client` instance was being shared between separate instances
Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com >
2014-06-08 17:40:08 -07:00
Fred Lifton
9e2e8188ae
Docker-DCO-1.1-Signed-off-by: Fred Lifton <fred.lifton@docker.com> (github: fredfl)
2014-06-08 17:36:49 -07:00
Fred Lifton
9bc75d008e
Docker-DCO-1.1-Signed-off-by: Fred Lifton <fred.lifton@docker.com> (github: fredfl)
2014-06-08 17:35:49 -07:00
Sven Dowideit
a43cebf088
Merge pull request #6295 from ostezer/docs-ref-index-hub
...
Docs: Rename index with hub for ref. section
2014-06-08 16:47:48 -07:00
Sven Dowideit
83b446492c
Merge pull request #6265 from fredlf/copyedits
...
Copyedits
2014-06-08 16:47:12 -07:00
Fred Lifton
4fd9cc9980
Copy edits to Understanding Docker
...
Docker-DCO-1.1-Signed-off-by: Fred Lifton <fred.lifton@docker.com > (github: fredfl)
2014-06-08 16:46:31 -07:00
Michael Crosby
63fe64c471
Bump to version v1.0.0
...
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com > (github: crosbymichael)
2014-06-08 16:42:30 -07:00
Michael Crosby
9722c66dad
Merge branch 'master' into bump_v1.0.0
...
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com > (github: crosbymichael)
2014-06-08 16:40:19 -07:00
O.S. Tezer
b0a46d1cb9
Docs: Rename index with hub for ref. section
...
Docker-DCO-1.1-Signed-off-by: O.S. Tezer <ostezer@gmail.com > (github: ostezer)
2014-06-08 16:34:47 -07:00
unclejack
e570987c4f
Merge pull request #6293 from vieux/fix_version_decode
...
Fix version numbering
2014-06-09 02:23:27 +03:00