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

43 Commits

Author SHA1 Message Date
Aanand Prasad 4e108e377e Update setup.py with new docker-py minimum 
Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
 2015-06-15 10:18:15 -07:00
Aanand Prasad ce880af821 Update dockerpty to 0.3.4 
Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
 2015-06-08 17:01:03 -04:00
Aanand Prasad 9bbf1a33d1 Update dockerpty to 0.3.3 
Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
 2015-05-14 20:03:50 +01:00
Aanand Prasad 1dccd58209 Update docker-py to 1.2.2 
Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
 2015-05-12 18:51:45 +01:00
Aanand Prasad 2e6bc078fb Implement 'labels' option 
Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
 2015-04-29 16:45:18 +01:00
Kyle Walker d17c4d27fa Support alternate Dockerfile name. 
Signed-off-by: Kyle James Walker <KyleJamesWalker@gmail.com>
 2015-04-24 08:30:36 -07: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 1c14fc06da Update docker-py and requests version ranges 
Leave the pinned versions in requirements.txt alone, as there's an
incompatibility between PyInstaller and requests 2.5.2 and 2.5.3, and by
extension with docker-py 1.1.0.

Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
 2015-03-23 15:04:18 -07:00
Aanand Prasad f4ef2c09d6 Revert "Remove restriction for requests version, update docker-py requirement" 
This reverts commit 81a32a266f.

Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
 2015-03-23 15:04:15 -07:00
Rotem Yaari 81a32a266f Remove restriction for requests version, update docker-py requirement 2015-03-13 14:39:11 +02:00
Aanand Prasad 8610adcaf3 Merge pull request #997 from abesto/use-latest-docker-py 
Use docker-py 1.0.0
 2015-03-02 14:15:18 +00:00
Zoltan Nagy 8f38b28816 Use docker-py 1.0.0 
Signed-off-by: Zoltan Nagy <abesto@abesto.net>
 2015-03-02 13:11:02 +01:00
Aanand Prasad cf6b09e94b Fix requests version range 
It was more permissive than docker-py's, resulting in an incompatible
version (2.5.x) being installed.

Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
 2015-02-25 17:34:22 +00:00
Daniel Nephin 0bc4a28dcc Use latest docker-py. 
Signed-off-by: Daniel Nephin <dnephin@gmail.com>
 2015-01-25 15:33:15 -05:00
Aanand Prasad 620e29b63f Rename binary to docker-compose and config file to docker-compose.yml 
Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
 2015-01-20 21:00:23 +00: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
Ben Firshman 788741025e Upgrade to docker-py 0.6.0 
Force using remote API version 1.14 so Fig is still compatible with
Docker 1.2.

Signed-off-by: Ben Firshman <ben@firshman.co.uk>
 2014-12-09 10:57:45 -08:00
Ben Firshman 38a3ee8d63 Use upstream dockerpty 0.3.2 
This reverts commit 60411e9f05.

Closes #556

Signed-off-by: Ben Firshman <ben@firshman.co.uk>

Conflicts:
	requirements.txt
	setup.py
 2014-11-04 10:23:42 +00:00
Aanand Prasad 67d4b7c587 Merge pull request #574 from bfirsh/update-tagline 
Update tagline to match website
 2014-10-22 12:46:16 +01:00
Ben Firshman 75b3dcf5fd Update tagline to match website 
Signed-off-by: Ben Firshman <ben@firshman.co.uk>
 2014-10-22 12:41:01 +01:00
Aanand Prasad 7a943739cb Fix docker-py requirement in setup.py 
I updated requirements.txt but forgot about setup.py, so the version on
pypi is broken for people who already have docker-py 0.5.0 installed.

Closes #547.

Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
 2014-10-17 11:17:58 +01:00
Aanand Prasad 60411e9f05 Vendor dockerpty at c8b493553477c9a57d163c71c97b2102f44a6ce7 
Include TLS fixes and relative imports:

c8b4935534

Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
 2014-10-16 16:24:39 +01:00
Jason Bernardino Alonso c270e9d622 Require docker-py 0.5 or later for insecure_registry kwarg 
Signed-off-by: Jason Bernardino Alonso <jalonso@luminoso.com>
 2014-09-26 16:36:42 -04:00
Ben Firshman b0159e5100 Upgrade to docker-py 0.5.0 
Signed-off-by: Ben Firshman <ben@firshman.co.uk>
 2014-09-08 09:23:01 -07:00
Daniel Nephin 7fd37c89b9 Remove fig.packages replace with real deps. 
Signed-off-by: Daniel Nephin <dnephin@gmail.com>
 2014-09-05 11:44:49 -07:00
Alex Brandt 3965db9dff Exclude tests package from installation. 
Installing the top-level tests package is asking for conflicts with
other python packages and isn't required to run fig.  This simply lets
find_packages know to ignore tests and any sub-packages.
 2014-08-11 09:00:16 -05:00
Daniel Nephin c0450f7df0 Resolves #366, non-pinned versions in setup.py:install_requires 
Signed-off-by: Daniel Nephin <dnephin@gmail.com>
 2014-07-29 17:13:22 -07:00
Ben Firshman 99064d17dd Docker, Inc. 
Signed-off-by: Ben Firshman <ben@firshman.co.uk>
 2014-07-24 10:24:17 -07:00
Ben Firshman 59c976510c Update URL in readme and setup.py 
Signed-off-by: Ben Firshman <ben@firshman.co.uk>
 2014-07-21 16:22:03 -07:00
Ben Firshman 3a2c9c1016 Switch to Apache License 2.0 
Signed-off-by: Ben Firshman <ben@firshman.co.uk>
 2014-05-28 10:59:21 +01:00
Ben Firshman 274728e5fb Update homepage in setup.py 2014-01-27 18:42:00 +00:00
Ben Firshman 18525554ed Add license to setup.py 2014-01-22 14:15:17 +00:00
Ben Firshman 7888027425 Put requirements back in .txt files 
Read-only FS in travis
 2014-01-06 17:58:50 +00:00
Christopher Grebs c6e91db32f Add texttable compat module that is py3k compatible 2014-01-06 17:58:50 +00:00
Christopher Grebs 93b9b6fd9f First version with python3 support. 
* Moved requirements*.txt files to proper spec definitions in setup.py
 * Added a new fig.compat module to store some compatibility code
 2014-01-06 17:58:49 +00:00
Ben Firshman 89cd7d8db0 Remove long description 2013-12-20 21:36:06 +00:00
Ben Firshman 8998bd1adc Make setup.py actually work for release 2013-12-20 21:35:00 +00:00
Ben Firshman dd920890f3 Read requirements in setup.py 2013-12-20 21:25:52 +00:00
Aanand Prasad 0cafdc9c6c plum -> fig 2013-12-20 20:28:24 +00:00
Ben Firshman 3b654ad349 Add basic CLI 2013-12-11 14:25:32 +00:00
Ben Firshman 523fb99d79 Fix URL in setup.py 2013-12-11 09:39:17 +00:00
Aanand Prasad 084b06cd12 Install docker-py from GitHub 
Just use requirements.txt for now, as doing it in setup.py is a pain.
 2013-12-09 16:29:53 +00:00
Aanand Prasad 0eb7d30861 yay 2013-12-09 11:41:05 +00:00