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
4,742 Commits 23 Branches 268 Tags
Commit Graph

1251 Commits

Author SHA1 Message Date
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
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
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
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
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
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
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
d978787fcc Merge pull request #439 from dnephin/faster_integration_tests 
Faster integration testing
 2014-09-24 17:34:52 -07: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
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
Ben Firshman
ce8ef23c09 Merge pull request #393 from marksteve/restart 
Implement restart command (Closes #98)
 2014-09-08 17:47:08 +01: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
Daniel Nephin
f5d43b6452 Resolves #455 - volumes_from a service with no containers. 
Signed-off-by: Daniel Nephin <dnephin@gmail.com>
 2014-09-04 22:21:49 -04:00
Daniel Nephin
c48ee5caef Add a new fig command for retrieving the locally bound port of a service. 
Signed-off-by: Daniel Nephin <dnephin@gmail.com>
 2014-09-04 22:09:12 -04:00
Ben Firshman
2827786886 Merge pull request #364 from docker/non-numeric-link-alias 
Non-numeric link alias
 2014-09-04 20:39:18 +01:00
Daniel Nephin
24044fa704 Some additional validation for container ports, and a couple extra test cases. 
Signed-off-by: Daniel Nephin <dnephin@gmail.com>
 2014-08-31 02:00:58 -04:00
Daniel Nephin
07fa169fd2 Resolves #260, #301 and #449 
Adds ~ support and ro mode support for volumes, along with some additional validation.

Signed-off-by: Daniel Nephin <dnephin@gmail.com>
 2014-08-31 02:00:52 -04:00
Luke Amdor
e51851c884 adding "fig pull [SERVICE]" to pull service images 
Fixes #158

Signed-off-by: Luke Amdor <luke.amdor@gmail.com>
 2014-08-15 09:24:15 -05:00
Mark Steve Samson
e224c4caa4 Add integration test for restart command 
Signed-off-by: Mark Steve Samson <hello@marksteve.com>
 2014-08-13 10:01:27 +08:00
Daniel Nephin
294453433d Remove extra calls to docker server. 
Fix broken integration tests

Signed-off-by: Daniel Nephin <dnephin@gmail.com>
 2014-08-10 11:24:20 -04:00
Daniel Nephin
df7c2cc43f Resolves #369, add verbose output on --verbose flag 
Signed-off-by: Daniel Nephin <dnephin@gmail.com>
 2014-08-09 21:05:54 -04:00
Tim Freund
69c241ba12 Enable monochrome output in the 'up' and 'logs' commands 
Some systems, like Jenkins or other build servers, cannot correctly
render ANSI color codes.  The '--no-color' option enables monochrome
output in the 'up' and 'logs' commands to improve readability in those
systems.

Signed-off-by: Tim Freund <tim@freunds.net>
 2014-08-08 16:15:27 -04:00
Aanand Prasad
62a4d214e8 Default link alias which is just the service name 
Closes #37.

Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
 2014-08-08 13:05:42 -07:00
Chris Corbyn
0dc55fda45 Merge pull request #322 from dnephin/fix_cli_for_py26 
Fix cli for python 2.6
 2014-07-27 18:35:40 +10:00
Aanand Prasad
94887a28c7 Make sure we support explicit protocols in port bindings 
Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
 2014-07-24 11:48:29 -07:00
Aanand Prasad
262efce43e Fix test regression introduced in ed805762368ea5874b3aa26767e7596a1bf9b67a 
Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
 2014-07-24 11:47:39 -07:00
Mark Steve Samson
7f06d46827 Add test for building with --no-cache 
Signed-off-by: Mark Steve Samson <hello@marksteve.com>
 2014-07-22 11:40:44 +08:00
Aanand Prasad
140ced6a3b Fix and document dns: option 
Closes #240.

Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
 2014-07-17 18:11:50 -07:00
Daniel Nephin
779f4bda01 Fix cli for python 2.6 
Signed-off-by: Daniel Nephin <dnephin@gmail.com>
 2014-07-15 13:07:46 -07:00
Aanand Prasad
91fe414522 Fix regression of default behaviour in Command.project_name 
Needed an `os.abspath` in there. Added more tests, too.

Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
 2014-07-14 11:32:10 -07:00
Ben Firshman
7fb43cc85f Merge pull request #283 from d11wtq/feature/optional-command 
Make fig run COMMAND parameter optional.
 2014-07-14 18:33:18 +01:00
Ryan Brainard
e9c2f2c5fb Default project_name to dirname of fig.yml 
Signed-off-by: Ryan Brainard <brainard@heroku.com>
 2014-07-12 23:38:20 -07:00
Chris Corbyn
ef2fb77c1d Make fig run COMMAND parameter optional. 
This behaves more like the native docker client, where the absence of a
command means docker runs the CMD in the Dockerfile. If a command is
defined in fig.yml this is used instead.

Signed-off-by: Chris Corbyn <chris@w3style.co.uk>
 2014-07-12 02:30:34 +00:00
Aanand Prasad
89341013a0 Fix volumes_from container 
Closes #311.

Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
 2014-07-11 16:39:23 -07:00
Ben Firshman
b573b87a92 Fix race condition in recreate containers 
Container might have stopped between checking `is_running` and
calling `stop()`, which then threw an exception.

Signed-off-by: Ben Firshman <ben@firshman.co.uk>
 2014-07-11 14:53:46 -07:00
Ryan Brainard
44a91e6ba8 Resolve environment without values to values on host 
For parity with the Docker CLI, allow environment variables without
values to be automatically resolved to their values on the host.

Signed-off-by: Ryan Brainard <brainard@heroku.com>

Conflicts:
	tests/integration/service_test.py
 2014-07-11 10:18:05 -07:00
Sam Hanes
699bbe9ca2 Split the domainname out of qualified hostnames. 
Docker doesn't like it when a fully qualified hostname is passed in
the `hostname` parameter. When an FQDN is provided with `-h` the
official CLI puts the first component in `hostname` and the rest in
`domainname`. This change replicates that behavior when the user
specifies an FQDN in `hostname` in their `fig.yml`.

Signed-off-by: Sam Hanes <sam@maltera.com>
 2014-07-10 20:18:09 -07:00
Alexey Lebedeff
d83bdd5164 Change working dir through fig.yml 
Closes #144

Signed-off-by: Alexey Lebedeff <binarin@gmail.com>
 2014-07-10 21:22:45 +04:00
Aanand Prasad
944e15fa65 Stop fig run starting everything when a service has no links 
This was thanks to the semantics of project.up(), which starts everything
if you pass it an empty list of service names. (That logic should
probably be moved out to main.py.)

Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
 2014-07-02 11:51:12 +01:00
Aanand Prasad
d04b1724ec Merge pull request #236 from rail44/feature-support-volumes-from 
Support volumes_from option
 2014-07-02 10:48:11 +01:00
Satoshi Amemiya
e5916b2fae Support volumes_from option 
Signed-off-by: Satoshi Amemiya <rail.sky@gmail.com>
 2014-07-02 13:27:54 +09:00
Mark Steve Samson
4f7cbc3812 Support for host address in port bindings (Closes #267) 2014-06-27 15:07:22 +01:00
Aanand Prasad
3c48884dbb Update dockerpty; stub it out in tests 
Its current behaviour occasionally causes tests to hang; until this is
resolved, we'll stub it out. We weren't testing the output of 'run'
anyhow (though we should be).
 2014-06-27 14:41:36 +01:00
Aanand Prasad
256dccc554 Merge pull request #268 from orchardup/update-docker-py-0.3.2 
Update to docker-py 0.3.2
 2014-06-25 14:16:48 +01:00
Ben Firshman
d0f65906ed Update to docker-py 0.3.2 
From 59ced5700c

Now only supports Docker 1.0.0 / remote API v1.12.

Signed-off-by: Ben Firshman <ben@firshman.co.uk>
 2014-06-25 11:56:20 +01:00