tyler.durden/compose
1
0
Fork 0
mirror of https://github.com/docker/compose.git synced 2025-07-22 21:24:38 +02:00
Code Issues Packages Projects Releases Wiki Activity
1,796 Commits 20 Branches 280 Tags
Commit Graph

1796 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Aanand Prasad
fda615008c Merge pull request #2142 from dnephin/fix_error_cant_connect 
Fix error when compose can't connect to docker
 2015-10-07 11:22:32 +01:00
Aanand Prasad
807ab89750 Merge pull request #2144 from dnephin/remove_router_php 
Remove unnecessary router.php from wordpress example.
 2015-10-06 17:25:00 +01:00
Daniel Nephin
97dc4895ac Remove unnecessary router.php from wordpress example. 
Signed-off-by: Daniel Nephin <dnephin@docker.com>
 2015-10-06 11:37:36 -04:00
Aanand Prasad
02a20c0373 Merge pull request #2069 from dnephin/test_against_latest_version_tags 
Test against a list of versions generated from docker/docker tags
 2015-10-06 16:33:15 +01:00
Aanand Prasad
bf2faf6cdb Merge pull request #2132 from dnephin/fix_build_against_swarm 
Fix build against swarm
 2015-10-06 16:26:48 +01:00
Daniel Nephin
6edb6fa262 Test against a list of versions generated from docker/docker tags. 
Signed-off-by: Daniel Nephin <dnephin@docker.com>
 2015-10-06 10:51:52 -04:00
Daniel Nephin
15d0c60a73 Fix split buffer with inconsistently delimited json objects. 
Signed-off-by: Daniel Nephin <dnephin@docker.com>
 2015-10-06 10:43:07 -04:00
Daniel Nephin
3661e8bc74 Fix build against the swarm cluster by joining buffered output before parsing json. 
Signed-off-by: Daniel Nephin <dnephin@docker.com>
 2015-10-06 10:37:05 -04:00
Daniel Nephin
fe65c0258d Remove unused attach_socket function from Container. 
Signed-off-by: Daniel Nephin <dnephin@docker.com>
 2015-10-06 10:37:05 -04:00
Daniel Nephin
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
Aanand Prasad
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
Daniel Nephin
fbaea58fc1 Fix #2133 - fix call to get_client() 
Signed-off-by: Daniel Nephin <dnephin@docker.com>
 2015-10-05 15:57:49 -04:00
Daniel Nephin
aefb7a44b2 Refactor command class hierarchy to remove an unnecessary intermediate base class Command. 
Signed-off-by: Daniel Nephin <dnephin@docker.com>
 2015-10-05 15:49:35 -04:00
mnowster
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
mnowster
8616e291c5 Merge pull request #2034 from dnephin/release_scripts 
Automated release scripts
 2015-10-02 16:56:29 +01:00
Daniel Nephin
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
Daniel Nephin
04375fd566 Restore notes about building non-linux binaries. 
Signed-off-by: Daniel Nephin <dnephin@docker.com>
 2015-10-02 11:25:16 -04:00
Daniel Nephin
1a2a0dd53d Fix some bugs in the release scripts 
Signed-off-by: Daniel Nephin <dnephin@docker.com>
 2015-10-02 11:21:38 -04:00
Daniel Nephin
dc56e4f97e Update release process docs to use scripts. 
Signed-off-by: Daniel Nephin <dnephin@docker.com>
 2015-10-02 11:21:38 -04:00
Daniel Nephin
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
Aanand Prasad
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
Mazz Mosley
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
Mazz Mosley
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
Mazz Mosley
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
Daniel Nephin
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
Mazz Mosley
58270d8859 Remove duplicate and re-order alphabetically 
Signed-off-by: Mazz Mosley <mazz@houseofmnowster.com>
 2015-10-01 16:06:57 +01:00
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
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