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

717 Commits

Author SHA1 Message Date
Ben Firshman 59c976510c Update URL in readme and setup.py 
Signed-off-by: Ben Firshman <ben@firshman.co.uk>
 2014-07-21 16:22:03 -07:00
Ben Firshman f189e299fd Add canonical link pointing at fig.sh 
This will keep Google happy.

Signed-off-by: Ben Firshman <ben@firshman.co.uk>
 2014-07-21 16:20:43 -07:00
Ben Firshman d08720247a Remove absolute link from docs 
Signed-off-by: Ben Firshman <ben@firshman.co.uk>
 2014-07-21 16:19:55 -07:00
Aanand Prasad a4df76dd3f Merge pull request #329 from orchardup/update-to-docker-1.1.1 
Update docs to Docker version 1.1.1
 2014-07-21 11:46:33 -07:00
Ben Firshman b2e3a91098 Update docs to Docker version 1.1.1 
Signed-off-by: Ben Firshman <ben@firshman.co.uk>
 2014-07-21 11:30:15 -07:00
Mark Steve Samson 47bbc35b74 Add `--no-cache` option to `fig build` (Closes #152) 
Signed-off-by: Mark Steve Samson <hello@marksteve.com>
 2014-07-20 11:28:28 +08:00
Ben Firshman a12f3b40d5 Merge pull request #327 from orchardup/add-cname-to-github-sites 
Add fig.sh CNAME to GitHub sites
 2014-07-20 01:36:27 +01:00
Ben Firshman 3386927f9f Add fig.sh CNAME to GitHub sites 
Signed-off-by: Ben Firshman <ben@firshman.co.uk>
 2014-07-19 17:35:38 -07:00
Aanand Prasad 12d75a74e6 Merge pull request #325 from orchardup/fix-dns 
Fix and document `dns:` option
 2014-07-17 18:34:12 -07:00
Aanand Prasad 1a9c5e197d Merge pull request #324 from orchardup/add-maintainers-file 
Add maintainers file
 2014-07-17 18:32:33 -07:00
Ben Firshman 8fa85ecc05 Add maintainers file 
Docker style: https://github.com/dotcloud/docker/blob/master/hack/MAINTAINERS.md

Signed-off-by: Ben Firshman <ben@firshman.co.uk>
 2014-07-17 18:20:53 -07: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
Ben Firshman 0021a06468 Merge pull request #321 from orchardup/update-install-docs-for-0.5.1 
Update install docs for 0.5.1
 2014-07-15 00:05:13 +01:00
Aanand Prasad 6ead40e14c Update install docs for 0.5.1 
Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
 2014-07-14 16:01:41 -07:00
Aanand Prasad 5e2308d14a CHANGES.md credits for 0.5.1 
Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
 2014-07-14 15:58:26 -07:00
Ben Firshman 9ab8f358ca Merge pull request #315 from orchardup/ship-0.5.1 
Ship 0.5.1
 2014-07-14 23:22:48 +01:00
Aanand Prasad d9c9b5e1f0 Ship 0.5.1 
Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
 2014-07-14 13:36:32 -07:00
Aanand Prasad 730de9187a Merge pull request #320 from orchardup/add-egg-info-to-clean 
Add fig.egg-info to clean script
 2014-07-14 13:35:22 -07:00
Ben Firshman bad0f45816 Merge pull request #319 from orchardup/fix-project-name-regression 
Fix regression of default behaviour in Command.project_name
 2014-07-14 20:31:20 +01: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 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
Ben Firshman d6657ed16c Merge pull request #317 from ryanbrainard/project-name-dirname 
Set default project name to dir name of fig.yml
 2014-07-14 18:26:43 +01:00
Ben Firshman 48e7c86d66 Merge pull request #316 from orchardup/restructure-yaml-docs 
Improve fig.yml docs
 2014-07-14 18:24:50 +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
Aanand Prasad 197fd77b99 Improve some of the .yml options docs 
Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
 2014-07-12 09:55:13 -07:00
Aanand Prasad 36bef254ff Restructure .yml docs 
Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
 2014-07-12 09:47:43 -07:00
Aanand Prasad 8e265905d3 Add host-in-port-mapping feature to docs and changelog 
Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
 2014-07-12 09:38:18 -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
Ben Firshman dd5c2e8767 Merge pull request #313 from orchardup/fix-volumes-from-container 
Fix volumes_from container
 2014-07-12 01:10:45 +01:00
Aanand Prasad c255999fce Merge pull request #312 from orchardup/fix-default-values-for-service-args 
Remove empty lists from default Service args
 2014-07-11 17:06:55 -07: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 f983110492 Remove empty lists from default Service args 
This will cause terrifying bugs.

Signed-off-by: Ben Firshman <ben@firshman.co.uk>
 2014-07-11 16:07:31 -07:00
Aanand Prasad 9fd296f416 Merge pull request #310 from orchardup/fix-race-condition-in-recreate-containers 
Fix race condition in recreate containers
 2014-07-11 15:14:17 -07:00
Ben Firshman bb89f85984 Remove stop timeout in recreate containers 
This doesn't seem like a good idea – 1 second isn't enough time
to stop gracefully.

Signed-off-by: Ben Firshman <ben@firshman.co.uk>
 2014-07-11 14:53:56 -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
Aanand Prasad 036adb2de9 Merge pull request #309 from orchardup/update-docs-to-be-0.5.0 
Update docs to be 0.5.0
 2014-07-11 14:29:38 -07:00
Ben Firshman 36f4e30dba Add 0.5.0 to docs 
Signed-off-by: Ben Firshman <ben@firshman.co.uk>
 2014-07-11 14:16:39 -07:00
Ben Firshman 9f0cfbdfd2 Document release process 
Signed-off-by: Ben Firshman <ben@firshman.co.uk>
 2014-07-11 14:16:29 -07:00
Aanand Prasad e117a7822d Merge pull request #307 from orchardup/ship-0.5.0 
Ship 0.5.0
 2014-07-11 14:07:40 -07:00
Ben Firshman 5489465905 Ship 0.5.0 
Signed-off-by: Ben Firshman <ben@firshman.co.uk>
 2014-07-11 13:21:01 -07:00
Ben Firshman 4afcdbdb3c Add docs for volumes_from 
Signed-off-by: Ben Firshman <ben@firshman.co.uk>
 2014-07-11 12:52:22 -07:00
Ben Firshman 94d82d4acb Merge pull request #308 from orchardup/fix-fig-up-attach 
Regardless of dependencies, `fig up` only attaches to what you specify
 2014-07-11 20:51:54 +01:00
Aanand Prasad d528f9f642 Regardless of dependencies, `fig up` only attaches to what you specify 
Without this, if you go:

    $ fig up -d db
    $ fig up web

you'll get output for both db and web, and Ctrl-C will kill them both.

Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
 2014-07-11 11:58:59 -07:00
Ben Firshman 99d7a474af Merge pull request #297 from ryanbrainard/resolve-env 
Resolve environment without values to values on host
 2014-07-11 18:55:40 +01:00
Ryan Brainard d1052ff666 Add documention for key-only environment 
Signed-off-by: Ryan Brainard <brainard@heroku.com>
 2014-07-11 10:18:17 -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
Ben Firshman 3996947024 Merge pull request #304 from Elemecca/t-domainname 
add support for domainname, qualified hostname
 2014-07-11 17:40:19 +01:00
Ben Firshman b7afaba56a Merge pull request #305 from ryanbrainard/fix-dir-typo 
Fix typo in script dir name
 2014-07-11 17:37:13 +01:00