13d5efcd8b
Merge pull request #2143 from aanand/windows-preparation-instructions
...
Add preparation instructions to Windows build script
2015-10-06 10:13:06 -04:00
018b1b1c0f
Add preparation instructions to Windows build script
...
Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
2015-10-06 12:57:01 +01:00
19271898de
Merge pull request #1806 from dnephin/run_script
...
Docker image and bash script for running compose in a container
2015-10-02 17:12:25 +01:00
8616e291c5
Merge pull request #2034 from dnephin/release_scripts
...
Automated release scripts
2015-10-02 16:56:29 +01:00
39cea970b8
alpine docker image for running compose and a script to pull and run it with the
...
correct volumes.
Signed-off-by: Daniel Nephin <dnephin@gmail.com>
2015-10-02 11:38:35 -04:00
04375fd566
Restore notes about building non-linux binaries.
...
Signed-off-by: Daniel Nephin <dnephin@docker.com>
2015-10-02 11:25:16 -04:00
1a2a0dd53d
Fix some bugs in the release scripts
...
Signed-off-by: Daniel Nephin <dnephin@docker.com>
2015-10-02 11:21:38 -04:00
dc56e4f97e
Update release process docs to use scripts.
...
Signed-off-by: Daniel Nephin <dnephin@docker.com>
2015-10-02 11:21:38 -04:00
da91b81bb8
Add scripts for automating parts of the release.
...
Signed-off-by: Daniel Nephin <dnephin@docker.com>
2015-10-02 11:21:38 -04:00
6c88640887
Merge pull request #2122 from mnowster/2050-relative-volume-paths-windows
...
2050 ensure windows volume paths are compatible with engine
2015-10-02 16:17:43 +01:00
bef5c2238e
Skip a test for now
...
This needs resolving outside of this PR, as it is a much bigger piece
of work.
https://github.com/docker/compose/issues/2128
Signed-off-by: Mazz Mosley <mazz@houseofmnowster.com>
2015-10-02 15:29:26 +01:00
af8032a5f4
Fix incorrect test name
...
I'd written relative, when I meant absolute. D'oh.
Signed-off-by: Mazz Mosley <mazz@houseofmnowster.com>
2015-10-02 12:01:56 +01:00
2276326d7e
volume path compatibility with engine
...
An expanded windows path of c:\shiny\thing:\shiny:rw
needs to be changed to be linux style path, including the drive,
like /c/shiny/thing /shiny
to be mounted successfully by the engine.
Signed-off-by: Mazz Mosley <mazz@houseofmnowster.com>
2015-10-02 12:01:56 +01:00
5b95c989cd
Merge pull request #2125 from aanand/pass-all-docker-env-vars-to-pytest
...
Pass all DOCKER_ env vars to py.test
2015-10-01 13:47:03 -04:00
58270d8859
Remove duplicate and re-order alphabetically
...
Signed-off-by: Mazz Mosley <mazz@houseofmnowster.com>
2015-10-01 16:06:57 +01:00
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
c673ce37c7
Merge pull request #2124 from aanand/dont-expand-volume-names
...
Don't expand volume names
2015-10-01 15:05:38 +01:00
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
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
dabf1e8657
Merge pull request #2087 from dnephin/release_notes
...
Add release notes for 1.4.2
2015-09-24 14:37:10 -04:00
bd1373f527
Bump 1.4.2
...
Signed-off-by: Daniel Nephin <dnephin@docker.com>
2015-09-23 14:24:13 -04:00
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
78c0734cbd
Disable some tests in windows for now.
...
Signed-off-by: Daniel Nephin <dnephin@docker.com>
2015-09-23 10:42:57 -04:00
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
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
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
0058d5dd4f
Add appveyor config
...
Signed-off-by: Daniel Nephin <dnephin@docker.com>
2015-09-22 12:45:19 -04:00
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
1e25d40c53
Merge pull request #2080 from moxiegirl/fix-2079
...
Fixing misspelling of WordPress
2015-09-21 17:17:31 +01:00
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
62ca8469b0
Fixing misspelling of WordPress
...
Signed-off-by: Mary Anthony <mary@docker.com>
2015-09-21 08:58:05 -07:00
aa70209ade
Merge pull request #1957 from aanand/stub-run-on-windows
...
WIP: Build Windows binary
2015-09-21 16:21:12 +01:00
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
e5eaf68490
Remove custom docker client initialization logic
...
Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
2015-09-21 15:27:42 +01:00
1deb534fee
Merge pull request #2066 from mnowster/reorder-reference-docs
...
Reorder reference docs
2015-09-21 06:12:49 -07:00
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
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
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
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
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
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
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
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
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
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
fb30498153
Catch WindowsError in call_silently
...
Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
2015-09-18 18:10:29 +01:00
4ae7f00412
Build Windows binary
...
Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
2015-09-18 18:10:29 +01:00
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
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
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
Daniel Nephin
Aanand Prasad
mnowster
Daniel Nephin
Mazz Mosley
Mary Anthony
Vojta Orgon
Steve Durrheimer
Steve Durrheimer