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

947 Commits

Author SHA1 Message Date
Aanand Prasad d91c458d52 Merge pull request #509 from bfirsh/smarter-binary-urls 
Use uname to generate binary download URL
 2014-10-06 12:35:36 +01:00
Ben Firshman 475a7e19a9 Merge pull request #521 from aanand/clean-up-env-docs 
Clean up environment variable docs
 2014-10-06 12:34:35 +01:00
Aanand Prasad f43bfaadaa Clean up environment variable docs 
Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
 2014-10-06 11:58:16 +01:00
Aanand Prasad 2680756dd6 Merge pull request #518 from dnephin/env_docs 
Add environment variables to cli.md docs
 2014-10-06 11:36:21 +01:00
Daniel Nephin 837f368361 Add environment variables to cli.md docs. 
Signed-off-by: Daniel Nephin <dnephin@gmail.com>
 2014-10-03 13:47:54 -04:00
Aanand Prasad 9df5481066 Merge pull request #512 from bfirsh/fix-entrypoint 
Fix fig run entrypoint option
 2014-10-01 15:39:00 -07:00
Aanand Prasad 59c7528b4e Merge pull request #513 from bfirsh/update-wercker-badge 
Update wercker badge
 2014-10-01 14:57:47 -07:00
Ben Firshman d2385e3c2c Fix fig run entrypoint option 
Slipped through because Wercker didn't report build status.

Signed-off-by: Ben Firshman <ben@firshman.co.uk>
 2014-10-01 14:19:23 -07:00
Ben Firshman 6b600faf0b Update wercker badge 
I moved the project.

Signed-off-by: Ben Firshman <ben@firshman.co.uk>
 2014-10-01 12:50:30 -07:00
Aanand Prasad 431fdaa0f1 Merge pull request #490 from LuminosoInsight/insecure-pull 
Allow pulls from an insecure registry
 2014-10-01 10:52:54 -07:00
Aanand Prasad ed12f2539c Merge pull request #511 from bfirsh/support_entrypoint 
Add support for entrypoint to "fig run"
 2014-10-01 10:51:50 -07:00
Ben Firshman 0dc19cb885 Order "fig run" options alphabetically 
Signed-off-by: Ben Firshman <ben@firshman.co.uk>
 2014-10-01 09:28:28 -07:00
satoru 62b9c64311 Add support for the --entrypoint option of docker run 
Signed-off-by: Satoru Logic <satorulogic@gmail.com>
 2014-10-01 09:28:28 -07:00
Moss Collum 3408e0d463 Add unit test for Service.pull 
Signed-off-by: Moss Collum <mcollum@luminoso.com>
 2014-10-01 11:09:19 -04: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
Aanand Prasad 267be12bb2 Merge pull request #456 from dnephin/volumes_from_service 
Fix volumes_from a service with no containers
 2014-09-30 18:33:39 -07:00
Aanand Prasad ec5c864cc7 Merge pull request #460 from dnephin/fix_tests_for_docker_1.1 
Fix test failures on docker 1.1.2
 2014-09-30 17:52:38 -07:00
Aanand Prasad cabe47a379 Merge pull request #505 from bfirsh/use-debian-wheezy-base-image 
Compile against older version of GLIBC
 2014-09-30 17:07:15 -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
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
Aanand Prasad e04c5cb52c Merge pull request #506 from bfirsh/make-test-script-use-docker 
Make script/test use docker
 2014-09-30 15:16:07 -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
Aanand Prasad 253b245a1c Merge pull request #492 from dnephin/project_name_from_env 
Support setting project name from the environment
 2014-09-29 15:32:29 -07:00
Daniel Nephin fac49b62b6 Support setting project name from the environment. 
Signed-off-by: Daniel Nephin <dnephin@yelp.com>
 2014-09-29 18:01:08 -04:00
Ben Firshman 92ae5af019 Merge pull request #501 from aanand/fix-build-error 
Fix race condition in cli_test.py
 2014-09-28 04:54:08 +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
Jason Bernardino Alonso 1c5194e2ec Allow pulls from an insecure registry 
Signed-off-by: Jason Bernardino Alonso <jalonso@luminoso.com>
 2014-09-26 16:36:36 -04:00
Aanand Prasad 537d435a28 Fix race condition in cli_test.py 
We weren't waiting for the build to finish, causing the rest of the test
to occasionally fail when looking for the image.

Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
 2014-09-26 11:42:16 -07:00
Aanand Prasad 5d76d183b4 Merge pull request #483 from dnephin/sort_containers_by_name_in_ps 
Sort containers in ps output by name
 2014-09-26 10:18:08 -07:00
Aanand Prasad d4b7ed94e1 Merge pull request #499 from bfirsh/wercker-badge 
Add wercker badge to readme
 2014-09-25 11:37:03 -07:00
Aanand Prasad d978787fcc Merge pull request #439 from dnephin/faster_integration_tests 
Faster integration testing
 2014-09-24 17:34:52 -07:00
Ben Firshman 3535270ef0 Add wercker badge to readme 
And removed PyPi badge because who cares.

Signed-off-by: Ben Firshman <ben@firshman.co.uk>
 2014-09-24 14:19:27 -07:00
Ben Firshman b9eb55a225 Merge pull request #498 from bfirsh/mieciu-patch-1 
Fix the broken URL
 2014-09-24 21:53:57 +01:00
mieciu 35b217a0a4 Fix the broken URL 
It was not redirecting to the proper page

Signed-off-by: Przemek Hejman <przemyslaw.hejman@gmail.com>
 2014-09-24 13:52:08 -07:00
Aanand Prasad c37dc558fb Merge pull request #497 from bfirsh/wercker 
Add wercker.yml
 2014-09-24 10:51:56 -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 192fce9153 Resolves #43 - sort containers in ps output by name, so services are grouped together. 
Signed-off-by: Daniel Nephin <dnephin@gmail.com>
 2014-09-14 16:06:23 -04:00
Ben Firshman fc4c35e977 Merge pull request #411 from Banno/fig-pull 
adding "fig pull [SERVICE]" to pull service images
 2014-09-10 23:57:20 +01:00
Luke Amdor 648c89768b adding 'fig pull' to cli docs 
Signed-off-by: Luke Amdor <luke.amdor@gmail.com>
 2014-09-10 16:20:14 -05:00
Daniel Nephin e0b0801e87 Do less work during integration testing. 
Signed-off-by: Daniel Nephin <dnephin@gmail.com>
 2014-09-09 22:00:21 -04:00
Daniel Nephin 71e7103662 Fix some tests failing with docker 1.1.2 and add a comment to recreate_container() explaining what it does. 
Signed-off-by: Daniel Nephin <dnephin@gmail.com>
 2014-09-09 20:59:28 -04:00
Daniel Nephin dbd723659b Add container.get() which removes the duplication of container.inspect() in every property, and provides a nicer interface for querying container data. 
Signed-off-by: Daniel Nephin <dnephin@gmail.com>
 2014-09-09 20:59:28 -04:00
Aanand Prasad 6b221d5687 Merge pull request #477 from bfirsh/docker-py-0.5.0 
Upgrade to docker-py 0.5.0
 2014-09-08 14:20:12 -07:00
Ben Firshman ce8ef23c09 Merge pull request #393 from marksteve/restart 
Implement restart command (Closes #98)
 2014-09-08 17:47:08 +01: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
Ben Firshman ee6bb9a252 Merge pull request #475 from bfirsh/fix-missing-six-package 
Fix missing six package
 2014-09-06 02:20:55 +01:00
Ben Firshman 866050937a Fix missing six package 
I had some .pyc files kicking around, urgh.

Signed-off-by: Ben Firshman <ben@firshman.co.uk>
 2014-09-05 17:19:53 -07:00
Ben Firshman 41ee65b664 Merge branch 'dnephin-replace_packages_with_deps' 
Closes #375
 2014-09-05 11:55:17 -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