jyapayne/compose
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions
3,172 commits 9 branches 77 tags 9.3 MiB
Commit graph

3,172 commits

This branch
This branch
All branches
Author SHA1 Message Date
Sven Dowideit
fa5d794e24 Merge pull request #3522 from SvenDowideit/fix-links 
Fix links
(cherry picked from commit 17b219454f)

Signed-off-by: Sven Dowideit <SvenDowideit@home.org.au>
 2016-05-31 23:57:37 +00:00
Sven Dowideit
67e37156b2 Merge pull request #3452 from SvenDowideit/cherry-pick-v1.7.1-docs-fixes 
Cherry pick v1.7.1 docs fixes
 2016-05-18 09:41:57 +10:00
Sven Dowideit
05083b690c Merge pull request #3092 from wenchma/service_image 
Update image format for service conf reference
(cherry picked from commit f1603a3ee2)

Signed-off-by: Sven Dowideit <SvenDowideit@home.org.au>
 2016-05-17 05:42:03 +00:00
Sven Dowideit
c4f1bec924 Merge pull request #3417 from spectralsun/patch-1 
Small typo
(cherry picked from commit 5fa81c4044)

Signed-off-by: Sven Dowideit <SvenDowideit@home.org.au>
 2016-05-17 05:41:52 +00:00
Sven Dowideit
3a0b175593 Merge pull request #3392 from SvenDowideit/use-docs-base-oss 
convert docs Dockerfiles to use docs/base:oss
(cherry picked from commit c1c8c70800)

Signed-off-by: Sven Dowideit <SvenDowideit@home.org.au>
 2016-05-17 05:41:29 +00:00
Daniel Nephin
2246e8bfbe Merge pull request #3359 from bfirsh/clarify-compose-file-networks-documentation 
Clarify service networks documentation
(cherry picked from commit 1988dfeaf0)

Signed-off-by: Sven Dowideit <SvenDowideit@home.org.au>
 2016-05-17 05:39:03 +00:00
Ben Firshman
c7ef84a0ce Merge pull request #3222 from jonlemmon/patch-1 
Rails Docs: Add nodejs to apt-get install command
(cherry picked from commit 6ff3c47630)

Signed-off-by: Sven Dowideit <SvenDowideit@home.org.au>
 2016-05-17 05:38:21 +00:00
Aanand Prasad
174afeb974 Merge pull request #3303 from aanand/clarify-rm-and-down 
Clarify behaviour of rm and down
(cherry picked from commit 3d3f331404)

Signed-off-by: Sven Dowideit <SvenDowideit@home.org.au>
 2016-05-17 05:37:27 +00:00
Victoria
1523711e89 Merge pull request #3295 from londoncalling/docs-format-followup-PR3275 
added some formatting on the Wordress steps, and made heading levels …
(cherry picked from commit 97467c7dec)

Signed-off-by: Sven Dowideit <SvenDowideit@home.org.au>
 2016-05-17 05:36:23 +00:00
Victoria
b632ccba7f Merge pull request #3275 from activatedgeek/patch-1 
Updated Wordpress tutorial
(cherry picked from commit 80614cff9b)

Signed-off-by: Sven Dowideit <SvenDowideit@home.org.au>
 2016-05-17 05:36:09 +00:00
Ben Firshman
dad0dd664d Merge pull request #3187 from bfirsh/update-wordpress-example-to-use-official-images 
Update wordpress example to use official images
(cherry picked from commit c72d62f96d)

Signed-off-by: Sven Dowideit <SvenDowideit@home.org.au>
 2016-05-17 05:35:05 +00:00
Daniel Nephin
e15c2d53df Merge pull request #3249 from aanand/better-env-substitution-example 
Better variable substitution example
(cherry picked from commit a63a05964b)

Signed-off-by: Sven Dowideit <SvenDowideit@home.org.au>
 2016-05-17 05:34:17 +00:00
Daniel Nephin
888d2f3756 Merge branch 'release' of github.com:docker/compose into docs 2016-05-13 10:26:46 -04:00
Joffrey F
6c29830127 Merge pull request #3418 from shin-/bump-1.7.1 1.7.1 
Bump 1.7.1
 2016-05-04 13:03:11 -07:00
Joffrey F
0a9ab358bf Bump 1.7.1 
Signed-off-by: Joffrey F <joffrey@docker.com>
 2016-05-04 11:52:57 -07:00
Joffrey F
3c424b709e Properly handle APIError failures in Project.up 
Signed-off-by: Joffrey F <joffrey@docker.com>
 2016-05-04 11:52:57 -07:00
Joffrey F
47a40d42c7 Require latest docker-py version 
Signed-off-by: Joffrey F <joffrey@docker.com>
 2016-05-04 11:52:57 -07:00
Aaron Nall
f316b448c2 Add missing log event filter when using docker-compose logs. 
Signed-off-by: Aaron Nall <aronahl@hotmail.com>
 2016-05-04 11:52:57 -07:00
André R
6bfdde6855 Clarify env-file doc that .env is read from cwd 
Closes #3381

Signed-off-by: André R <ar@ez.no>
 2016-05-04 11:52:57 -07:00
Joffrey F
2a08d4731e Skip event objects that don't contain a status field 
Signed-off-by: Joffrey F <joffrey@docker.com>
 2016-05-04 11:52:57 -07:00
Joffrey F
11d8093fc8 Support combination of shorthand flag and equal sign for host option 
Signed-off-by: Joffrey F <joffrey@docker.com>
 2016-05-04 11:52:57 -07:00
Daniel Nephin
d0b46ca9b2 Upgade pip to latest 
Hopefully fixes our builds.

Signed-off-by: Daniel Nephin <dnephin@docker.com>
 2016-05-04 11:52:56 -07:00
Joffrey F
b7f9fc4b28 Define WindowsError on non-win32 platforms 
Signed-off-by: Joffrey F <joffrey@docker.com>
 2016-05-04 11:52:56 -07:00
Ben Firshman
70a605acac Explain the explanation about file versions 
This explanation looked like it was part of the error. Added an
extra new line and a bit of copy to explain the explanation.

Signed-off-by: Ben Firshman <ben@firshman.co.uk>
 2016-05-04 11:52:56 -07:00
Ben Firshman
85b85bc675 Make validation error less robotic 
"ERROR: Validation failed in file './docker-compose.yml', reason(s):"

is now:

"ERROR: The Compose file './docker-compose.yml' is invalid because:"

Signed-off-by: Ben Firshman <ben@firshman.co.uk>
 2016-05-04 11:52:56 -07:00
Patrice FERLET
b334b6f059 Fix the tests from jenkins 
Acceptance tests didn't set "help" command to return "0" EXIT_CODE.

close #3354
related #3263

Signed-off-by: Patrice Ferlet <metal3d@gmail.com>
 2016-05-04 11:52:56 -07:00
Joffrey F
0c1c338a02 Force docker-py 1.8.0 or above 
Signed-off-by: Joffrey F <joffrey@docker.com>
 2016-05-04 11:52:56 -07:00
johnharris85
f655a8af95 Account for aliased links Fix failing tests Signed-off-by: John Harris <john@johnharris.io> 2016-05-04 11:52:56 -07:00
johnharris85
f7cd94d4a9 Adding tests Signed-off-by: John Harris <john@johnharris.io> 2016-05-04 11:52:56 -07:00
johnharris85
e4d2d7ed8a Config now catches undefined service links Fixes issue #2922 Signed-off-by: John Harris <john@johnharris.io> 2016-05-04 11:52:56 -07:00
Daniel Nephin
2a8c2c8ad6 Unit test for skipping network disconnect. 
Signed-off-by: Daniel Nephin <dnephin@docker.com>
 2016-05-04 11:52:56 -07:00
Daniel Nephin
5852db4d72 Set networking_config when creating a container. 
Signed-off-by: Daniel Nephin <dnephin@docker.com>
 2016-05-04 11:52:56 -07:00
Daniel Nephin
250a7a530b Only disconnect if we don't already have the short id alias. 
Signed-off-by: Daniel Nephin <dnephin@docker.com>
 2016-05-04 11:52:56 -07:00
johnharris85
4e8b017283 Fix CLI docstring to reflect Docopt behaviour. 
Signed-off-by: John Harris <john@johnharris.io>
 2016-05-04 11:52:56 -07:00
Vladimir Lagunov
a86a195c50 Fix #3248: Accidental config_hash change 
Signed-off-by: Vladimir Lagunov <lagunov.vladimir@gmail.com>
 2016-05-04 11:52:56 -07:00
Tony Witherspoon
3368887a29 Updated StringIO import to support io module 
Signed-off-by: Tony Witherspoon <tony.witherspoon@gmail.com>
 2016-05-04 11:52:56 -07:00
Tony Witherspoon
e5f1429ce1 Updated cli_test.py to validate against the updated help command conditions 
Signed-off-by: Tony Witherspoon <tony.witherspoon@gmail.com>
 2016-05-04 11:52:56 -07:00
Tony Witherspoon
65b0e5973b updated cli_test.py to no longer expect raised SystemExit exceptions 
Signed-off-by: Tony Witherspoon <tony.witherspoon@gmail.com>
 2016-05-04 11:52:56 -07:00
Tony Witherspoon
9cf483e224 Added code to output the top level command options if docker-compose help with no command options provided 
Signed-off-by: Tony Witherspoon <tony.witherspoon@gmail.com>
 2016-05-04 11:52:56 -07:00
Aanand Prasad
1e164ca802 Fix format of 'restart' option in 'config' output 
Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
 2016-05-04 11:52:56 -07:00
Aanand Prasad
a2ded237e4 Fix output of 'config' for v1 files 
Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
 2016-05-04 11:52:56 -07:00
Aanand Prasad
8a9ab69a1c Check full error message in test_up_with_net_is_invalid 
Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
 2016-05-04 11:52:56 -07:00
Aanand Prasad
9cfbfd55c4 Remove v2_only decorators on config tests 
Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
 2016-05-04 11:52:56 -07:00
Joffrey F
d41e6e00fa Merge remote-tracking branch 'source/release' into bump-1.7.1 2016-05-04 11:49:05 -07:00
Daniel Nephin
1126e2a57a Merge branch 'release' of github.com:docker/compose into docs 
Conflicts:
	docs/extends.md
	docs/overview.md
 2016-04-13 13:22:42 -04:00
Daniel Nephin
e8da6cb631 Merge pull request #3319 from docker/bump-1.7.0 
WIP: Bump 1.7.0
 2016-04-13 13:20:02 -04:00
Daniel Nephin
0d7bf73446 Bump 1.7.0 1.7.0 
Signed-off-by: Daniel Nephin <dnephin@docker.com>
 2016-04-13 11:37:49 -04:00
Daniel Nephin
ea2d526246 Bump 1.7.0-rc2 1.7.0-rc2 
Signed-off-by: Daniel Nephin <dnephin@docker.com>
 2016-04-11 13:26:16 -04:00
Aanand Prasad
2160c787e3 Fix race condition 
If processing of all objects finishes before the queue is drained,
parallel_execute_iter() returns prematurely.

Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
 2016-04-11 13:26:16 -04:00
Aanand Prasad
ebae76bee8 Rename a couple of functions in parallel.py 
Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
 2016-04-11 13:26:16 -04:00