086ae04b9e
Fix TypeError : unorderable types: str() < int()
...
While merging list items into a set, strings and ints are compared which is not possible.
We cast everything to strings to avoid the issue.
The issue was seen with python 3.5 while overriding configuration files
with heterogenous port types (int in one file, string in another).
Signed-off-by: Nicolas Barbey <nicolas.a.barbey@gmail.com>
2016-10-18 12:01:00 +02: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
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
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
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
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
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
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
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
ac9198e638
Merge pull request #3930 from shin-/update_dockerpy_version
...
Update docker-py dependency to latest release
2016-09-13 10:35:56 -04:00
9faa852d41
Merge pull request #3921 from shin-/3890-pull-services
...
Fix command hint in bundle to pull services instead of images
2016-09-13 10:32:14 -04:00
9759f27fa6
Fix integration test on Docker for Mac
...
Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
2016-09-13 14:50:37 +01:00
b64bd07f22
Update docker-py dependency to latest release
...
Signed-off-by: Joffrey F <joffrey@docker.com>
2016-09-12 14:34:07 -07:00
dada36f732
Supported group_add
...
Signed-off-by: George Lester <glester491@gmail.com>
2016-09-11 23:10:49 -07:00
817c76c8e9
Fix command hint in bundle to pull services instead of images
...
Signed-off-by: Joffrey F <joffrey@docker.com>
2016-09-08 11:17:39 -07:00
3dec600d82
Merge pull request #3830 from shin-/3534-machine-config-args
...
Remove surrounding quotes from TLS paths, if present
2016-09-07 18:35:43 -07:00
c197e02ecc
Merge pull request #3814 from aanand/disambiguate-swarm
...
Disambiguate 'Swarm' in integration doc
2016-09-07 10:46:14 +01:00
267a243f80
Merge pull request #3799 from aanand/handle-connection-error-on-project-init
...
Handle connection errors on project initialization
2016-09-06 10:25:48 -07:00
08179fc7e3
Merge pull request #3865 from SvenDowideit/add-jenkinsfile
...
Add docs checking Jenkinsfile
2016-08-24 15:01:36 +10:00
bf91c64983
Add docs checking Jenkinsfile
...
Signed-off-by: Sven Dowideit <SvenDowideit@home.org.au>
2016-08-22 12:18:07 +10:00
acfe100686
Merge pull request #3542 from jfroche/add_swappiness
...
Add support for swappiness constraint
2016-08-16 13:58:33 +01:00
d824cb9b06
Add support for swappiness constraint
...
Run a service using `docker run --memory-swappiness=0` (see
https://docs.docker.com/engine/reference/run/ )
refs #2383
Signed-off-by: Jean-François Roche <jfroche@affinitic.be>
2016-08-16 11:02:51 +02:00
13bcd85eb3
Merge pull request #3808 from jgsqware/patch-1
...
Update rm.md
2016-08-09 15:16:48 -07:00
c0305024f5
Remove surrounding quotes from TLS paths, if present
...
Signed-off-by: Joffrey F <joffrey@docker.com>
2016-08-09 15:13:01 -07:00
17f46f8999
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-08-05 13:41:20 +02:00
4cba653eeb
Disambiguate 'Swarm' in integration doc
...
Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
2016-08-04 15:19:02 +01:00
Nicolas Barbey
Joffrey F
Joffrey F
Daniel Nephin
Victoria Bialas
Victoria Bialas
John Mulhausen
Daniel Nephin
Aanand Prasad
George Lester
Ben Firshman
Sven Dowideit
Sven Dowideit
Jean-François Roche
JG²