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

48 Commits

Author SHA1 Message Date
Joffrey F 8f0ef26a73 Improved version comparisons throughout the codebase 
Signed-off-by: Joffrey F <joffrey@docker.com>
 2017-07-11 17:40:53 -07:00
Joffrey F bd8d77feae Add configs tests 
Signed-off-by: Joffrey F <joffrey@docker.com>
 2017-06-06 11:50:09 -07:00
Daniel Nephin e0c6397999 Implement secrets using bind mounts 
Signed-off-by: Daniel Nephin <dnephin@docker.com>
 2017-01-31 09:53:16 -05:00
Joffrey F 04e5925a23 Use docker SDK 2.0 
Signed-off-by: Joffrey F <joffrey@docker.com>
 2016-12-14 15:36:08 -08:00
Aanand Prasad 2c9e46f60f Show a warning when engine is in swarm mode 
Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
 2016-07-25 13:46:56 +01:00
Daniel Nephin b33d7b3dd8 Prevent unnecessary inspection of containers when created from an inspect. 
Signed-off-by: Daniel Nephin <dnephin@docker.com>
 2016-04-06 11:14:42 -04:00
Aanand Prasad 371ea479f5 Merge pull request #3075 from dnephin/reactive_logs 
Display logs for new containers started after the command is run
 2016-03-16 21:03:25 +00:00
Daniel Nephin e5529a89e1 Make down idempotent, continue to remove resources if one is missing. 
Signed-off-by: Daniel Nephin <dnephin@docker.com>
 2016-03-15 13:26:29 -04:00
Daniel Nephin 65797558f8 Refactor log printing to support containers that are started later. 
Signed-off-by: Daniel Nephin <dnephin@docker.com>
 2016-03-15 13:17:10 -04:00
Joffrey F 7152f7ea76 Handle mismatched network formats in config files 
Signed-off-by: Joffrey F <joffrey@docker.com>
 2016-02-18 15:24:41 -08:00
Daniel Nephin 8e838968fe Refactor project network initlization. 
Signed-off-by: Daniel Nephin <dnephin@docker.com>
 2016-02-02 10:51:31 -05: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
Aanand Prasad 3eafdbb01b Connect services to networks with the 'networks' key 
Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
 2016-01-14 17:59:37 +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
Aanand Prasad a027a0079c Use networking for version 2 Compose files 
- Remove --x-networking and --x-network-driver
- There's now no way to set a network driver - this will be added back
  with the 'networks' key

Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
 2016-01-12 21:29:40 +00: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
Daniel Nephin d3cd038b84 Update event field names to match the new API fields. 
Signed-off-by: Daniel Nephin <dnephin@docker.com>
 2016-01-11 11:51:17 -05:00
Daniel Nephin d1d3969661 Add docker-compose event 
Signed-off-by: Daniel Nephin <dnephin@docker.com>
 2016-01-08 13:43:30 -05: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 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 533f33271a Move service sorting to config package. 
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
Mazz Mosley f9028703f4 Pick the first container 
Rather than inefficiently looping through all the containers that a
service has and overriding each volumes_from value, pick the first
one and return that.

Signed-off-by: Mazz Mosley <mazz@houseofmnowster.com>
 2015-10-07 11:27:13 +01: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 187ad4ce26 Refactor network_mode logic out of Service. 
Signed-off-by: Daniel Nephin <dnephin@docker.com>
 2015-09-03 13:02:46 -04:00
Daniel Nephin 809443d6d0 Support python 3 
Signed-off-by: Daniel Nephin <dnephin@gmail.com>
 2015-08-25 10:37:29 -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
Aanand Prasad dfa4bf4452 Ignore containers that don't have a name 
If a container is in the process of being removed, or removal has
failed, it can sometimes appear in the output of GET /containers/json
but not have a 'Name' key. In that case, rather than crashing, we can
ignore it.

Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
 2015-08-10 16:29:12 +01:00
Mazz Mosley 2db0a377e2 Minor test refactor 
Rather than creating a docker client within each test, create one
at setup and make it accessible to the whole class.

Signed-off-by: Mazz Mosley <mazz@houseofmnowster.com>
 2015-07-13 14:11:12 +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
Aanand Prasad c22cc02df5 Don't set network mode when none is specified 
Setting a value overrides the new default network option.

Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
 2015-06-19 15:22:13 -07:00
Michael Chase-Salerno 15b763acdb Fix for #1224, check that image or build is specified 
Signed-off-by: Michael Chase-Salerno <bratac@linux.vnet.ibm.com>
 2015-04-15 02:03:02 +00: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 4ecf5e01ff Extract YAML loading and parsing into config module 
Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
 2015-03-13 14:21:58 +00:00
Gil Clark 95f4e2c7c3 Make volumes_from and net containers first class dependencies and 
assure that starting order is correct.  Added supporting unit and
integration tests as well.

Signed-off-by: Gil Clark <gilclark1@gmail.com>
 2015-03-06 13:30:56 -08:00
Aanand Prasad 2af7693e64 WIP: rename Fig to Compose 
Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
 2015-01-20 21:00:23 +00:00
Satoshi Amemiya e5916b2fae Support volumes_from option 
Signed-off-by: Satoshi Amemiya <rail.sky@gmail.com>
 2014-07-02 13:27:54 +09:00
Chris Corbyn 247691ca44 Remove auto_start option from fig.yml. 
This option is redundant now that services can be started along with links.

Signed-off-by: Chris Corbyn <chris@w3style.co.uk>
 2014-06-21 10:39:36 +00:00
Chris Corbyn 1b5bf6e12a Merge remote-tracking branch 'upstream/master' into feature/auto_start 
Signed-off-by: Chris Corbyn <chris@w3style.co.uk>

Conflicts:
	tests/fixtures/simple-figfile/fig.yml
	tests/unit/project_test.py
 2014-06-12 22:05:51 +00:00
d11wtq 3a342fb25d Use busybox in fixtures, instead of ubuntu 
Signed-off-by: d11wtq <chris@w3style.co.uk>
 2014-06-11 10:25:50 +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 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 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
Ben Firshman ca7151aeb1 Split tests into unit and integration 2014-04-25 22:58:21 +01:00