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

72 Commits

Author SHA1 Message Date
Aanand Prasad 4c2112dbfd Merge pull request #1539 from bfirsh/add-image-affinity-to-test 
Add image affinity to test script
 2015-06-12 11:56:02 -04:00
Ben Firshman ac222140e7 Add image affinity to test script 
This will allow tests to be run on a Swarm. This is being fixed in
Swarm 0.4: https://github.com/docker/swarm/issues/743

Signed-off-by: Ben Firshman <ben@firshman.co.uk>
 2015-06-11 15:58:07 -07:00
Aanand Prasad 8ad11c0bc8 Make sure we use Python 2.7.9 and OpenSSL 1.0.1 when building OSX binary 
Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
 2015-06-01 17:55:57 +01:00
Aanand Prasad c571bb485d Report Python and OpenSSL versions in --version output 
Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
 2015-06-01 17:55:31 +01:00
Ben Firshman a6bd1d22a0 Don't mount code in a volume when running tests 
An image is built anyway, so this is unnecessary. This makes it
possible to run the tests on a remote Docker daemon.

Signed-off-by: Ben Firshman <ben@firshman.co.uk>
 2015-05-29 13:23:42 +01:00
Aanand Prasad 7d9aa8e0a9 Script to prepare OSX build environment 
Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
 2015-05-27 16:27:24 +01:00
Aanand Prasad 240495f07f Remove DCO validation from CI script 
Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
 2015-04-27 15:02:24 +01: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
akoskaaa 4e0f555c58 make flake8 a bit more specific 
Signed-off-by: akoskaaa <akos.hochrein@prezi.com>
 2015-03-26 09:09:15 -07:00
akoskaaa fa2fb6bd38 [pep8] flake8 run for everything, fix items from this change 
Signed-off-by: akoskaaa <akos.hochrein@prezi.com>
 2015-03-25 23:15:34 -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 85fb8956f3 Validate DCO in script/test-versions 
Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
 2015-03-17 18:02:22 -07:00
Ben Firshman 1e5b9dc2eb Merge pull request #1005 from aanand/docker-in-docker 
Run tests using Docker-in-Docker so we can test multiple versions
 2015-03-17 15:13:59 +00:00
Aanand Prasad 7b1f01bb52 Add script/shell 
Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
 2015-03-12 14:02:14 +00: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
Ben Firshman a42f2007ea Merge pull request #1001 from SvenDowideit/build-docs-in-local-fig-repo 
add ./script/doc to build fig documentation using the docs.docker.com to...
 2015-02-23 22:45:59 +00:00
Sven Dowideit bd320b19fe add ./script/doc to build fig documentation using the docs.docker.com tooling 
Signed-off-by: Sven Dowideit <SvenDowideit@home.org.au>
 2015-02-23 13:56:13 +10:00
Ben Firshman 0fa0131372 Add script which runs Fig inside Docker 
Signed-off-by: Ben Firshman <ben@firshman.co.uk>
 2015-02-20 14:33:15 +00:00
Aanand Prasad 16d6018419 Fix typos 
Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
 2015-01-20 21:28:49 +00:00
Aanand Prasad 8297f55f2c Remove all website-related stuff from docs 
Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
 2015-01-20 21:00:23 +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 c12d1d73f0 Remove containers in scripts 
So we don't clutter up Docker with loads of stopped containers.

Signed-off-by: Ben Firshman <ben@firshman.co.uk>
 2014-12-09 10:49:37 -08: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 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 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
Ben Firshman f4b599551a Use uname to generate binary download URL 
Signed-off-by: Ben Firshman <ben@firshman.co.uk>
 2014-09-30 18:59:18 -07: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
Ben Firshman a3f70a9f64 Make script/test use Docker 
Really easy to run entire test suite with Docker now. Also switch
Wercker to use the same script.

Signed-off-by: Ben Firshman <ben@firshman.co.uk>
 2014-09-30 13:51:42 -07:00
Ben Firshman f407504679 Remove old Travis files 
Signed-off-by: Ben Firshman <ben@firshman.co.uk>
 2014-09-30 13:47:47 -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 aca0e42178 Validate DCO on Travis 
Copied straight from Docker, replacing github.com/docker/docker
with github.com/docker/fig in .validate.

Signed-off-by: Ben Firshman <ben@firshman.co.uk>
 2014-08-12 10:58:16 -07:00
Ben Firshman fc3c12ad90 Update repository URL 
Signed-off-by: Ben Firshman <ben@firshman.co.uk>
 2014-08-07 14:42:49 -07:00
Ben Firshman 01e2b56405 Add flake8 to test script 
For those who don't use tox.

Signed-off-by: Ben Firshman <ben@firshman.co.uk>
 2014-07-28 16:27:57 -07:00
Ben Firshman 190ea2bbd6 Add fig.egg-info to clean script 
Signed-off-by: Ben Firshman <ben@firshman.co.uk>
 2014-07-14 11:34:17 -07:00
Aanand Prasad d0b5bcf26a Pass byte strings straight through LogPrinter 2014-06-18 14:51:13 +01:00
Aanand Prasad c246897af1 Pass script/test arguments through to nosetests 2014-06-18 14:51:13 +01:00
Ben Firshman 7879dfd3fd Fix deploy docs script 2014-05-09 10:59:44 +01:00
Ben Firshman b99bb64487 Add sanity check to OS X build script 2014-05-08 13:03:21 +01:00
Ben Firshman 580affa5f3 Add sanity check to linux build script 2014-05-08 13:02:50 +01:00
Ben Firshman 8251dec587 Add docs, build and dist to clean script 2014-05-01 17:17:23 +01:00
Aanand Prasad 8f1793dd06 Merge pull request #186 from orchardup/update-docker-py-7f55a101f813f3e96413d1b577e98d9467b0bffc 
WIP: Docker >=0.9 support, docker-py 0.3.1
 2014-04-28 18:51:38 +01:00
Ben Firshman 29c9763feb Use Orchard to run integration tests 2014-04-25 23:24:05 +01:00
Scott M. Likens c2acceba4e Ensure `pwd`/dist exists always and is 777. 
Fixes #192

Signed-off-by: Scott M. Likens <scott@likens.us>
 2014-04-16 00:15:25 +00:00
Colin McCune 97be5b4cfb Updates the mac build script so it wont fail when the venv folder does not exist. 2014-03-27 20:22:05 -04:00
Ben Firshman f5cf9b60b2 Remove venv before building on OS X 2014-03-04 11:51:12 +00:00
Ben Firshman 431ce67f85 Add script to build Linux binary 2014-03-03 15:10:02 +00:00