tyler.durden
/
compose
mirror of https://github.com/docker/compose.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity
737 Commits 22 Branches 267 Tags 56 MiB
Commit Graph

737 Commits

Author SHA1 Message Date
Ben Firshman 07c47426ba Merge pull request #358 from orchardup/ship-0.5.2 
Ship 0.5.2
 2014-07-28 21:18:51 +01:00
Aanand Prasad a6324d6226 Ship 0.5.2 
Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
 2014-07-28 13:17:08 -07:00
Daniel Nephin 939406ca9d Run flake8 in travis build 
Signed-off-by: Daniel Nephin <dnephin@gmail.com>
 2014-07-27 08:51:36 -07:00
Daniel Nephin 50a24bc3bf Add flake8 and fix errors. 
Signed-off-by: Daniel Nephin <dnephin@gmail.com>
 2014-07-27 08:51:17 -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
Chris Corbyn dcd8e7863f Update dockerpty. Fixes #352. 2014-07-27 08:17:38 +00:00
Aanand Prasad ed283fd3df Merge pull request #345 from orchardup/docker-inc 
Docker, Inc.
 2014-07-25 14:31:58 -07:00
Aanand Prasad 393433b702 Merge pull request #347 from orchardup/fix-typo-yml-docs 
Fix typo yml docs
 2014-07-24 14:31:19 -07:00
Ben Firshman 7516b67a14 Add link to docker-osx in yml docs 
Signed-off-by: Ben Firshman <ben@firshman.co.uk>
 2014-07-24 14:18:21 -07:00
Ben Firshman 5eac04d8d4 Fix typo in yml docs 
From c09734822e

Signed-off-by: Ben Firshman <ben@firshman.co.uk>
 2014-07-24 14:16:49 -07:00
Ben Firshman fec41d3567 Merge pull request #288 from saulshanabrook/patch-1 
Add warning for mapping local volumes
 2014-07-24 22:15:49 +01:00
Saul Shanabrook c09734822e Add warning for mapping local volumes 
Mapping local volumes is not currently supported in boot2docker

https://github.com/boot2docker/boot2docker/issues/413
https://github.com/dotcloud/docker/issues/4023

Signed-off-by: Saul Shanabrook <s.shanabrook@gmail.com>
 2014-07-24 16:37:14 -04: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 ed80576236 
Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
 2014-07-24 11:47:39 -07:00
Ben Firshman 99064d17dd Docker, Inc. 
Signed-off-by: Ben Firshman <ben@firshman.co.uk>
 2014-07-24 10:24:17 -07:00
Aanand Prasad ed80576236 Merge pull request #276 from marksteve/nocache 
Add `--no-cache` option to `fig build` (Closes #152)
 2014-07-23 10:13:47 -07:00
Ben Firshman 5131eaeba0 Merge pull request #335 from orchardup/document-missing-yml-options 
Document missing .yml options
 2014-07-23 03:45:52 +01:00
Aanand Prasad b559880a80 Document missing .yml options 
Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
 2014-07-22 15:37:05 -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 e1a0937a61 Merge pull request #330 from orchardup/www.fig.sh 
www.fig.sh
 2014-07-21 16:46:14 -07:00
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