tyler.durden
/
compose
mirror of https://github.com/docker/compose.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity
3,201 Commits 19 Branches 259 Tags 62 MiB
Commit Graph

3201 Commits

Author SHA1 Message Date
Joffrey F 951497c0f2 Merge pull request #4419 from shin-/4418-healthcheck-extends 
Don't re-parse healthcheck values coming from extended services
 2017-02-03 12:24:53 -08:00
Joffrey F e22164ec9f Merge pull request #4035 from urda/urda/compose-top 
Added `top` to `docker-compose` to display running processes
 2017-02-02 15:41:14 -08:00
Joffrey F f106d23776 Merge pull request #4414 from shin-/4184-merge-pids 
Add missing comma in DOCKER_CONFIG_KEYS list
 2017-02-02 14:51:42 -08:00
Joffrey F cf43e6edf7 Don't re-parse healthcheck values coming from extended services 
Signed-off-by: Joffrey F <joffrey@docker.com>
 2017-02-02 14:50:53 -08:00
Joffrey F 7e8958e6ca Add missing comma in DOCKER_CONFIG_KEYS list 
Signed-off-by: Joffrey F <joffrey@docker.com>
 2017-02-01 16:40:43 -08:00
Joffrey F 11038c455b Merge pull request #4334 from muicoder/master 
add IMAGE_EVENTS: load/save
 2017-02-01 15:49:03 -08:00
Peter Urda a67500ee57
Added `top` to `docker-compose` to display running processes. 
This commit allows `docker-compose` to access `top` for containers
much like running `docker top` directly on a given container.

This commit includes:

* `docker-compose` CLI changes to expose `top`
* Completions for `bash` and `zsh`
* Required testing for the new `top` command

Signed-off-by: Peter Urda <peter.urda@gmail.com>
 2017-02-01 15:42:30 -08:00
Joffrey F 1f39b33357 Merge pull request #3989 from mattjbray/patch-1 
Zsh completion: permit multiple --file arguments
 2017-02-01 15:08:39 -08:00
Joffrey F 67e1111806 Merge pull request #4410 from shin-/4408-colors-no-tty 
Don't strip ANSI color codes when output is not a TTY
 2017-02-01 14:20:10 -08:00
Joffrey F c9eb9380ed Merge pull request #4368 from dnephin/secrets-using-bind-mounts 
Secrets using bind mounts
 2017-02-01 14:11:20 -08:00
Joffrey F c16cd77737 Merge pull request #4406 from shin-/bump_docker_py 
Bump docker SDK version
 2017-01-31 15:36:30 -08:00
Joffrey F 8efb7e6e8b Don't strip ANSI color codes when output is not a TTY 
Signed-off-by: Joffrey F <joffrey@docker.com>
 2017-01-31 12:51:46 -08:00
Daniel Nephin 59d1847d9b Fix some test failures. 
Signed-off-by: Daniel Nephin <dnephin@docker.com>
 2017-01-31 09:53:40 -05:00
Daniel Nephin 3a2735abb9 Rebase compose v3.1 on the latest v3 
Signed-off-by: Daniel Nephin <dnephin@docker.com>
 2017-01-31 09:53:16 -05:00
Daniel Nephin 0d609b68ac Add a warning for unsupported secret fields. 
Signed-off-by: Daniel Nephin <dnephin@docker.com>
 2017-01-31 09:53:16 -05:00
Daniel Nephin 4053adc7d3 Add an integration test for secrets using bind mounts. 
Signed-off-by: Daniel Nephin <dnephin@docker.com>
 2017-01-31 09:53:16 -05:00
Daniel Nephin e0c6397999 Implement secrets using bind mounts 
Signed-off-by: Daniel Nephin <dnephin@docker.com>
 2017-01-31 09:53:16 -05:00
Daniel Nephin add56ce818 Read service secrets as a type. 
Signed-off-by: Daniel Nephin <dnephin@docker.com>
 2017-01-31 09:53:16 -05:00
Daniel Nephin a82de8863e Add v3.1 with secrets. 
Signed-off-by: Daniel Nephin <dnephin@docker.com>
 2017-01-31 09:53:16 -05:00
Joffrey F 2593366a3e Bump docker SDK version 
Signed-off-by: Joffrey F <joffrey@docker.com>
 2017-01-30 16:49:05 -08:00
Joffrey F 76d4f5bea6 Merge pull request #4383 from shin-/4344-detect-docker-py 
Detect conflicting version of the docker python SDK
 2017-01-30 12:14:27 -08:00
Joffrey F 5895d8bbc9 Detect conflicting version of the docker python SDK and prevent execution 
until issue is fixed

Signed-off-by: Joffrey F <joffrey@docker.com>
 2017-01-26 17:12:41 -08:00
Joffrey F e05a9f4e62 Merge pull request #4389 from shin-/4372-normalize-time-values 
Convert time data back to string values when serializing config
 2017-01-26 13:47:34 -08:00
Joffrey F e10d1140b9 Convert time data back to string values when serializing config 
Signed-off-by: Joffrey F <joffrey@docker.com>
 2017-01-26 11:59:22 -08:00
Joffrey F 56e01f25ea Merge pull request #4367 from dnephin/add-missing-network-internal-to-v3 
Add missing network.internal to v3 schema.
 2017-01-25 13:41:41 -08:00
Joffrey F c86faab4ec Merge pull request #4370 from shin-/4357-win32-unicode-paths 
Don't encode build context path on Windows
 2017-01-23 12:04:42 -08:00
Joffrey F 20d6f450b5 Don't encode build context path on Windows 
Signed-off-by: Joffrey F <joffrey@docker.com>
 2017-01-20 15:05:53 -08:00
Daniel Nephin 644e1716c3 Add missing network.internal to v3 schema. 
Signed-off-by: Daniel Nephin <dnephin@docker.com>
 2017-01-20 12:55:59 -05:00
Joffrey F 9a0962dacb Merge pull request #4361 from shin-/4348-serialize-ext-volumes 
Remove external_name from volume def in config output
 2017-01-19 17:41:08 -08:00
Joffrey F 263b9e9317 Merge pull request #4360 from shin-/4359-volume-labels 
Fix volume definition in v3 schema
 2017-01-19 17:40:29 -08:00
Joffrey F d83d31889e Remove external_name from volume def in config output 
Signed-off-by: Joffrey F <joffrey@docker.com>
 2017-01-19 16:05:13 -08:00
Joffrey F 5c2165eaaf Fix volume definition in v3 schema 
Signed-off-by: Joffrey F <joffrey@docker.com>
 2017-01-19 15:41:31 -08:00
Joffrey F 8a27a0f059 Merge pull request #4350 from shin-/fix-invalid-depends-on-merge 
depends_on merge now retains condition information when present
 2017-01-19 14:50:29 -08:00
Joffrey F b47c97e94e Merge pull request #4358 from shin-/1.11-dev 
1.11.0dev
 2017-01-19 14:50:10 -08:00
Joffrey F a482c138d8 Merge pull request #4353 from xulike666/fight-for-readability 
Fix typo in script/test/versions.py
 2017-01-19 14:49:05 -08:00
Joffrey F 1c46525c2b 1.11.0dev 
Signed-off-by: Joffrey F <joffrey@docker.com>
 2017-01-19 14:47:31 -08:00
Aaron.L.Xu 169289c8b6 find a fishbone 
Signed-off-by: Aaron.L.Xu <likexu@harmonycloud.cn>
 2017-01-20 00:52:19 +08:00
Joffrey F 1a02121ab5 depends_on merge now retains condition information when present 
Signed-off-by: Joffrey F <joffrey@docker.com>
 2017-01-18 17:52:03 -08:00
Joffrey F 708c4f9534 Merge pull request #4339 from shin-/4328-catch-healthcheck-exception 
Catch healthcheck exceptions in parallel_execute
 2017-01-17 14:16:37 -08:00
Joffrey F 56a1b02aac Catch healthcheck exceptions in parallel_execute 
Signed-off-by: Joffrey F <joffrey@docker.com>
 2017-01-17 13:22:16 -08:00
muicoder 931027c598 add IMAGE_EVENTS: load/save 
Signed-off-by: muicoder <muicoder@gmail.com>
 2017-01-16 10:53:40 +08:00
Joffrey F 5ade097d74 Merge pull request #4324 from shin-/4321-v3-depends-on 
Provide valid serialization of depends_on when format is not 2.1
 2017-01-12 11:52:15 -08:00
Joffrey F 62cdd25b7d Merge pull request #4323 from shin-/fix-push-release-script 
Use correct wheel file name in twine upload command
 2017-01-12 11:52:05 -08:00
Joffrey F 2df31bb13c Provide valid serialization of depends_on when format is not 2.1 
Signed-off-by: Joffrey F <joffrey@docker.com>
 2017-01-11 16:25:40 -08:00
Joffrey F 29b46d5b26 Use correct wheel file name in twine upload command 
Signed-off-by: Joffrey F <joffrey@docker.com>
 2017-01-11 15:39:48 -08:00
Joffrey F 2091149fee Merge pull request #4317 from shin-/release-script-fixes 
Fix docker image build script when using universal wheels
 2017-01-10 17:21:27 -08:00
Joffrey F 19190ea0df Fix docker image build script when using universal wheels 
Signed-off-by: Joffrey F <joffrey@docker.com>
 2017-01-10 16:43:26 -08:00
Joffrey F 1c1fe89e43 Merge pull request #4316 from shin-/update-setup-py 
Update setup.py extra_requires
 2017-01-10 15:50:11 -08:00
Joffrey F 52792b7a96 Update setup.py extra_requires 
Signed-off-by: Joffrey F <joffrey@docker.com>
 2017-01-10 14:59:11 -08:00
Joffrey F 9f6778aa73 Merge pull request #4172 from graingert/enable-universal-wheels 
enable universal wheels
 2017-01-10 14:57:22 -08:00