tyler.durden/compose
1
0
Fork 0
mirror of https://github.com/docker/compose.git synced 2025-05-05 15:10:13 +02:00
Code Issues Packages Projects Releases Wiki Activity
4,604 Commits 21 Branches 270 Tags
Commit Graph

112 Commits

Author SHA1 Message Date
Daniel Nephin
e551988616 Include networks in the config_hash. 
Signed-off-by: Daniel Nephin <dnephin@docker.com>
 2016-02-02 10:52:03 -05:00
Daniel Nephin
0810eeba10 Don't initialize networks that aren't used by any services. 
Signed-off-by: Daniel Nephin <dnephin@docker.com>
 2016-02-02 10:52:03 -05:00
Aanand Prasad
aeef61fcd8 Make 'version' a string 
Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
 2016-02-02 13:58:34 +00:00
Aanand Prasad
ed1b204804 Rename 'net' to 'network mode' in various classes/methods 
Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
 2016-01-25 23:55:20 +00:00
Aanand Prasad
e566a4dc1c Implement network_mode in v2 
Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
 2016-01-25 23:24:55 +00:00
Joffrey F
48377a354f 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-22 16:05:21 -08:00
Joffrey F
9e67eae311 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-21 18:10:53 -08:00
Aanand Prasad
afae365050 Allow custom ipam config 
Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
 2016-01-18 18:56:18 +00:00
Aanand Prasad
406b6b28f4 Tag v2-only tests 
- Don't run them against Engine < 1.10
- Set the API version appropriately for the Engine version, so all tests
  use API version 1.22 against Engine 1.10

Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
 2016-01-15 02:08:20 +00:00
Aanand Prasad
69ed5f9c48 Specify networks in Compose file 
There's not yet a proper way for services to join networks

Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
 2016-01-14 17:59:36 +00:00
Daniel Nephin
b76dc1e05e Require volumes_from a container to be explicit in V2 config. 
Signed-off-by: Daniel Nephin <dnephin@docker.com>
 2016-01-14 11:45:16 -05:00
Joffrey F
d601199eb5 Normalize external_name 
Signed-off-by: Joffrey F <joffrey@docker.com>
 2016-01-13 12:07:08 -08:00
Joffrey F
9cb58b796e Implement ability to specify external volumes 
External volumes are created and managed by the user.
They are not namespaced.
They are expected to exist at the beginning of the up phase.

Signed-off-by: Joffrey F <joffrey@docker.com>
 2016-01-12 16:53:49 -08:00
Joffrey F
05935b5e54 Don't recreate pre-existing volumes. 
During the initialize_volumes phase, if a volume using the
non-namespaced name already exists, don't create the namespaced
equivalent.

Signed-off-by: Joffrey F <joffrey@docker.com>
 2016-01-12 15:42:42 -08:00
Aanand Prasad
1a66543461 Make the default network name '{project name}_default' 
Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
 2016-01-12 21:08:28 +00:00
Aanand Prasad
b786b47bc8 Remove version checks from tests requiring API v1.21 
Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
 2016-01-12 21:08:28 +00:00
Joffrey F
ca634649bb Changed logging override test into integration test 
Signed-off-by: Joffrey F <joffrey@docker.com>
 2016-01-11 16:25:19 -08:00
Daniel Nephin
475a091768 Update pre-commit config to enforace that future imports exist in all files. 
Signed-off-by: Daniel Nephin <dnephin@docker.com>
 2016-01-07 13:09:03 -05:00
Joffrey F
a7689f3da8 Handle volume driver change error in config. 
Assume version=1 if file is empty in get_config_version
Empty files are invalid anyway, so this simplifies the algorithm
somewhat.
https://github.com/docker/compose/pull/2421#discussion_r47223144

Don't leak version considerations in interpolation/service validation

Signed-off-by: Joffrey F <joffrey@docker.com>
 2016-01-05 15:22:13 -08:00
Joffrey F
f3a9533dc0 version no longer optional arg for process_config_file 
Signed-off-by: Joffrey F <joffrey@docker.com>
 2016-01-05 15:21:54 -08:00
Joffrey F
ec5111f1c2 Volumes are now prefixed with the project name 
When created through the compose file, volumes are prefixed
with the name of the project they belong to + underscore,
similarly to how containers are currently handled.

Signed-off-by: Joffrey F <joffrey@docker.com>
 2016-01-05 15:21:53 -08:00
Joffrey F
ecef5d37a7 Add v2 configuration tests 
Signed-off-by: Joffrey F <joffrey@docker.com>
 2016-01-05 15:21:53 -08:00
Joffrey F
b4be7b870f Add support for declaring named volumes in compose files 
* Bump default API version to 1.21 (required for named volume management)
* Introduce new, versioned compose file format while maintaining support
  for current (legacy) format
* Test updates to reflect changes made to the internal API

Signed-off-by: Joffrey F <joffrey@docker.com>
 2016-01-05 15:09:39 -08:00
Daniel Nephin
4bf2f8c4f9 Fix lookup of linked containers for API version 1.20 
Signed-off-by: Daniel Nephin <dnephin@docker.com>
 2016-01-05 15:09:39 -08:00
Daniel Nephin
73de81b51c Upgrade tests to use new Mounts in container inspect. 
Signed-off-by: Daniel Nephin <dnephin@docker.com>
 2016-01-05 15:09:39 -08:00
Stéphane Seguin
3c76d5a467 Add docker-compose create command. 
Closes #1125

Signed-off-by: Stéphane Seguin <stephseguin93@gmail.com>
 2015-12-18 08:53:26 +01:00
Daniel Nephin
dac75b07dc Move volume parsing to config.types module 
This removes the last of the old service.ConfigError

Signed-off-by: Daniel Nephin <dnephin@docker.com>
 2015-11-23 13:33:00 -05:00
Daniel Nephin
068edfa313 Move parsing of volumes_from to the last step of config parsing. 
Includes creating a new compose.config.types module for all the domain objects.

Signed-off-by: Daniel Nephin <dnephin@docker.com>
 2015-11-23 13:31:58 -05:00
Daniel Nephin
45724fc667 Only create the default network if at least one service needs it. 
Signed-off-by: Daniel Nephin <dnephin@docker.com>
 2015-11-10 12:43:55 -05:00
Daniel Nephin
1b5b407619 Fix networking tests to work with new API in engine rc4 (https://github.com/docker/docker/pull/17536) 
Signed-off-by: Daniel Nephin <dnephin@docker.com>
 2015-11-02 13:40:56 -05:00
Daniel Nephin
f7100b2ef3 Change version check from engine version to api version. 
Signed-off-by: Daniel Nephin <dnephin@docker.com>
 2015-10-21 15:40:50 -04:00
Daniel Nephin
0fed5e6864 Use inspect network to query for an existing network. 
And more tests for get_network()

Signed-off-by: Daniel Nephin <dnephin@docker.com>
 2015-10-21 13:05:14 -04:00
Vincent Demeester
5b55a08846 Add support for ro option in volumes_from 
Fixes #1188

Signed-off-by: Vincent Demeester <vincent@sbr.pm>
 2015-10-06 13:12:55 +01:00
Daniel Nephin
c0c9a7c1e4 Update integration tests for multiple file support 
Signed-off-by: Daniel Nephin <dnephin@docker.com>
 2015-09-17 14:13:50 -04:00
Daniel Nephin
0484e22a84 Add enum34 and use it to create a ConvergenceStrategy enum. 
Signed-off-by: Daniel Nephin <dnephin@gmail.com>
 2015-09-04 10:45:53 -04:00
Daniel Nephin
db9f577ad6 Extract link names into a function. 
Signed-off-by: Daniel Nephin <dnephin@docker.com>
 2015-09-03 14:08:44 -04:00
Daniel Nephin
59d4f304ee Run pre-commit on all files 
Signed-off-by: Daniel Nephin <dnephin@gmail.com>
 2015-08-24 17:04:50 -04:00
Frank Sachsenheim
227584b864 Adds pause and unpause-commands 
Signed-off-by: Frank Sachsenheim <funkyfuture@riseup.net>
 2015-08-21 12:43:13 +02:00
Aanand Prasad
ced94a3504 Make smart recreate the default 
Add --force-recreate flag to enable the old default behaviour of
recreating everything.

Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
 2015-07-17 11:28:02 +01:00
Aanand Prasad
0b887b841f Stop 'rm' and 'ps' listing services not defined in the current file 
If you have an alternate YAML file with different services defined,
containers for those services will be shown in `docker-compose ps` even
if you don't pass that file in.

Furthermore, `docker-compose rm` will claim that it's going to remove
them, but actually won't.

Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
 2015-07-03 14:34:27 +01:00
Daniel Nephin
ae96fc0071 Support reading config from stdin. 
Signed-off-by: Daniel Nephin <dnephin@gmail.com>
 2015-07-02 22:16:22 -04:00
Daniel Nephin
60351a8e07 Speed up integration test and make cleanup easier by using labels 
Signed-off-by: Daniel Nephin <dnephin@gmail.com>
 2015-06-14 16:45:28 -04: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
b0cb31c186 Use 'top' instead of 'sleep' as a dummy command 
Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
 2015-05-21 16:24:29 +01:00
Daniel Nephin
022f81711e Fixes #1434, Project.containers with service_names. 
Signed-off-by: Daniel Nephin <dnephin@gmail.com>
 2015-05-20 20:47:34 -04:00
Aanand Prasad
ef4eb66723 Implement smart recreate behind an experimental CLI flag 
Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
 2015-05-18 18:39:18 +01:00
akoskaaa
f9ea5ecf40 [pep8] make test files and config files pep8 valid 
Signed-off-by: akoskaaa <akos.hochrein@prezi.com>
 2015-03-25 20:20:38 -07:00
Aanand Prasad
37efdb1f8b Make volume host paths relative to file, merge volumes when extending 
Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
 2015-03-20 15:45:16 -07:00
Ben Firshman
dae451019b Merge pull request #1099 from aanand/fix-env-file-resolution 
Fix env file resolution
 2015-03-13 16:49:10 +00:00
Aanand Prasad
3c8ef6a94c Fix Project.up() tests 
Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
 2015-03-13 14:51:26 +00:00