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

1764 Commits

Author SHA1 Message Date
Lachlan Pease 851129de6c Added documentation for IPC config 
Signed-off-by: Lachlan Pease <predatory.kangaroo@gmail.com>
 2015-09-10 23:34:07 +10:00
Nick H a372275c6e Allow for user relative paths 
'~/' in a path currently doesnt work, you get the following error:

[Errno 2] No such file or directory: u'/home/USER/folder/~/some/path/.yml'

Signed-off-by: Nick H <nick.humrich@gmail.com>
 2015-09-09 14:54:08 -06:00
Aanand Prasad 9ce30e75df Merge pull request #2016 from mnowster/remove-unique-constraint-for-command 
Remove uniqueness constraint for command
 2015-09-09 10:05:41 -07:00
Daniel Nephin 469a709a37 Merge pull request #2017 from mnowster/remove-detach-field 
Remove mistaken field
 2015-09-09 12:52:44 -04:00
Mazz Mosley 4bed5de291 Remove item unique constraint for command 
The command value can be a list, which would be a Unix command-line
invocation broken up into individual values, thus needing the ability to
have non unique values.

Signed-off-by: Mazz Mosley <mazz@houseofmnowster.com>
 2015-09-09 16:39:06 +01:00
Mazz Mosley 7223d5cee0 Remove mistaken field 
detach is a run param, not a config param. Oops, sorry!

Signed-off-by: Mazz Mosley <mazz@houseofmnowster.com>
 2015-09-09 16:23:54 +01:00
Aanand Prasad 2273e2bd3a Merge pull request #2011 from dnephin/add_extra_labels 
Add more github label areas
 2015-09-08 17:24:21 -07:00
Daniel Nephin ad46757baf Add more github label areas. 
Signed-off-by: Daniel Nephin <dnephin@gmail.com>
 2015-09-08 19:44:25 -04:00
Aanand Prasad 85709d85d2 Merge pull request #1862 from mrfuxi/costom-container-name-in-logs 
Use custom container name in logs
 2015-09-08 14:36:28 -07:00
Aanand Prasad f7d86d3194 Merge pull request #1944 from funkyfuture/issue-1921 
Adds pause- and unpause-command to docopt's TLC
 2015-09-08 14:05:27 -07:00
Aanand Prasad 1c73ff33fe Merge pull request #1990 from shin-/1975-fix 
Remove or space out suspension dots after service name
 2015-09-08 12:27:39 -07:00
Aanand Prasad abb0ab3f9d Merge pull request #2001 from mnowster/entrypoint-allow-as-a-string 
Allow entrypoint to be a list or string
 2015-09-08 12:08:40 -07:00
Lucas N. Munhoz b33dd3bc01 Fix error message and class name from Boot2Docker to DockerMachine 
Signed-off-by: Lucas N. Munhoz <ln.munhoz@gmail.com>
 2015-09-08 10:08:38 -03:00
Mazz Mosley 866979c57b Allow entrypoint to be a list or string 
Signed-off-by: Mazz Mosley <mazz@houseofmnowster.com>
 2015-09-07 17:26:38 +01:00
Karol Duleba d83d6306c9 Use custom container name in logs. Fixes #1851 
Signed-off-by: Karol Duleba <mr.fuxi@gmail.com>
 2015-09-07 14:03:00 +01:00
Lachlan Pease 67957318ed Added IPC spec to fields_schema.json 
Signed-off-by: Lachlan Pease <predatory.kangaroo@gmail.com>
 2015-09-06 12:16:12 +10:00
Lachlan Pease 2468235472 Added support for IPC namespaces, fixes GH-1689 
Signed-off-by: Lachlan Pease <predatory.kangaroo@gmail.com>
 2015-09-06 12:09:24 +10:00
Joffrey F 6da7a9194c Remove or space out suspension dots after service name for easier copy-pasting 
Signed-off-by: Joffrey F <joffrey@docker.com>
 2015-09-04 17:43:12 -07:00
Aanand Prasad 9da2bf3973 Merge pull request #1978 from aanand/use-docker-1.8.2-rc1 
Test against Docker 1.8.2 RC1
 2015-09-04 16:21:58 -07:00
Aanand Prasad 10cb0c921a Merge pull request #1963 from shin-/1923-catch-timeout 
Exit gracefully when requests encounter a ReadTimeout exception.
 2015-09-04 16:14:32 -07:00
Aanand Prasad 536638aaae Merge pull request #1962 from dnephin/use_enum_for_enum 
Create a ConvergenceStrategy enum
 2015-09-04 15:05:09 -07:00
Daniel Nephin d84ee667ad Merge pull request #1983 from mnowster/update-testing-docs 
Running a single test command updated
 2015-09-04 12:28:08 -04:00
Mazz Mosley 31e8137452 Running a single test command updated 
Signed-off-by: Mazz Mosley <mazz@houseofmnowster.com>
 2015-09-04 17:23:22 +01:00
Daniel Nephin ff427e68ee Merge pull request #1982 from mnowster/fix-trailing-white-space 
Remove trailing white space from docs/index.md
 2015-09-04 12:20:29 -04:00
Mazz Mosley 0f60c783fa Remove trailing white space 
Signed-off-by: Mazz Mosley <mazz@houseofmnowster.com>
 2015-09-04 17:01:44 +01:00
Daniel Nephin 0484e22a84 Add enum34 and use it to create a ConvergenceStrategy enum. 
Signed-off-by: Daniel Nephin <dnephin@gmail.com>
 2015-09-04 10:45:53 -04:00
mnowster d4372bc98f Merge pull request #1967 from charleswhchan/issue-1958 
Fix #1958. Remove release notes for old version of Docker Compose.
 2015-09-04 11:44:33 +01:00
Charles Chan 000bf1c16a Fix #1958. Remove release notes for old version of Docker Compose. 
Replace by link to the latest CHANGELOG in GitHub.

Signed-off-by: Charles Chan <charleswhchan@users.noreply.github.com>
 2015-09-03 21:18:26 -07:00
Aanand Prasad a1ec26435c Test against Docker 1.8.2 RC1 
Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
 2015-09-03 18:30:50 -07:00
Aanand Prasad 6a47fa066e Merge pull request #1960 from dnephin/fix_smart_recreate_when_service_is_removed 
Fix config_hash context to properly represent the service
 2015-09-03 11:41:30 -07:00
Aanand Prasad c2f9ffad28 Merge pull request #1974 from dnephin/upgrade_requests 
Bump requests to 2.7 to fix the ResponseNotReady() error
 2015-09-03 11:38:17 -07:00
Aanand Prasad dcf2f3f28c Merge pull request #1970 from mnowster/fix-expose-allowed-values 
fix expose schema definition
 2015-09-03 11:36:03 -07:00
Daniel Nephin 9d7ad796a3 bump requests to 2.7 to fix the ResponseNotReady() error, and add a missing default for tox posargs 
Signed-off-by: Daniel Nephin <dnephin@docker.com>
 2015-09-03 14:11:44 -04:00
Daniel Nephin db9f577ad6 Extract link names into a function. 
Signed-off-by: Daniel Nephin <dnephin@docker.com>
 2015-09-03 14:08:44 -04:00
Daniel Nephin 187ad4ce26 Refactor network_mode logic out of Service. 
Signed-off-by: Daniel Nephin <dnephin@docker.com>
 2015-09-03 13:02:46 -04:00
Daniel Nephin c183e52502 Fixes #1757 - include all service properties in the config_dict() 
Signed-off-by: Daniel Nephin <dnephin@gmail.com>
 2015-09-03 12:04:38 -04:00
Daniel Nephin 08ba857807 Cleanup some project logic. 
Signed-off-by: Daniel Nephin <dnephin@gmail.com>
 2015-09-03 12:04:38 -04:00
Daniel Nephin e801981fed Sort config keys 
Signed-off-by: Daniel Nephin <dnephin@gmail.com>
 2015-09-03 12:04:38 -04:00
Daniel Nephin ef56523883 Make external_links a regular service.option so that it's part of the config hash 
Signed-off-by: Daniel Nephin <dnephin@gmail.com>
 2015-09-03 12:04:38 -04:00
Mazz Mosley 7326608369 expose array can contain either strings or numbers 
Signed-off-by: Mazz Mosley <mazz@houseofmnowster.com>
 2015-09-03 16:44:01 +01:00
mnowster 2073805bc1 Merge pull request #1952 from aanand/bundle-schema-json 
Bundle schema.json in binary
 2015-09-03 10:40:11 +01:00
Aanand Prasad ecea79fd4e Bundle schema files 
Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
 2015-09-02 18:09:34 -07:00
Joffrey F 6a95f6d628 custom timeout test rewrite 
Signed-off-by: Joffrey F <joffrey@docker.com>
 2015-09-02 18:00:08 -07:00
Aanand Prasad b165ae07c9 Configure PyInstaller using docker-compose.spec 
Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
 2015-09-02 17:47:14 -07:00
Aanand Prasad 6baed6c354 Merge pull request #1965 from dnephin/fix_compose_up_attach 
Attach to all containers when no service names are specified
 2015-09-02 17:37:43 -07:00
Joffrey F f9c7346380 HTTP_TIMEOUT as importable constant for consistency 
Signed-off-by: Joffrey F <joffrey@docker.com>
 2015-09-02 16:29:19 -07:00
Joffrey F b110bbe9e3 Refined error message when timeout is encountered. 
Signed-off-by: Joffrey F <joffrey@docker.com>
 2015-09-02 14:31:30 -07:00
Joffrey F e634fe3fd6 Deprecation warning when DOCKER_CLIENT_TIMEOUT is used 
Signed-off-by: Joffrey F <joffrey@docker.com>
 2015-09-02 14:28:57 -07:00
Aanand Prasad 027414cfc0 Merge pull request #1918 from dnephin/fix_scripts_test 
Fix scripts/test and add to note about pre-commit hook to contributing
 2015-09-02 14:28:51 -07:00
Aanand Prasad 0060437f57 Merge pull request #1927 from mnowster/validate-extended-services 
Validate and interpolate extended services
 2015-09-02 13:41:21 -07:00