tyler.durden
/
compose
mirror of https://github.com/docker/compose.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity
3,240 Commits 22 Branches 267 Tags 56 MiB
Commit Graph

3240 Commits

Author SHA1 Message Date
Joey Payne 5b6191e653 Add cache_from to build opts 
Signed-off-by: Joey Payne <jyapayne@gmail.com>
 2017-02-21 19:01:30 -07:00
Joffrey F 89c028f3f2 Merge pull request #4524 from docker/update_build_status 
Update build status in README.md
 2017-02-21 17:06:14 -08:00
Joffrey F 7b1be89ec0 Merge pull request #4518 from albers/completion-fix-global-args 
Fix treatment of global arguments in bash completion
 2017-02-21 14:58:38 -08:00
Joffrey F e4a87397af Update README.md 2017-02-21 14:56:07 -08:00
Joffrey F 64ddd09ed1 Merge pull request #4504 from shin-/docker-py-2.1.0 
Update docker SDK dependency
 2017-02-21 14:52:08 -08:00
Joffrey F dbe418924a Merge pull request #4523 from shin-/versions_py_fix 
Update versions.py script to support new engine versioning schema
 2017-02-21 14:20:54 -08:00
Joffrey F c2553ac777 Update versions.py script to support new engine versioning schema 
Signed-off-by: Joffrey F <joffrey@docker.com>
 2017-02-21 14:05:47 -08:00
Harald Albers 39b2c6636e Fix treatment of global arguments in bash completion 
Signed-off-by: Harald Albers <github@albersweb.de>
 2017-02-21 17:54:20 +01:00
Joffrey F e0e862c042 Update docker SDK dependency 
Signed-off-by: Joffrey F <joffrey@docker.com>
 2017-02-16 17:05:09 -08:00
Joffrey F aa8fb8f708 Merge pull request #4499 from xulike666/function-name-modification 
function-name-modification for tests/*
 2017-02-16 11:59:36 -08:00
Joffrey F b49f42f9b7 Merge pull request #4496 from xulike666/quick-easy-typo-fix 
fix a typo in script/release/utils.sh
 2017-02-16 11:59:17 -08:00
Joffrey F afd3bcfbf4 Merge pull request #4484 from shin-/4425-sys-path-fix 
Reinitialize sys.path after it's been potentially modified by pip
 2017-02-16 11:39:54 -08:00
Aaron.L.Xu d20e3f3342 function-name-modification for tests/* 
Signed-off-by: Aaron.L.Xu <likexu@harmonycloud.cn>
 2017-02-16 15:25:20 +08:00
Aaron.L.Xu 27297fd1af fix a typo in script/release/utils.sh 
Signed-off-by: Aaron.L.Xu <likexu@harmonycloud.cn>
 2017-02-16 11:14:49 +08:00
Joffrey F 66f4a795a2 Don't import pip inside Compose 
Signed-off-by: Joffrey F <joffrey@docker.com>
 2017-02-15 16:31:50 -08:00
Joffrey F 40c26ca676 Merge pull request #4480 from shin-/4479-merge-secrets 
Fix `config` command output with service.secrets section
 2017-02-14 17:08:18 -08:00
Joffrey F abce83ef25 Fix `config` command output with service.secrets section 
Signed-off-by: Joffrey F <joffrey@docker.com>
 2017-02-13 16:51:50 -08:00
Joffrey F bb5d7b2433 Merge pull request #4473 from Vehsamrak/patch-1 
Compose file reference link fix in README.md
 2017-02-13 13:03:39 -08:00
Petr Karmashev 252699c1d1 Compose file reference link fix in README.md 
Signed-off-by: Petr Karmashev <smonkl@bk.ru>
 2017-02-12 02:10:34 +03:00
Joffrey F ad0e6d219b Merge pull request #4469 from dnephin/fix_secrets_config 
Fixes secrets config loading
 2017-02-10 18:39:53 -08:00
Daniel Nephin dc5b3f3b3e Fix secrets config. 
Signed-off-by: Daniel Nephin <dnephin@docker.com>
 2017-02-10 17:11:24 -05:00
Joffrey F 1fe2443735 Merge pull request #4438 from fate-grand-order/master 
fix typo in CHANGELOG.md
 2017-02-09 16:35:35 -08:00
Joffrey F 27e0f31275 Merge pull request #4443 from xulike666/fix-accessibility 
Referencing the right segment of code in compose/bundle.py
 2017-02-09 16:34:48 -08:00
Joffrey F 2f13201b9e Merge pull request #4453 from kevinetc123/patch-typo 
fix typo in project.py
 2017-02-09 16:33:07 -08:00
Joffrey F 276db7231a Merge pull request #4455 from dnephin/fix_3.1 
Fix version 3.1
 2017-02-09 12:38:29 -08:00
Daniel Nephin c092fa37de Fix version 3.1 
Signed-off-by: Daniel Nephin <dnephin@docker.com>
 2017-02-09 12:39:57 -05:00
kevinetc123 47e4442722 fix typo in project.py 
Signed-off-by: kevinetc123 <kaiwentan@harmonycloud.cn>
 2017-02-09 19:10:26 +08:00
Joffrey F b306e843d3 Merge pull request #4448 from shin-/1.11-release 
1.11 release-master realign
 2017-02-08 13:54:12 -08:00
Joffrey F fc7b74d7f9 Bump to next dev version 
Signed-off-by: Joffrey F <joffrey@docker.com>
 2017-02-08 13:47:08 -08:00
Joffrey F 2cd6cb9a47 Bump 1.10.1 
Signed-off-by: Joffrey F <joffrey@docker.com>
 2017-02-08 13:45:25 -08:00
Joffrey F 01d1895a35 Bump 1.11.0 
Signed-off-by: Joffrey F <joffrey@docker.com>
 2017-02-08 13:44:40 -08:00
Joffrey F 979a0d53f7 Bump 1.11.0-rc1 
Signed-off-by: Joffrey F <joffrey@docker.com>
 2017-02-08 13:44:31 -08:00
Aaron.L.Xu f083526829 referencing right segment of code 
Signed-off-by: Aaron.L.Xu <likexu@harmonycloud.cn>
 2017-02-08 18:50:26 +08:00
fate-grand-order b392b6e12e fix typo in CHANGELOG.md 
Signed-off-by: fate-grand-order <chenjg@harmonycloud.cn>
 2017-02-07 15:59:34 +08:00
Joffrey F 165eb9c91a Merge pull request #3558 from shin-/1135-pyinstaller-update 
Use newer version of PyInstaller to fix prelinking issues
 2017-02-06 15:00:39 -08:00
Joffrey F 1636985a7a Merge pull request #4426 from shin-/4392-context-mgr 
Close the open file handle using context manager
 2017-02-06 13:30:49 -08:00
Kevin Jing Qiu a3a9d8944a Close the open file handle using context manager 
Signed-off-by: Kevin Jing Qiu <kevin.qiu@points.com>
 2017-02-03 14:50:40 -08:00
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 84774cacd2 Upgrade python and pip versions in Dockerfile 
Add libbz2 dependency

Signed-off-by: Joffrey F <joffrey@docker.com>
 2017-02-01 14:12:41 -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