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

44 Commits

Author SHA1 Message Date
Stefan Pietsch e8e2eb6e59 check hash sums of downloaded files 
Signed-off-by: Stefan Pietsch <mail.ipv4v6+gh@gmail.com>
 2017-06-08 17:42:43 -07:00
Joffrey F 84774cacd2 Upgrade python and pip versions in Dockerfile 
Add libbz2 dependency

Signed-off-by: Joffrey F <joffrey@docker.com>
 2017-02-01 14:12:41 -08:00
Daniel Nephin 26fe8213aa Upgade pip to latest 
Hopefully fixes our builds.

Signed-off-by: Daniel Nephin <dnephin@docker.com>
 2016-04-26 11:58:41 -04:00
Daniel Nephin 385b4280a1 Fix jenkins CI by using an older docker version to match the host. 
Signed-off-by: Daniel Nephin <dnephin@docker.com>
 2015-11-04 15:33:37 -05:00
Viranch Mehta 07e9f6500c Pipe curl's download directly to extract/execute program to reduce number of commands 
Signed-off-by: Viranch Mehta <viranch.mehta@gmail.com>
 2015-10-18 01:06:50 +05:30
Daniel Nephin 8b29a50b52 Trim the dockerfile and re-use the virtualenv we already have. 
Signed-off-by: Daniel Nephin <dnephin@docker.com>
 2015-09-17 18:46:29 -04:00
Daniel Nephin 9978c3ea52 Update scriptests/test-versions to work with daemon args, and move docker version constants into tests-versions. 
Signed-off-by: Daniel Nephin <dnephin@gmail.com>
 2015-09-17 17:35:49 -04:00
Aanand Prasad a1ec26435c Test against Docker 1.8.2 RC1 
Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
 2015-09-03 18:30:50 -07:00
Daniel Nephin 6ac617bae1 Split requirements-build.txt from requirements-dev.txt to support a leaner tox.ini 
Signed-off-by: Daniel Nephin <dnephin@gmail.com>
 2015-09-01 16:27:44 -04:00
Daniel Nephin 1451a6e188 Python3 requires a locale 
Signed-off-by: Daniel Nephin <dnephin@gmail.com>
 2015-08-25 11:10:02 -04:00
Daniel Nephin 2943ac6812 Cleanup requirements.txt so we don't have to maintain separate copies for py2 and py3. 
Signed-off-by: Daniel Nephin <dnephin@gmail.com>
 2015-08-25 10:46:08 -04:00
funkyfuture 9aa61e596e Run tests against Python 2.6, 2.7, 3.3, 3.4 and PyPy2 
In particular it includes:
- some extension of CONTRIBUTING.md
- one fix for Python 2.6 in tests/integration/cli_test.py
- one fix for Python 3.3 in tests/integration/service_test.py
- removal of unused imports

Make stream_output Python 3-compatible

Signed-off-by: Frank Sachsenheim <funkyfuture@riseup.net>
 2015-08-25 10:41:09 -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 fae6454661 Add pre-commit hooks 
Signed-off-by: Daniel Nephin <dnephin@gmail.com>
 2015-08-24 17:04:45 -04:00
Aanand Prasad 65afce526a Test against Docker 1.8.1 
Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
 2015-08-14 12:42:33 +01:00
Aanand Prasad 4390362366 Test against Docker 1.8.0 RC3 
Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
 2015-08-10 12:01:51 +01:00
Aanand Prasad 118a389646 Update API version to 1.19 
Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
 2015-07-29 15:44:21 +01:00
Aanand Prasad e675d67774 Test against Docker 1.6.2 and 1.7.1 
Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
 2015-07-15 14:37:44 +01:00
Aanand Prasad ae96e1af16 Use Docker 1.7.0 
Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
 2015-06-18 10:34:34 -07:00
Aanand Prasad e0af1a44ea Use Docker 1.7 RC5 
Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
 2015-06-16 15:14:48 -07:00
Aanand Prasad b4c49ed805 Use Docker 1.7 RC3 
Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
 2015-06-15 10:25:58 -07:00
Aanand Prasad 4fd5d58076 Test against Docker 1.7.0 RC2 
Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
 2015-06-10 14:19:36 -04:00
Aanand Prasad 2594282082 Build Python 2.7.9 in Docker image 
Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
 2015-06-01 17:56:15 +01:00
Aanand Prasad 021bf46557 Update Docker version to 1.6 stable 
Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
 2015-04-29 13:58:32 +01:00
Aanand Prasad b3382ffd4f Use Docker 1.6 RC4 
Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
 2015-04-03 10:57:28 -04:00
Aanand Prasad 0650c4485a Test against Docker 1.6 RC2 only 
Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
 2015-03-31 16:04:22 -04:00
Aanand Prasad db852e14e4 Add script/ci 
Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
 2015-03-27 14:39:32 -07:00
Aanand Prasad 99f7eba930 Add Docker 1.6 RC2 to tested versions 
Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
 2015-03-25 14:48:39 -07:00
Aanand Prasad 16495c577b Revert "Use dev version of Docker" 
This reverts commit d209ded13c.

Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
 2015-03-23 15:04:10 -07:00
Aanand Prasad d209ded13c Use dev version of Docker 
Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
 2015-03-20 18:12:04 -07:00
Aanand Prasad 42e6296b0e Kick everything off from a single container 
Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
 2015-03-09 17:53:54 +00:00
Aanand Prasad 74440b2f92 Run tests using Docker-in-Docker so we can test multiple versions 
Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
 2015-03-09 17:53:54 +00: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 bb85e238e0 Add fig as entrypoint to Dockerfile 
A step towards "docker run fig".

Signed-off-by: Ben Firshman <ben@firshman.co.uk>
 2014-11-20 17:23:43 +00:00
Ben Firshman b4fbab4b56 Run pyinstaller build as normal user 
... and test build on CI so we don't break it again!

Fixes #503

Signed-off-by: Ben Firshman <ben@firshman.co.uk>
 2014-09-30 16:25:40 -07:00
Alexander Holbreich 6797a322b5 Changing to stable debian (wheezy). 
Therefore it compiles agains more common version of GLIBC.

Now works out of the box on Debian wheezy, centos:centos6 and other stable
Of course it works on new distributions. Tested with:
    debian:jessie and
    ubuntu:14.04

Signed-off-by: Alexander Holbreich <alexander@holbreich.org>

Conflicts:
	Dockerfile
 2014-09-30 16:25:13 -07:00
Ben Firshman 7a8f5e10fd Add wercker.yml 
Changed Dockerfile to run as root so it has access to
/var/run/docker.sock.

Signed-off-by: Ben Firshman <ben@firshman.co.uk>
 2014-09-23 10:40:51 -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
Ben Firshman 3fc7ad3291 Don't use deprecated orchardup/python image 
Signed-off-by: Ben Firshman <ben@firshman.co.uk>
 2014-08-07 16:43:59 -07:00
Ben Firshman d600b3498b Remove entrypoint from dockerfile 2014-05-08 13:00:39 +01:00
Ben Firshman dff9aa6f0c Add installation and entrypoint to dockerfile 2014-05-05 10:50:23 +01:00
Ben Firshman ba66c849b5 Use Python base image and run as normal user 2014-03-03 15:10:02 +00:00
Ben Firshman b20190da98 Add basic Dockerfile 
Because.
 2014-01-16 17:28:47 +00:00