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

4075 Commits

Author SHA1 Message Date
Joffrey F 7c5d5e4031 Bump 1.11.1 
Signed-off-by: Joffrey F <joffrey@docker.com>
 2017-02-09 10:18:13 -08:00
Daniel Nephin c79a1c7288 Fix version 3.1 
Signed-off-by: Daniel Nephin <dnephin@docker.com>
 2017-02-09 10:18:13 -08:00
Joffrey F 4e2e383282 Merge remote-tracking branch 'source/release' into bump-1.11.1 2017-02-09 10:12:21 -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
Joffrey F 6238502087 Merge pull request #4447 from docker/bump-1.11.0 
Bump 1.11.0
 2017-02-08 13:42:55 -08:00
Joffrey F 6de1806658 Bump 1.11.0 
Signed-off-by: Joffrey F <joffrey@docker.com>
 2017-02-08 11:30:29 -08:00
Joffrey F fbe688b05a Merge remote-tracking branch 'source/release' into bump-1.11.0 2017-02-08 11:28:53 -08:00
Jean-Christophe Berthon 5193e56a65 Add first attempt at supporting test suite on ARM 
Modify `script/test/default` so it supports a first attempt at testing on ARM.
Call the script with: `$ DOCKERFILE=Dockerfile.armhf script/test/default` to
use the Dockerfile.armhf instead of the default Dockerfile for building the image.

However, running the script is not working fully. The problem is that
`dockerswarm/dind` does not provide an ARM image and therefore cannot be executed.
If that is fixed then we should be able to change the script in order to use the ARM
image instead of the default x86_64 image for running further tests.

Signed-off-by: Jean-Christophe Berthon <huygens@berthon.eu>
 2017-02-08 12:52:48 +00:00
Jean-Christophe Berthon ac235a1f85 Add support to build docker-compose on ARM 32bit 
Added a new Dockerfile (Dockerfile.armhf) specific for ARM 32 bit.
The Dockerfile was updated compare to default one:
  - Base image is armhf/debian instead of debian
  - Docker binary is downloaded with the correct arch (although it does not
    seems to be used)

Signed-off-by: Jean-Christophe Berthon <huygens@berthon.eu>
 2017-02-08 12:52:10 +00: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 daed6dbb91 Merge pull request #4427 from docker/bump-1.11.0-rc1 
Bump 1.11.0 RC1
 2017-02-06 15:02:54 -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
Joffrey F 0ea24e7a80 Bump 1.11.0-rc1 
Signed-off-by: Joffrey F <joffrey@docker.com>
 2017-02-03 15:27:42 -08:00
Joffrey F 6e9a894ccf Upgrade python and pip versions in Dockerfile Add libbz2 dependency 
Signed-off-by: Joffrey F <joffrey@docker.com>
 2017-02-03 15:19:33 -08:00
Joffrey F 0519afd5d3 Use newer version of PyInstaller to fix prelinking issues 
Signed-off-by: Joffrey F <joffrey@docker.com>
 2017-02-03 15:19:33 -08:00
Kevin Jing Qiu 8f72dadd75 Close the open file handle using context manager 
Signed-off-by: Kevin Jing Qiu <kevin.qiu@points.com>
 2017-02-03 15:19:21 -08:00
Joffrey F 9a59a9c3ff Bump 1.10.1 
Signed-off-by: Joffrey F <joffrey@docker.com>
 2017-02-03 15:18:44 -08:00
Joffrey F 37a987edaf Merge remote-tracking branch 'source/release' into bump-1.11.0-rc1 2017-02-03 15:02:44 -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 5a0ef19ee0 Merge pull request #4407 from docker/bump-1.10.1 
Bump 1.10.1
 2017-02-01 14:09:38 -08:00
Joffrey F b25273892d Bump 1.10.1 
Signed-off-by: Joffrey F <joffrey@docker.com>
 2017-01-31 15:39:34 -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 586637b6a8 Bump docker SDK version 
Signed-off-by: Joffrey F <joffrey@docker.com>
 2017-01-30 17:18:47 -08:00