tyler.durden/compose
1
0
Fork 0
mirror of https://github.com/docker/compose.git synced 2025-11-17 20:30:25 +01:00
Code Issues Packages Projects Releases Wiki Activity
3,126 Commits 22 Branches 291 Tags
Commit Graph

952 Commits

Author SHA1 Message Date
Joffrey F
09690e1758 Merge pull request #4220 from shin-/4211-default_network_labels 
Add default labels to networks and volumes created by Compose
 2016-12-20 02:34:57 -08:00
Joffrey F
3058e39407 Merge pull request #4268 from shin-/jtakkala-3765-sysctl-support 
Add sysctl option support when creating service
 2016-12-20 02:34:02 -08:00
Joffrey F
ba47fb99ba Add default labels to networks and volumes created by Compose 
Signed-off-by: Joffrey F <joffrey@docker.com>
 2016-12-19 20:43:35 -08:00
Joffrey F
346802715d Use colorama to enable colored output on Windows 
Signed-off-by: Joffrey F <joffrey@docker.com>
 2016-12-19 20:40:47 -08:00
Joffrey F
eb6441c8e3 Add sysctls option to 3.0 schema 
Signed-off-by: Joffrey F <joffrey@docker.com>
 2016-12-19 20:35:09 -08:00
Joffrey F
82230071d5 Merge branch '3765-sysctl-support' of https://github.com/jtakkala/compose into jtakkala-3765-sysctl-support 
Signed-off-by: Joffrey F <joffrey@docker.com>
 2016-12-19 20:33:54 -08:00
Joffrey F
e6b2949edc Merge pull request #4216 from lawliet89/userns_mode 
Implement `userns_mode` HostConfig for services
 2016-12-19 18:12:15 -08:00
Joffrey F
e736151ee4 Make created networks attachable for file format >=2.1 
Signed-off-by: Joffrey F <joffrey@docker.com>
 2016-12-16 12:23:24 -08:00
Joffrey F
04e5925a23 Use docker SDK 2.0 
Signed-off-by: Joffrey F <joffrey@docker.com>
 2016-12-14 15:36:08 -08:00
Joffrey F
635a281777 Merge pull request #4163 from aanand/add-healthcheck 
Implement 'healthcheck' option
 2016-12-14 15:35:05 -08:00
Aanand Prasad
599b29e405 Merge pull request #4213 from shin-/4212-interactive-connect 
Win32 interactive run - Connect container to networks before starting
 2016-12-08 13:41:33 +00:00
Aanand Prasad
30eac9f1ae Merge pull request #4226 from dnephin/update-api-version-for-v3 
Increase minimum version for compose format v3
 2016-12-07 16:59:28 +00:00
Daniel Nephin
e04a12b5ca Increase minimum version for v3. 
Signed-off-by: Daniel Nephin <dnephin@docker.com>
 2016-12-07 11:16:40 -05:00
Joffrey F
4d0575355c Bump master version to 1.10.0dev 
Signed-off-by: Joffrey F <joffrey@docker.com>
 2016-12-06 17:14:05 -08:00
Yong Wen Chua
62f8b1402e Implement userns_mode HostConfig for services 
Fixes #3349

This allows the key `userns_mode` to be used in service definitions.
Since `userns_mode` requires API version > 1.23, this is only available
in 2.1 and 3.0 versions of compose file

Signed-off-by: Yong Wen Chua <me@yongwen.xyz>
 2016-12-05 14:25:56 +08:00
Joffrey F
6aacf51427 Win32 interactive run - Connect container to networks before starting 
Signed-off-by: Joffrey F <joffrey@docker.com>
 2016-12-02 16:10:15 -08:00
Ian Campbell
dc9184a90f progress_stream: Avoid undefined ANSI escape codes 
The ANSI escape codes \e[0A (cursor up 0 lines) and \e[0B (cursor down 0 lines)
are not well defined and are treated differently by different terminals. In
particular xterm treats 0 as a missing parameter and therefore defaults to 1,
whereas rxvt-unicode treats these escapes as a request to move 0 lines.

However the use of these codes is unnecessary and were really just hiding the
fact that we were not correctly computing diff when adding a new line. Having
added the new line to the ids map and output the corresponding \n the correct
diff would be 1 and not 0 (which xterm interprets as 1) as currently.

Rather than changing the hardcoded 0 to a 1 pull the diff calculation out and
always do it since it produces the correct answer in both cases.

This fixes similar corruption when compose is pulling an image to that seen
with `docker pull` and rxvt-unicode (and likely other terminals in that family)
seen in docker/docker#28111.

This is the same as the fix made to Docker's pkg/jsonmessage in
https://github.com/docker/docker/pull/28238 (and I have shamelessly ripped off
most of this commit message from there).

Signed-off-by: Ian Campbell <ian.campbell@docker.com>
 2016-11-25 10:16:37 +00:00
Daniel Nephin
c26a2afaf3 Update messages about docker stack deploy. 
Signed-off-by: Daniel Nephin <dnephin@docker.com>
 2016-11-21 16:34:49 -05:00
Aanand Prasad
716a6baa59 Implement 'healthcheck' option 
Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
 2016-11-18 14:47:02 +00:00
Daniel Nephin
079c95c340 Use stop grace period for container stop. 
Signed-off-by: Daniel Nephin <dnephin@docker.com>
 2016-11-16 12:12:28 -05:00
Daniel Nephin
6cac48c056 Add a vendored and modified pytimeparse 
Signed-off-by: Daniel Nephin <dnephin@docker.com>
 2016-11-16 12:10:32 -05:00
Aanand Prasad
f75ef6862f Warn if any services use 'deploy' 
Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
 2016-11-16 16:07:02 +00:00
Aanand Prasad
d717c88b6e Support version 3.0 of the Compose file format 
Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
 2016-11-16 16:07:02 +00:00
Joffrey F
7f60ff5ae6 Avoid breaking when remote driver options are null. 
Signed-off-by: Joffrey F <joffrey@docker.com>
 2016-11-15 12:00:52 -08:00
Joffrey F
efb4ed1b9e Handle new pull failures behavior in Engine 1.13 
Signed-off-by: Joffrey F <joffrey@docker.com>
 2016-11-15 11:30:52 -08:00
Jari Takkala
91620ae97b Add sysctl option support when creating service 
Closes #3765

Signed-off-by: Jari Takkala <jtakkala@gmail.com>
 2016-11-10 16:41:16 -05:00
Joffrey F
0e28163ccb Merge pull request #4115 from shin-/fix_overlay_options_mismatch 
Call check_remote_network_config from Network.ensure
 2016-11-08 15:35:38 -08:00
Joffrey F
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
Joffrey F
10417eebd7 Fix logging dict merging 
Signed-off-by: Joffrey F <joffrey@docker.com>
 2016-11-03 17:22:31 -07:00
Joffrey F
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
Aanand Prasad
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
Aanand Prasad
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
Joffrey F
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
Joffrey F
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
Joffrey F
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
Joffrey F
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
Joffrey F
cd94c37f5d Fix merge error (missing Network.labels attribute) 
Signed-off-by: Joffrey F <joffrey@docker.com>
 2016-10-18 14:09:31 -07:00
Joffrey F
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
Joffrey F
14716bc2da Merge branch 'master' of https://github.com/dbdd4us/compose into dbdd4us-master 2016-10-17 14:09:09 -07:00
Joffrey F
a5c1e4b0cd Merge pull request #3991 from shin-/3906-isolation-config 
Add support for "isolation" in config
 2016-10-17 11:02:11 -07:00
Joffrey F
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
Aanand Prasad
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
Aanand Prasad
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
Aanand Prasad
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
realityone
22d91f60be
fix serialize restart spec with null string 
Signed-off-by: realityone <realityone@me.com>
 2016-10-14 18:20:55 +08:00
dbdd
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
Joffrey F
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
Joffrey F
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
Joffrey F
0603b445e2 Properly merge logging dictionaries in overriding configs 
Signed-off-by: Joffrey F <joffrey@docker.com>
 2016-10-10 15:39:05 -07:00
Joffrey F
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