tyler.durden
/
compose
mirror of https://github.com/docker/compose.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity
2,566 Commits 25 Branches 263 Tags 66 MiB
Commit Graph

2566 Commits

Author SHA1 Message Date
Aanand Prasad 89cca7bcb2 Extract helper methods 
Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
 2016-02-01 15:51:15 +00:00
Aanand Prasad be66779fe9 Create declarations for named volumes 
Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
 2016-02-01 15:51:15 +00:00
Aanand Prasad 1772909fe2 Make sure version line is at the top of the file 
Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
 2016-02-01 15:51:15 +00:00
Aanand Prasad 86bdab64ab Make warnings a bit more readable 
Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
 2016-02-01 15:51:15 +00:00
Aanand Prasad 36a10f8dd5 Update for links, external_links, network_mode 
Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
 2016-02-01 15:51:15 +00:00
Aanand Prasad 9249ec62c2 Add note about named volumes to upgrade guide 
Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
 2016-02-01 15:51:15 +00:00
Aanand Prasad 4537ec70cc Remove outdated warnings about links from docs 
Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
 2016-01-27 13:33:38 +00:00
Aanand Prasad 695c692be6 Bump 1.6.0-rc2 
Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
 2016-01-27 01:42:21 +00:00
Aanand Prasad 297d20f085 Remove ability to join bridge network + user-defined networks 
Containers connected to the bridge network can't have aliases, so it's
simpler to rule that they can *either* be connected to the bridge
network (via `network_mode: bridge`) *or* be connected to user-defined
networks (via `networks` or the default network).

Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
 2016-01-27 01:42:21 +00:00
Joffrey F 16ef3d0eb8 Bump docker-py version to latest RC 
Signed-off-by: Joffrey F <joffrey@docker.com>
 2016-01-27 01:42:21 +00:00
Aanand Prasad d765a3fb91 Add back external links in v2 
Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
 2016-01-27 00:45:44 +00:00
Aanand Prasad 7f4a94514b Fix trailing whitespace in docker-compose.md 
Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
 2016-01-26 23:41:47 +00:00
Tobias Munk c0fe545947 fixed documentation about traversing yml files 
Signed-off-by: Tobias Munk <schmunk@usrbin.de>
 2016-01-26 18:58:15 +00:00
Aanand Prasad 52e74ab7ad Rename 'net' to 'network mode' in various classes/methods 
Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
 2016-01-26 11:52:23 +00:00
Aanand Prasad 2b46685855 Test that net can be extended 
Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
 2016-01-26 11:52:23 +00:00
Aanand Prasad 2b7306967b Implement network_mode in v2 
Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
 2016-01-26 11:52:23 +00:00
Joffrey F 3f28472ebc Move named volumes matching to config validation phase 
Signed-off-by: Joffrey F <joffrey@docker.com>
 2016-01-26 11:52:23 +00:00
Joffrey F 3da25aa463 is_named_volume also tests for home paths ~ 
Fix bug with VolumeSpec not being updated
Fix integration test

Signed-off-by: Joffrey F <joffrey@docker.com>
 2016-01-26 11:52:23 +00:00
Joffrey F a66bf72199 Match named volumes in service definitions with declared volumes 
Raise ConfigurationError for undeclared named volumes
Test new behavior

Signed-off-by: Joffrey F <joffrey@docker.com>
 2016-01-26 11:52:23 +00:00
Aanand Prasad 883227c4d8 Alias containers by short id 
Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
 2016-01-26 11:52:23 +00:00
Dimitar Bonev 5545c55ecc Network fields schema validation 
Signed-off-by: Dimitar Bonev <dimitar.bonev@gmail.com>
 2016-01-26 11:52:22 +00:00
Joffrey F 227fa5c0de Use latest docker-py rc 
Signed-off-by: Joffrey F <joffrey@docker.com>
 2016-01-26 11:52:22 +00:00
Aanand Prasad d399b7893f Add test for logs=False 
Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>

Conflicts:
	compose/cli/main.py
 2016-01-26 11:52:22 +00:00
Alf Lervag 833e16117e Fixes #2448 
Signed-off-by: Alf Lervag <alf.lervag@bouvet.no>

Conflicts:
	compose/cli/main.py
	requirements.txt
 2016-01-26 11:52:22 +00:00
Daniel Nephin bf068a8287 Add stop signal to the docs. 
Signed-off-by: Daniel Nephin <dnephin@docker.com>
 2016-01-26 11:52:22 +00:00
Aanand Prasad b1ebf5ce17 Fix interactive run with networking 
Make sure we connect the container to all required networks *after*
starting the container and *before* hijacking the terminal.

Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
 2016-01-26 11:52:22 +00:00
Aanand Prasad 836ec70979 Stop connecting to all networks on container creation 
This relies on an Engine behaviour which is a bug, not an intentional
feature - we have to connect to networks one at a time

Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
 2016-01-26 11:52:22 +00:00
Aanand Prasad 6ca410fd6b Fix 'run' behaviour with networks 
- Test that one-off containers join all networks
- Don't set any aliases

Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
 2016-01-26 11:52:22 +00:00
Joffrey F 38a6d04852 Update documentation for `external` param 
Signed-off-by: Joffrey F <joffrey@docker.com>

Conflicts:
	docs/compose-file.md
 2016-01-26 11:52:22 +00:00
Aanand Prasad 0952c1bb51 Add links to networks key references 
Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
 2016-01-26 11:52:21 +00:00
Aanand Prasad 18a1829db0 Update documentation for links 
Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
 2016-01-26 11:52:21 +00:00
Aanand Prasad e40de088f3 Document depends_on 
Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
 2016-01-26 11:52:21 +00:00
Aanand Prasad 6fe54f5c24 Update Compose file documentation for version 2 
- Explain each version in its own section
- Explain how to upgrade from version 1 to 2
- Note which keys are restricted to particular versions
- A few corrections to the docs for version-specific keys

Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
 2016-01-26 11:52:21 +00:00
Aanand Prasad 5cfd947f38 Stop and remove containers in parallel when scaling down 
Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
 2016-01-26 11:52:21 +00:00
Aanand Prasad 513a6b35cc Fix scale when containers exit immediately 
Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
 2016-01-26 11:52:21 +00:00
Aanand Prasad cbec6f8834 Support links in v2 files 
Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
 2016-01-26 11:52:21 +00:00
Aanand Prasad 76bc06b729 Fix Windows build failures when installing dependencies from git 
Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
 2016-01-26 11:52:21 +00:00
Jure Žvelc c9ef1fa32f Fix for extending services written in v2 format. 
Signed-off-by: Jure Žvelc <jzvelc@gmail.com>
 2016-01-26 11:52:20 +00:00
Daniel Nephin c52eed66b7 Update tests in sort_services_test.py to use pytest. 
Signed-off-by: Daniel Nephin <dnephin@docker.com>
 2016-01-26 11:52:20 +00:00
Daniel Nephin 3f65bdcf46 Move ulimits validation to validation.py and improve the error message. 
Signed-off-by: Daniel Nephin <dnephin@docker.com>
 2016-01-26 11:52:20 +00:00
Daniel Nephin 6e5c312768 Implement depends_on to define an order for services in the v2 format. 
Signed-off-by: Daniel Nephin <dnephin@docker.com>
 2016-01-26 11:52:20 +00:00
Daniel Nephin 33bb7c4e02 Add migration script. 
Signed-off-by: Daniel Nephin <dnephin@docker.com>
 2016-01-26 11:52:20 +00:00
Aanand Prasad bb377d3fe6 Fix "name is reserved" with Engine 1.10 RC1 
Ensure link aliases are unique (this deduping was previously performed
on the server).

Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
 2016-01-26 11:52:20 +00:00
Aanand Prasad 7442b416e8 Test that you can set the default network to be external 
Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
 2016-01-26 11:52:20 +00:00
Aanand Prasad fbee4ce4b3 Catch TLSParameterErrors from docker-py 
Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
 2016-01-26 11:52:20 +00:00
Steve Durrheimer 8398382b65 Add zsh completion for 'docker-compose up --abort-on-container-exit' 
Signed-off-by: Steve Durrheimer <s.durrheimer@gmail.com>
 2016-01-26 11:52:19 +00:00
Steve Durrheimer 7dd5fd5763 Add zsh completion for 'docker-compose down' 
Signed-off-by: Steve Durrheimer <s.durrheimer@gmail.com>
 2016-01-26 11:52:19 +00:00
Steve Durrheimer d5f3826ec7 Fix zsh completion to ensure we have enough commands to store in the cache 
Signed-off-by: Steve Durrheimer <s.durrheimer@gmail.com>
 2016-01-26 11:52:19 +00:00
Daniel Nephin 20c936a251 Fix some bugs in release scripts. 
Signed-off-by: Daniel Nephin <dnephin@docker.com>
 2016-01-26 11:52:19 +00:00
Daniel Nephin d2556a1347 Bump 1.6.0-rc1 
Signed-off-by: Daniel Nephin <dnephin@docker.com>
 2016-01-18 14:50:56 -05:00