4aa7d15d97
Call check_remote_network_config from Network.ensure
...
Signed-off-by: Joffrey F <joffrey@docker.com>
2016-11-04 10:51:14 -07:00
10417eebd7
Fix logging dict merging
...
Signed-off-by: Joffrey F <joffrey@docker.com>
2016-11-03 17:22:31 -07:00
9046e33ab2
Merge pull request #4112 from mikedougherty/rm-docs-checker
...
Remove docs checker from Jenkinsfile and use cleanWorkspace option on wrappedNode
2016-11-03 17:22:05 -07:00
da1508051d
Remove docs checker from Jenkinsfile and use cleanWorkspace option on wrappedNode
...
Signed-off-by: Mike Dougherty <mike.dougherty@docker.com>
2016-11-03 14:00:17 -07:00
969abca47f
Merge pull request #4098 from shin-/fix_overlay_options_mismatch
...
Add whitelisted driver option added by the overlay driver
2016-11-03 11:43:11 -07:00
d525dd1846
Merge pull request #4104 from shin-/bump_docker_py
...
Bump docker-py
2016-11-03 11:43:04 -07:00
7a430dbe96
Updated docker-py dependency to latest version
...
Signed-off-by: Joffrey F <joffrey@docker.com>
2016-11-02 16:56:45 -07:00
3b46a62f36
Merge pull request #4073 from mikedougherty/jenkinsfile
...
Update Jenkinsfile to run "janky" tasks
2016-11-02 14:55:11 -07:00
ba43d08fbd
Add whitelisted driver option added by the overlay driver to avoid breakage
...
Signed-off-by: Joffrey F <joffrey@docker.com>
2016-11-01 11:47:12 -07:00
ed71391f66
Merge pull request #4062 from strayobject/patch-1
...
fix(docs): updated documentation links
2016-10-28 11:55:58 -07:00
e563b58595
Merge pull request #4071 from NiR-/fix/run-as-container
...
Fix path of the parent dir of COMPOSE_FILE
2016-10-27 15:03:54 -07:00
62c9ed93d0
Merge pull request #4084 from shin-/bump_docker_py
...
Bump docker-py version to include latest patch
2016-10-27 12:53:44 -07:00
046144e8f4
Bump docker-py version to include latest patch
...
Signed-off-by: Joffrey F <joffrey@docker.com>
2016-10-27 12:13:32 -07:00
4871523d5e
Update Jenkinsfile to perform existing jenkins tasks
...
Signed-off-by: Mike Dougherty <mike.dougherty@docker.com>
2016-10-25 11:51:02 -07:00
505c785c5c
Merge pull request #4066 from shin-/fix-schema-divergence
...
Fix schema divergence - add missing fields to compose 2.1 schema
2016-10-25 11:20:51 -07:00
99343fd76c
Fix path of the parent dir of COMPOSE_FILE
...
Signed-off-by: Albin Kerouanton <albin.kerouanton@knplabs.com>
2016-10-25 11:09:45 +02:00
8b5782ba9f
Merge pull request #4067 from shin-/portable-find-exe
...
Replace "which" calls with the portable find_executable function
2016-10-24 16:15:21 -07:00
d586328812
Merge pull request #4065 from shin-/refine-swarm-warning
...
Do not print Swarm mode warning when connecting to a UCP server
2016-10-24 16:15:14 -07:00
021bb41fc6
Merge pull request #4069 from shin-/project_tests_robustness
...
Improve robustness of a couple integration tests with occasional failures
2016-10-24 15:35:52 -07:00
60d005b055
Improve robustness of a couple integration tests with occasional failures
...
Signed-off-by: Joffrey F <joffrey@docker.com>
2016-10-24 13:58:45 -07:00
d2fb146913
Replace "which" calls with the portable find_executable function
...
Signed-off-by: Joffrey F <joffrey@docker.com>
2016-10-24 13:22:52 -07:00
43e29b41c0
Fix schema divergence - add missing fields to compose 2.1 schema
...
Signed-off-by: Joffrey F <joffrey@docker.com>
2016-10-24 11:51:45 -07:00
a652b6818c
Merge pull request #4064 from shin-/missing-2.1-spec
...
Add missing config schema to docker-compose.spec
2016-10-24 11:43:17 -07:00
ea68be3441
Do not print Swarm mode warning when connecting to a UCP server
...
Signed-off-by: Joffrey F <joffrey@docker.com>
2016-10-24 11:36:44 -07:00
2c24bc3a08
Add missing config schema to docker-compose.spec
...
Signed-off-by: Joffrey F <joffrey@docker.com>
2016-10-24 10:55:04 -07:00
3d8dc6f47a
fix(docs): updated documentation links
...
Signed-off-by: Michal Zdrojewski <code@strayobject.co.uk>
2016-10-24 15:41:31 +01:00
f039c8b43c
Update release process document to account for recent changes.
...
Signed-off-by: Joffrey F <joffrey@docker.com>
2016-10-20 17:47:07 -07:00
3147090fb4
Merge pull request #4030 from shin-/npipe-fixes
...
Bump docker-py dependency (includes several npipe fixes)
2016-10-19 11:44:52 -07:00
de15ec835a
Merge pull request #3980 from aanand/shell-out-attach
...
Attach interactively on Windows by shelling out
2016-10-19 11:14:36 -07:00
2d3c76950f
Merge pull request #3972 from shin-/fix-contributors-script
...
Fix the contributors script
2016-10-18 15:25:55 -07:00
932b3cc10a
Merge pull request #4026 from shin-/3923-windows-volumes
...
Do not normalize volume paths on Windows by default
2016-10-18 14:41:52 -07:00
db5d2bcb10
Merge pull request #3990 from shin-/fix-osx-build
...
Fix openssl dependency in OSX binary build
2016-10-18 14:14:30 -07:00
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
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
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
Joffrey F
Joffrey F
Mike Dougherty
Aanand Prasad
Albin Kerouanton
Michal Zdrojewski
Nicolas Barbey
realityone
dbdd