tyler.durden
/
compose
mirror of https://github.com/docker/compose.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity
4,157 Commits 19 Branches 259 Tags 62 MiB
Commit Graph

93 Commits

Author SHA1 Message Date
Joffrey F abd395a5f3 Add 'socks' extra to help with proxy environment. 
SOCKS support will be included in the bundled (binary) version

Update some packages in requirements.txt and add some implicit deps

Signed-off-by: Joffrey F <joffrey@docker.com>
 2017-07-06 15:14:52 -07:00
Joffrey F 300b879d44 Bump docker Python SDK version -> 2.4.2 
Signed-off-by: Joffrey F <joffrey@docker.com>
 2017-07-03 12:06:16 -07:00
Joffrey F bcc4a76ea0 Bump docker version in requirements.txt 
Signed-off-by: Joffrey F <joffrey@docker.com>
 2017-06-05 15:02:51 -07:00
Joffrey F 48831a8d5f Bump docker SDK dependency 
Update invalid ports test

Signed-off-by: Joffrey F <joffrey@docker.com>
 2017-03-28 16:15:34 -07:00
Joffrey F e0e862c042 Update docker SDK dependency 
Signed-off-by: Joffrey F <joffrey@docker.com>
 2017-02-16 17:05:09 -08:00
Joffrey F 2593366a3e Bump docker SDK version 
Signed-off-by: Joffrey F <joffrey@docker.com>
 2017-01-30 16:49:05 -08:00
Joffrey F 2c157e8fa9 Use docker SDK 2.0.1 
Signed-off-by: Joffrey F <joffrey@docker.com>
 2017-01-09 15:27:20 -08:00
Joffrey F 346802715d Use colorama to enable colored output on Windows 
Signed-off-by: Joffrey F <joffrey@docker.com>
 2016-12-19 20:40:47 -08: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 716a6baa59 Implement 'healthcheck' option 
Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
 2016-11-18 14:47:02 +00:00
Joffrey F 7a430dbe96 Updated docker-py dependency to latest version 
Signed-off-by: Joffrey F <joffrey@docker.com>
 2016-11-02 16:56:45 -07:00
Joffrey F 046144e8f4 Bump docker-py version to include latest patch 
Signed-off-by: Joffrey F <joffrey@docker.com>
 2016-10-27 12:13:32 -07:00
Joffrey F 882084932d Upgrade docker-py to latest version 
Adjust required requests version

Signed-off-by: Joffrey F <joffrey@docker.com>
 2016-10-17 14:03:21 -07:00
Joffrey F fc6791f3f0 Bump docker-py dependency 
Signed-off-by: Joffrey F <joffrey@docker.com>
 2016-09-16 14:12:15 -07:00
Joffrey F b64bd07f22 Update docker-py dependency to latest release 
Signed-off-by: Joffrey F <joffrey@docker.com>
 2016-09-12 14:34:07 -07:00
Joffrey F 7f3375c2ce Update docker-py requirement to the latest release 
Signed-off-by: Joffrey F <joffrey@docker.com>
 2016-07-26 13:07:38 -07:00
Daniel Nephin 3d20e25bf8 Merge pull request #3661 from dnephin/fix_requirements 
Add missing deps to requirements.txt
 2016-06-30 18:21:40 -04:00
Daniel Nephin 2b6ea847b9 Update requirements.txt 
Signed-off-by: Daniel Nephin <dnephin@docker.com>
 2016-06-29 10:38:01 -04:00
Joffrey F a822406eb0 Update docker-py version in requirements 
Signed-off-by: Joffrey F <joffrey@docker.com>
 2016-06-28 15:49:06 -07:00
Joffrey F e4bb678875 Require latest docker-py version 
Signed-off-by: Joffrey F <joffrey@docker.com>
 2016-04-29 16:37:26 -07:00
Joffrey F 3ef6b17bfc Use docker-py 1.8.0 
Signed-off-by: Joffrey F <joffrey@docker.com>
 2016-04-06 13:28:45 -07:00
Joffrey F 1a7a65f84d Include docker-py requirements fix 
Signed-off-by: Joffrey F <joffrey@docker.com>
 2016-03-31 18:01:51 -07:00
Joffrey F d27b82207c Remove obsolete assert_hostname tests 
Signed-off-by: Joffrey F <joffrey@docker.com>
 2016-03-30 10:58:15 -07:00
Joffrey F 71c86acaa4 Update docker-py version to include match_hostname fix 
Removed unnecessary assert_hostname computation in tls_config_from_options

Signed-off-by: Joffrey F <joffrey@docker.com>
 2016-03-29 18:01:27 -07:00
Joffrey F 60470fb9f1 Require docker-py 1.8.0rc2 
Signed-off-by: Joffrey F <joffrey@docker.com>
 2016-03-24 10:13:56 -07:00
Joffrey F 4727115317 Bump docker-py version to include tcp host fix 
Signed-off-by: Joffrey F <joffrey@docker.com>
 2016-03-22 11:47:53 -07:00
Philip Walls 85c7d3e5ce Add support for docker run --tmpfs flag. 
Signed-off-by: Philip Walls <pawalls@rabidgeek.com>
 2016-03-18 18:19:48 -04:00
Matt Daue ee136446a2 Fix #2804: Add ipv4 and ipv6 static addressing 
- Added ipv4_network and ipv6_network to the networks section in the
  service section for each configured network
- Added feature documentation
- Added unit tests

Signed-off-by: Matt Daue <mattdaue@gmail.com>
 2016-03-09 18:37:52 -05:00
Stéphane Seguin 82632098a3 Add -f, --follow flag as option on logs. 
Closes #2187
Signed-off-by: Stéphane Seguin <stephseguin93@gmail.com>
 2016-03-01 20:23:43 +01:00
Joffrey F 97bbee19b7 Update docker-py version in requirements to 1.7.2 
Signed-off-by: Joffrey F <joffrey@docker.com>
 2016-02-23 14:55:06 -08:00
Joffrey F ba39d4cc77 Use docker-py 1.7.1 
Signed-off-by: Joffrey F <joffrey@docker.com>
 2016-02-22 12:56:54 -08:00
Spencer Rinehart 5e6dc3521c Add support for shm_size. Fixes #2823. 
shm_size controls the size of /dev/shm in the container and requires
Docker 1.10 or newer (API version 1.22).  This requires docker-py 1.8.0
(docker/docker-py#923).

Similar to fields like `mem_limit`, `shm_size` may be specified as
either an integer or a string (e.g., `64M`).

Updating docker-py to the master branch in order to get the unreleased
dependency on `shm_size` there in place.

Signed-off-by: Spencer Rinehart <anubis@overthemonkey.com>
 2016-02-10 15:25:18 -06:00
Aanand Prasad be236d8801 Update docker-py and dockerpty 
Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
 2016-02-04 19:16:01 +00:00
Joffrey F e69ef1c456 Bump docker-py version to latest RC 
Signed-off-by: Joffrey F <joffrey@docker.com>
 2016-01-27 00:36:38 +00:00
Joffrey F 77b435f4fe Use latest docker-py rc 
Signed-off-by: Joffrey F <joffrey@docker.com>
 2016-01-21 18:07:14 -08:00
Aanand Prasad f3e55568d1 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-21 18:42:59 +00:00
Daniel Nephin c3968a439f Refactor config loading to move version check into ConfigFile. 
Adds the cached_property package.

Signed-off-by: Daniel Nephin <dnephin@docker.com>
 2016-01-14 11:45:15 -05:00
Jonathan Stewmon b6618815b9 update docker-py requirement to use master branch 
Signed-off-by: Jonathan Stewmon <jstewmon@rmn.com>
 2016-01-13 16:18:00 -06:00
Joffrey F df6877a277 Use newer docker-py version 
Signed-off-by: Joffrey F <joffrey@docker.com>
 2016-01-05 15:09:39 -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 265828f4eb Fix texttable dep. 0.8.2 was removed from pypi. 
Signed-off-by: Daniel Nephin <dnephin@docker.com>
 2015-11-17 18:36:58 -05:00
Daniel Nephin 0227b3adbd Upgrade pyyaml to 3.11 
Signed-off-by: Daniel Nephin <dnephin@docker.com>
 2015-11-05 10:26:54 -05:00
Daniel Nephin 7c6e7e0dce Update docker-py to 1.5.0 
Signed-off-by: Daniel Nephin <dnephin@docker.com>
 2015-10-14 11:18:21 -04:00
Aanand Prasad d1dd06a7e2 Update docker-py to 1.4.0 
Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
 2015-09-11 15:42:20 -07: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 9d7ad796a3 bump requests to 2.7 to fix the ResponseNotReady() error, and add a missing default for tox posargs 
Signed-off-by: Daniel Nephin <dnephin@docker.com>
 2015-09-03 14:11: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
Mazz Mosley da36ee7cbc Perform schema validation 
Define a schema that we can pass to jsonschema to validate against the
config a user has supplied. This will help catch a wide variety of common
errors that occur.

If the config does not pass schema validation then it raises an exception
and prints out human readable reasons.

Signed-off-by: Mazz Mosley <mazz@houseofmnowster.com>
 2015-08-07 12:06:34 +01:00
Aanand Prasad f4dac02947 Update docker-py to 1.3.1 
Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
 2015-07-23 10:56:21 +01:00
Aanand Prasad 4ba9d9dac2 Make parallel tasks interruptible with Ctrl-C 
The concurrent.futures backport doesn't play well with
KeyboardInterrupt, so I'm using Thread and Queue instead.

Since thread pooling would likely be a pain to implement, I've just
removed `COMPOSE_MAX_WORKERS` for now. We'll implement it later if we
decide we need it.

Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
 2015-07-20 14:13:25 +01:00