tyler.durden/compose
1
0
Fork 0
mirror of https://github.com/docker/compose.git synced 2025-04-08 17:05:13 +02:00
Code Issues Packages Projects Releases Wiki Activity
762 Commits 23 Branches 268 Tags
Commit Graph

762 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Aanand Prasad
6580c5609c Merge pull request #526 from bfirsh/ship-1.0.0 
WIP: Ship 1.0.0
1.0.0 		2014-10-16 18:54:56 +01:00
Ben Firshman
a07c83659d Merge pull request #537 from aanand/tls 
TLS support
 2014-10-16 18:53:59 +01:00
Aanand Prasad
0f58b9f6b4 Update docker-py to 0.5.3 
Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
 2014-10-16 18:46:55 +01:00
Aanand Prasad
fed391a23e Update documentation for TLS and boot2docker 
Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
 2014-10-16 18:46:48 +01:00
Ben Firshman
4d1b2f1547 Ship 1.0.0 
Signed-off-by: Ben Firshman <ben@firshman.co.uk>
 2014-10-16 16:27:13 +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
Aanand Prasad
b318585f3c TLS support, with same env vars as docker client 
Thanks to @jkingyens for the bulk of the work.

Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
 2014-10-16 10:41:26 +01:00
Ben Firshman
1820306d0a Merge pull request #529 from chmouel/override-environement 
Allow overriding environements on command line
 2014-10-14 11:27:20 +01:00
Aanand Prasad
bf1c1b4c17 Merge pull request #534 from bfirsh/use-bin-echo-for-intermediate-container 
Use /bin/echo for intermediate container
 2014-10-10 13:12:33 +01:00
Ben Firshman
352062c2dc Use /bin/echo for intermediate container 
In cases where the service is using a minimal container,
/bin/echo can be created but echo cannot.

See #517

Signed-off-by: Ben Firshman <ben@firshman.co.uk>
 2014-10-10 12:24:00 +01:00
Chmouel Boudjnah
92249364b6 Allow overriding environements on command line 
Add a new command line option -e to override environement variables when
running a service.

Signed-off-by: Chmouel Boudjnah <chmouel@chmouel.com>
 2014-10-09 16:33:41 +02:00
Ben Firshman
872a1b5a5c Merge pull request #523 from aanand/remove-references-to-docker-osx 
Remove references to docker-osx
 2014-10-06 16:05:06 +01:00
Aanand Prasad
b969988ccb Remove references to docker-osx 
Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
 2014-10-06 14:21:49 +01:00
Aanand Prasad
a5aac7d59e Merge pull request #508 from bfirsh/recommend-boot2docker-in-install-instructions 
Recommend boot2docker in installation instructions
 2014-10-06 13:44:23 +01:00
Ben Firshman
c16f4d4041 Recommend boot2docker in installation instructions 
Fixes #26

Signed-off-by: Ben Firshman <ben@firshman.co.uk>
 2014-10-06 13:14:12 +01:00
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