tyler.durden
/
compose
mirror of https://github.com/docker/compose.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity
3,804 Commits 25 Branches 263 Tags 66 MiB
Commit Graph

3804 Commits

Author SHA1 Message Date
Daniel Nephin 2bce81508e Support non-alphanumeric default values. 
Signed-off-by: Daniel Nephin <dnephin@docker.com>
 2016-10-06 17:04:19 -04:00
Victoria Bialas 8f636d8279 Merge pull request #4010 from londoncalling/add-vnext-info 
updated README per vnext branch plan
 2016-10-05 18:47:00 -07:00
Joffrey F b50b14f937 Fix openssl dependency in OSX binary build 
Signed-off-by: Joffrey F <joffrey@docker.com>
 2016-10-05 17:08:14 -07:00
Joffrey F 54103dc954 Merge pull request #4009 from shin-/update-openssl-mac 
Use latest OpenSSL version (1.0.2j) when building Mac binary on Travis
 2016-10-05 17:07:13 -07:00
Joffrey F 28546d1f81 Use latest OpenSSL version (1.0.2j) when building Mac binary on Travis 
Signed-off-by: Joffrey F <joffrey@docker.com>
 2016-10-05 16:26:17 -07:00
Victoria Bialas a8ff4285d1 updated README per vnext branch plan 
Signed-off-by: Victoria Bialas <victoria.bialas@docker.com>
 2016-10-05 16:19:09 -07:00
Joffrey F eac01a7cd5 Merge pull request #3108 from dnephin/inplace_var_defaults 
Support inline default values for interpolation
 2016-10-05 14:22:02 -07:00
Joffrey F 08f1ea7a93 Merge pull request #3967 from docker/bump-1.8.1 
Bump 1.8.1
 2016-10-05 14:21:15 -07:00
John Mulhausen 85d6d7955f Merge pull request #4005 from johndmulhausen/master 
Remove old documentation source, add README on migration
 2016-10-04 19:08:36 -07:00
John Mulhausen 1a4e81920b Remove old documentation source, add README on migration 
Signed-off-by: John Mulhausen <john@docker.com>
 2016-10-04 17:58:44 -07:00
Matt Bray a37d99f201 Zsh completion: change --file description text 
Signed-off-by: Matt Bray <mattjbray@gmail.com>
 2016-09-30 00:45:46 +01:00
Daniel Nephin fe08be698d Support inline default values. 
Signed-off-by: Daniel Nephin <dnephin@docker.com>
 2016-09-29 12:46:11 -04:00
Joffrey F 007cf96452 Use docker-py's default behavior when no explicit host on Windows 
Signed-off-by: Joffrey F <joffrey@docker.com>
 2016-09-28 15:36:57 -07:00
Joffrey F dc8a39f70d Add support for "isolation" in config 
Signed-off-by: Joffrey F <joffrey@docker.com>
 2016-09-28 15:31:58 -07:00
Joffrey F b05c6c6fe9 Fix openssl dependency in OSX binary build 
Signed-off-by: Joffrey F <joffrey@docker.com>
 2016-09-28 13:13:04 -07:00
Joffrey F de90765531 Bump 1.8.1 
Signed-off-by: Joffrey F <joffrey@docker.com>
 2016-09-28 12:17:05 -07:00
Matthew Bray 90356b7040 Zsh completion: permit multiple --file arguments 
Before this change:

```
$ docker-compose --file docker-compose.yml -<TAB>
 -- option --
--help                 -h  -- Get help
--host                 -H  -- Daemon socket to connect to
--project-name         -p  -- Specify an alternate project name (default: directory name)
--skip-hostname-check      -- Don't check the daemon's hostname against the name specified in the client certificate (for example if your docker host is an IP address)
--tls                      -- Use TLS; implied by --tlsverify
--tlscacert                -- Trust certs signed only by this CA
--tlscert                  -- Path to TLS certificate file
--tlskey                   -- Path to TLS key file
--tlsverify                -- Use TLS and verify the remote
--verbose                  -- Show more output
--version              -v  -- Print version and exit
```

(Note the `--file` argument is no longer available to complete.)

After this change:

```
docker-compose --file docker-compose.yml -<TAB>
 -- option --
--file                 -f  -- Specify an alternate docker-compose file (default: docker-compose.yml)
--help                 -h  -- Get help
--host                 -H  -- Daemon socket to connect to
--project-name         -p  -- Specify an alternate project name (default: directory name)
--skip-hostname-check      -- Don't check the daemon's hostname against the name specified in the client certificate (for example if your docker host is an IP address)
--tls                      -- Use TLS; implied by --tlsverify
--tlscacert                -- Trust certs signed only by this CA
--tlscert                  -- Path to TLS certificate file
--tlskey                   -- Path to TLS key file
--tlsverify                -- Use TLS and verify the remote
--verbose                  -- Show more output
--version              -v  -- Print version and exit
```

Signed-off-by: Matt Bray <mattjbray@gmail.com>
 2016-09-28 12:04:13 +01:00
Joffrey F 5667de87e8 Fix the contributors script to show only contributors on the current branch 
Signed-off-by: Joffrey F <joffrey@docker.com>
 2016-09-22 12:34:59 -07:00
Joffrey F f65f89ad8c Merge pull request #3653 from shin-/3637-link-local-ips 
Add support for link-local IPs in service.networks definition
 2016-09-22 11:58:29 -07:00
Joffrey F e216a31f1e Bump docker-py dependency 
Signed-off-by: Joffrey F <joffrey@docker.com>
 2016-09-21 15:06:19 -07:00
Joffrey F e8903da96c Force default host on windows to the default TCP host (instead of npipe) 
Signed-off-by: Joffrey F <joffrey@docker.com>
 2016-09-21 15:06:19 -07:00
Aanand Prasad 613e060f0d Fix integration test on Docker for Mac 
Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
 2016-09-21 15:06:19 -07:00
Joffrey F 070f8b3992 Only allow log streaming if logdriver is json-file or journald 
Signed-off-by: Joffrey F <joffrey@docker.com>
 2016-09-21 15:06:19 -07:00
Joffrey F 016197c16e Catch APIError while printing container logs 
Signed-off-by: Joffrey F <joffrey@docker.com>
 2016-09-21 15:06:19 -07:00
Joffrey F 6abdd9cc32 Update docker-py dependency to latest release 
Signed-off-by: Joffrey F <joffrey@docker.com>
 2016-09-21 15:06:19 -07:00
Joffrey F fd7c16f1a4 Improve volumespec parsing on windows platforms 
Signed-off-by: Joffrey F <joffrey@docker.com>
 2016-09-21 15:06:19 -07:00
Joffrey F 20a511e961 Fix command hint in bundle to pull services instead of images 
Signed-off-by: Joffrey F <joffrey@docker.com>
 2016-09-21 15:06:19 -07:00
Joffrey F 9e18929d60 Remove surrounding quotes from TLS paths, if present 
Signed-off-by: Joffrey F <joffrey@docker.com>
 2016-09-21 15:06:19 -07:00
JG² 4b17aa1b9e Update rm.md 
Receiving this message when using the -a flag : `--all flag is obsolete. This is now the default behavior of `docker-compose rm`, I proposed to mark it in the docs but I don't know which way is the best

Signed-off-by: jgsqware <garciagonzalez.julien@gmail.com>
 2016-09-21 15:06:19 -07:00
Joffrey F bd7db570bd Catchable error for parse failures in split_buffer 
Signed-off-by: Joffrey F <joffrey@docker.com>
 2016-09-21 15:06:19 -07:00
Joffrey F 1c07d6453f json_splitter: Don't break when buffer contains leading whitespace. 
Add error logging with detailed output for decode errors

Signed-off-by: Joffrey F <joffrey@docker.com>
 2016-09-21 15:06:19 -07:00
Aanand Prasad 093b040b8e Fix stacktrace when handling timeout error 
Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
 2016-09-21 15:06:19 -07:00
Aanand Prasad b801f275d7 Shell completion for --push-images 
Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
 2016-09-21 15:06:19 -07:00
Daniel Nephin 5b27389571 Merge pull request #3956 from shin-/update_dockerpy_version 
Bump docker-py dependency
 2016-09-21 10:08:48 -04:00
Joffrey F 53fa44c01e Don't break when interpolating environment with unicode characters 
Signed-off-by: Joffrey F <joffrey@docker.com>
 2016-09-20 18:05:59 -07:00
Joffrey F 7687412e03 Merge pull request #3922 from shin-/3897-volumespec_parse_win32 
Improve volumespec parsing on windows platforms
 2016-09-20 13:09:37 -07:00
Joffrey F 33424189d4 Denormalize function defaults to latest version 
Minor docs fix

Signed-off-by: Joffrey F <joffrey@docker.com>
 2016-09-20 11:47:14 -07:00
Joffrey F 7911659266 Improve volumespec parsing on windows platforms 
Signed-off-by: Joffrey F <joffrey@docker.com>
 2016-09-20 11:24:24 -07:00
Andreas Kohn cb3bf869f4 Fix typo 
Signed-off-by: Andreas Kohn <andreas.kohn@gmail.com>
 2016-09-20 13:59:17 +02:00
Joffrey F 1648a3e257 Merge pull request #3709 from Knetic/groupadd 
Supported group_add
 2016-09-19 17:18:06 -07:00
Joffrey F fc6791f3f0 Bump docker-py dependency 
Signed-off-by: Joffrey F <joffrey@docker.com>
 2016-09-16 14:12:15 -07:00
Joffrey F 1d03baa9b1 Merge pull request #3954 from shin-/windows_tcp_default 
Force default host on windows to the default TCP host (instead of npipe)
 2016-09-16 14:09:10 -07:00
Joffrey F 64517e31fc Force default host on windows to the default TCP host (instead of npipe) 
Signed-off-by: Joffrey F <joffrey@docker.com>
 2016-09-16 11:43:25 -07:00
Joffrey F 66b395d950 Include docker-py link-local fix and improve integration test 
Signed-off-by: Joffrey F <joffrey@docker.com>
 2016-09-15 14:55:42 -07:00
Joffrey F fd254caa68 Add support for link-local IPs in service.networks definition 
Signed-off-by: Joffrey F <joffrey@docker.com>
 2016-09-15 14:55:14 -07:00
Joffrey F 651283eef9 Merge pull request #3941 from shin-/3888-recover-apierror-logs 
Catch APIError while printing container logs
 2016-09-13 12:58:40 -07:00
Joffrey F f065ce0f73 Merge pull request #3942 from shin-/3873-syslog-logs-error 
Only allow log streaming if logdriver is json-file
 2016-09-13 12:28:27 -07:00
Joffrey F 3fcd648ba2 Catch APIError while printing container logs 
Signed-off-by: Joffrey F <joffrey@docker.com>
 2016-09-13 12:10:41 -07:00
Joffrey F 7dd2e33057 Only allow log streaming if logdriver is json-file or journald 
Signed-off-by: Joffrey F <joffrey@docker.com>
 2016-09-13 11:56:26 -07:00
Joffrey F 1b2354c6f4 Merge pull request #3943 from aanand/fix-integration-test-on-docker-for-mac 
Fix integration test on Docker for Mac
 2016-09-13 11:54:16 -07:00