cd94c37f5d
Fix merge error (missing Network.labels attribute)
...
Signed-off-by: Joffrey F <joffrey@docker.com>
2016-10-18 14:09:31 -07:00
efb09af271
Do not normalize volume paths on Windows by default
...
Add environment variable to enable normalization if needed.
Do not normalize internal paths
Signed-off-by: Joffrey F <joffrey@docker.com>
2016-10-18 12:17:56 -07:00
f60c60205b
Merge branch 'dbdd4us-master'
2016-10-17 14:09:40 -07:00
14716bc2da
Merge branch 'master' of https://github.com/dbdd4us/compose into dbdd4us-master
2016-10-17 14:09:09 -07:00
882084932d
Upgrade docker-py to latest version
...
Adjust required requests version
Signed-off-by: Joffrey F <joffrey@docker.com>
2016-10-17 14:03:21 -07:00
a5c1e4b0cd
Merge pull request #3991 from shin-/3906-isolation-config
...
Add support for "isolation" in config
2016-10-17 11:02:11 -07:00
95c6cc0420
Merge pull request #3994 from shin-/3430-enable-ipv6
...
Add support for enable_ipv6 in network definition.
2016-10-17 11:02:00 -07:00
50faddb683
Merge pull request #4034 from realab/fix-restart-with-null-string
...
fix serialize restart spec with null string
2016-10-14 14:34:35 -07:00
925915eb25
Show clear error when docker binary can't be found
...
Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
2016-10-14 17:31:21 +01:00
8314a48a2e
Attach interactively on Windows by shelling out
...
Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
2016-10-14 17:31:21 +01:00
8b383ad795
Refactor "docker not found" message generation, add Windows message
...
Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
2016-10-14 17:31:21 +01:00
22d91f60be
fix serialize restart spec with null string
...
Signed-off-by: realityone <realityone@me.com>
2016-10-14 18:20:55 +08:00
bdcce13f4a
add support for creating volume and network with label definition
...
Signed-off-by: dbdd <wangtong2712@gmail.com>
2016-10-12 10:35:14 +08:00
e4bb9bde30
Merge pull request #3964 from shin-/3963-unicode-env
...
Don't break when interpolating environment with unicode characters
2016-10-11 12:00:36 -07:00
7f1606545d
Merge pull request #4004 from shin-/4000-extend-logging
...
Properly merge logging dictionaries in overriding configs
2016-10-11 12:00:06 -07:00
0603b445e2
Properly merge logging dictionaries in overriding configs
...
Signed-off-by: Joffrey F <joffrey@docker.com>
2016-10-10 15:39:05 -07:00
9248298a4a
Merge pull request #4016 from shin-/4008-unicode-formatter
...
Handle formatter case where logrecord message is binary containing unicode
2016-10-06 16:49:03 -07:00
bc3ed6dead
Merge pull request #3992 from shin-/3701-npipe-windows-default
...
Use docker-py's default behavior when no explicit host on Windows
2016-10-06 16:48:35 -07:00
e5ded6ff9b
Add support for enable_ipv6 in network definition.
...
Signed-off-by: Joffrey F <joffrey@docker.com>
2016-10-06 15:49:08 -07:00
804555bc4d
Merge pull request #4015 from dnephin/fix-inline-defaults
...
Support non-alphanumeric default values.
2016-10-06 15:46:35 -07:00
17c5b45641
Handle formatter case where logrecord message is binary containing
...
unicode characters.
Signed-off-by: Joffrey F <joffrey@docker.com>
2016-10-06 15:39:47 -07:00
2bce81508e
Support non-alphanumeric default values.
...
Signed-off-by: Daniel Nephin <dnephin@docker.com>
2016-10-06 17:04:19 -04:00
8f636d8279
Merge pull request #4010 from londoncalling/add-vnext-info
...
updated README per vnext branch plan
2016-10-05 18:47:00 -07:00
b50b14f937
Fix openssl dependency in OSX binary build
...
Signed-off-by: Joffrey F <joffrey@docker.com>
2016-10-05 17:08:14 -07:00
a8ff4285d1
updated README per vnext branch plan
...
Signed-off-by: Victoria Bialas <victoria.bialas@docker.com>
2016-10-05 16:19:09 -07:00
eac01a7cd5
Merge pull request #3108 from dnephin/inplace_var_defaults
...
Support inline default values for interpolation
2016-10-05 14:22:02 -07:00
85d6d7955f
Merge pull request #4005 from johndmulhausen/master
...
Remove old documentation source, add README on migration
2016-10-04 19:08:36 -07:00
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
a37d99f201
Zsh completion: change --file description text
...
Signed-off-by: Matt Bray <mattjbray@gmail.com>
2016-09-30 00:45:46 +01:00
fe08be698d
Support inline default values.
...
Signed-off-by: Daniel Nephin <dnephin@docker.com>
2016-09-29 12:46:11 -04:00
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
dc8a39f70d
Add support for "isolation" in config
...
Signed-off-by: Joffrey F <joffrey@docker.com>
2016-09-28 15:31:58 -07:00
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
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
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
5b27389571
Merge pull request #3956 from shin-/update_dockerpy_version
...
Bump docker-py dependency
2016-09-21 10:08:48 -04:00
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
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
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
7911659266
Improve volumespec parsing on windows platforms
...
Signed-off-by: Joffrey F <joffrey@docker.com>
2016-09-20 11:24:24 -07:00
cb3bf869f4
Fix typo
...
Signed-off-by: Andreas Kohn <andreas.kohn@gmail.com>
2016-09-20 13:59:17 +02:00
1648a3e257
Merge pull request #3709 from Knetic/groupadd
...
Supported group_add
2016-09-19 17:18:06 -07:00
fc6791f3f0
Bump docker-py dependency
...
Signed-off-by: Joffrey F <joffrey@docker.com>
2016-09-16 14:12:15 -07:00
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
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
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
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
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
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
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
Joffrey F
Aanand Prasad
realityone
dbdd
Daniel Nephin
Victoria Bialas
Victoria Bialas
John Mulhausen
Matt Bray
Daniel Nephin
Andreas Kohn