tyler.durden
/
compose
mirror of https://github.com/docker/compose.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity
3,221 Commits 25 Branches 263 Tags 66 MiB
Commit Graph

3221 Commits

Author SHA1 Message Date
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
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 22249add84 Use newer version of PyInstaller to fix prelinking issues 
Signed-off-by: Joffrey F <joffrey@docker.com>
 2017-01-30 13:52:27 -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