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

2021 Commits

Author SHA1 Message Date
Mazz Mosley f4cd5b1d45 Handle windows volume paths 
When a relative path is expanded and we're on a windows platform,
it expands to include the drive, eg C:\ , which was causing a ConfigError
as we split on ":" in parse_volume_spec and that was giving too many parts.

Use os.path.splitdrive instead of manually calculating the drive.

This should help us deal with windows drives as part of the volume
path better than us doing it manually.

Signed-off-by: Mazz Mosley <mazz@houseofmnowster.com>
 2015-10-01 16:06:57 +01:00
mnowster c673ce37c7 Merge pull request #2124 from aanand/dont-expand-volume-names 
Don't expand volume names
 2015-10-01 15:05:38 +01:00
Aanand Prasad e38334efbd Don't expand volume names 
Only expand volume host paths if they begin with a dot.

This is a breaking change. The deprecation warning preparing users for
this change has been removed.

Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
 2015-10-01 14:48:38 +01:00
Aanand Prasad bb470798d4 Pass all DOCKER_ env vars to py.test 
This ensures that `tox` will run against SSL-protected Docker daemons.

Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
 2015-10-01 12:26:58 +01:00
Daniel Nephin dabf1e8657 Merge pull request #2087 from dnephin/release_notes 
Add release notes for 1.4.2
 2015-09-24 14:37:10 -04:00
Karol Duleba 91b227d133 Allow to extend service using shorthand notation. Closes #1989 
Signed-off-by: Karol Duleba <mr.fuxi@gmail.com>
 2015-09-24 18:01:47 +01:00
Daniel Nephin bd1373f527 Bump 1.4.2 
Signed-off-by: Daniel Nephin <dnephin@docker.com>
 2015-09-23 14:24:13 -04:00
mnowster 03ae2462d4 Merge pull request #2086 from dnephin/windows 
Build the windows binary on appveyor, and disable some unit tests on windows
 2015-09-23 15:58:28 +01:00
Daniel Nephin 78c0734cbd Disable some tests in windows for now. 
Signed-off-by: Daniel Nephin <dnephin@docker.com>
 2015-09-23 10:42:57 -04:00
Daniel Nephin d5991761cd Fix building the binary on appveyor, and have it create an artifact. 
Signed-off-by: Daniel Nephin <dnephin@docker.com>
 2015-09-23 10:40:28 -04:00
Daniel Nephin 27e09dae5f Merge pull request #2083 from dnephin/fix_test_assumes_busybox 
Fix a test case that assumes busybox image id
 2015-09-23 09:40:45 -04:00
Aanand Prasad 9e75797943 Merge pull request #2084 from dnephin/windows 
WIP: Add appveyor config for testing on windows and building windows binary
 2015-09-22 19:37:45 +02:00
Daniel Nephin 0058d5dd4f Add appveyor config 
Signed-off-by: Daniel Nephin <dnephin@docker.com>
 2015-09-22 12:45:19 -04:00
Daniel Nephin c37a0c38a2 Fix a test case that assumes busybox image id. 
Signed-off-by: Daniel Nephin <dnephin@docker.com>
 2015-09-22 12:28:59 -04:00
mnowster 1e25d40c53 Merge pull request #2080 from moxiegirl/fix-2079 
Fixing misspelling of WordPress
 2015-09-21 17:17:31 +01:00
mnowster 6f12224ec9 Merge pull request #2005 from lnmunhoz/master 
Fix error message and class name from Boot2Docker to DockerMachine
 2015-09-21 17:05:03 +01:00
Mary Anthony 62ca8469b0 Fixing misspelling of WordPress 
Signed-off-by: Mary Anthony <mary@docker.com>
 2015-09-21 08:58:05 -07:00
mnowster aa70209ade Merge pull request #1957 from aanand/stub-run-on-windows 
WIP: Build Windows binary
 2015-09-21 16:21:12 +01:00
mnowster 9f067fde10 Merge pull request #2078 from mnowster/aanand-remove-custom-docker-client-logic 
Remove custom docker client initialization logic
 2015-09-21 15:34:57 +01:00
Aanand Prasad e5eaf68490 Remove custom docker client initialization logic 
Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
 2015-09-21 15:27:42 +01:00
moxiegirl 1deb534fee Merge pull request #2066 from mnowster/reorder-reference-docs 
Reorder reference docs
 2015-09-21 06:12:49 -07:00
mnowster b9252aa48e Merge pull request #2032 from villlem/master 
Flag to skip all pull errors when pulling images
 2015-09-21 13:41:08 +01:00
Aanand Prasad 6817f76fd5 Merge pull request #2070 from albers/completion-run-name 
Add bash completion for `docker-compose run --name`
 2015-09-21 12:36:23 +02:00
Aanand Prasad c950474810 Merge pull request #2071 from dnephin/fix_dist_directory_for_build 
Restore the dist volume mount for building linux binaries
 2015-09-21 12:35:58 +02:00
Aanand Prasad 36d886b8b0 Merge pull request #2073 from sdurrheimer/zsh-completion-run-name 
Add zsh completion for 'docker-compose run --name'
 2015-09-21 12:35:29 +02:00
Aanand Prasad 6ebfffed7d Merge pull request #2074 from sdurrheimer/zsh-completion-build-pull 
Add zsh completion for 'docker-compose build --build'
 2015-09-21 12:34:51 +02:00
Aanand Prasad 18dbe1b1c0 Merge pull request #2051 from dnephin/extend_compose_files 
Extend compose files by allowing multiple files
 2015-09-21 12:34:22 +02:00
Vojta Orgon c9083e21c8 Flag to skip all pull errors when pulling images. 
Signed-off-by: Vojta Orgon <villlem@gmail.com>
 2015-09-21 11:59:23 +02:00
Daniel Nephin 22bc174650 Refactor config.load() to remove reduce() and document some types. 
Signed-off-by: Daniel Nephin <dnephin@docker.com>
 2015-09-18 17:11:16 -04:00
Steve Durrheimer 51ce16cf18 Add zsh completion for 'docker-compose build --build' 
Signed-off-by: Steve Durrheimer <s.durrheimer@gmail.com>
 2015-09-18 22:46:08 +02:00
Steve Durrheimer 12b38adfac Add zsh completion for 'docker-compose run --name' 
Signed-off-by: Steve Durrheimer <steve.durrheimer@netapsys.fr>
 2015-09-18 22:42:19 +02:00
Aanand Prasad fb30498153 Catch WindowsError in call_silently 
Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
 2015-09-18 18:10:29 +01:00
Aanand Prasad 4ae7f00412 Build Windows binary 
Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
 2015-09-18 18:10:29 +01:00
Aanand Prasad 3e4182a480 Stub 'run' on Windows 
Adapted from @dopry's work in https://github.com/docker/compose/pull/1900

Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
 2015-09-18 18:10:17 +01:00
Aanand Prasad bbc8b74c17 Merge pull request #2068 from mnowster/2037-jsonschema-resolver-windows-path-fix 
Ensure RefResolver works across operating systems
 2015-09-18 18:09:58 +01:00
Mazz Mosley 5509990a71 Ensure RefResolver works across operating systems 
Slashes, paths and a tale of woe. Validation now works on windows \o/

Signed-off-by: Mazz Mosley <mazz@houseofmnowster.com>
 2015-09-18 17:51:26 +01:00
mnowster 61b819bd73 Merge pull request #2072 from albers/completion-build-pull 
Add bash completion for `docker-compose build --pull`
 2015-09-18 17:44:38 +01:00
Harald Albers 006146b2cd Add bash completion for `docker-compose run --name` 
Signed-off-by: Harald Albers <github@albersweb.de>
 2015-09-18 18:18:06 +02:00
Harald Albers af7b98ff56 Add bash completion for `docker-compose build --pull` 
Also adds a fix for an error message on some completions when no
compose file is present:

    docker-compose build awk: cannot open docker-compose.yml (No such file or directory)

Signed-off-by: Harald Albers <github@albersweb.de>
 2015-09-18 18:12:30 +02:00
Daniel Nephin db433041b4 Restore the dist volume mount for building linux binaries. 
Signed-off-by: Daniel Nephin <dnephin@docker.com>
 2015-09-18 12:08:09 -04:00
Aanand Prasad 3e58003bd3 Merge pull request #2041 from ggtools/master 
Add new --pull option in build.
 2015-09-18 16:49:05 +01:00
mnowster e2ab2eb9d0 Merge pull request #2065 from dnephin/use-dind-image 
Use dockerswarm/dind image for ci
 2015-09-18 16:10:41 +01:00
mnowster 41660f98df Merge pull request #2045 from dnephin/cleanup_before_build 
Clean before doing a build
 2015-09-18 11:49:05 +01:00
Mazz Mosley 0232fb10d7 Alphabetise run options 
Signed-off-by: Mazz Mosley <mazz@houseofmnowster.com>
 2015-09-18 11:30:24 +01:00
Mike Bailey aac916c73e Alphabetise reference list 
Bring in line with Glossary. https://docs.docker.com/reference/glossary/

Alphabetising list makes makes parsing by humans easier.

Signed-off-by: Mike Bailey <mike.bailey@rea-group.com>

Conflicts:
	docs/yml.md
 2015-09-18 11:25:59 +01:00
Daniel Nephin 8b29a50b52 Trim the dockerfile and re-use the virtualenv we already have. 
Signed-off-by: Daniel Nephin <dnephin@docker.com>
 2015-09-17 18:46:29 -04:00
Daniel Nephin 9978c3ea52 Update scriptests/test-versions to work with daemon args, and move docker version constants into tests-versions. 
Signed-off-by: Daniel Nephin <dnephin@gmail.com>
 2015-09-17 17:35:49 -04:00
Aanand Prasad eb20590ca6 Use dockerswarm/dind image instead of doing docker-in-docker ourselves 
Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
 2015-09-17 16:53:20 -04:00
Daniel Nephin 577439ea7f Add a debug log message for config filenames. 
Signed-off-by: Daniel Nephin <dnephin@docker.com>
 2015-09-17 14:28:16 -04:00
Daniel Nephin fd75e4bf63 Update docs about using multiple -f arguments 
Signed-off-by: Daniel Nephin <dnephin@docker.com>
 2015-09-17 14:20:21 -04:00