tyler.durden
/
compose
mirror of https://github.com/docker/compose.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity
4,103 Commits 20 Branches 266 Tags 55 MiB
Commit Graph

4103 Commits

Author SHA1 Message Date
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 dfed245b57 Bump 1.11.2 
Signed-off-by: Joffrey F <joffrey@docker.com>
 2017-02-16 17:16:07 -08:00
Joffrey F b9e9177ba9 Fix `config` command output with service.secrets section 
Signed-off-by: Joffrey F <joffrey@docker.com>
 2017-02-16 17:16:07 -08:00
Daniel Nephin 1d88989ff5 Fix secrets config. 
Signed-off-by: Daniel Nephin <dnephin@docker.com>
 2017-02-16 17:16:07 -08:00
Joffrey F 0d668aa446 Don't import pip inside Compose 
Signed-off-by: Joffrey F <joffrey@docker.com>
 2017-02-16 17:16:07 -08:00
Joffrey F 5198a5d33e Update docker SDK dependency 
Signed-off-by: Joffrey F <joffrey@docker.com>
 2017-02-16 17:16:07 -08:00
Joffrey F afe22ed15d Merge remote-tracking branch 'source/release' into bump-1.11.2 2017-02-16 17:07:04 -08: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 fa90e4e555 Merge pull request #4458 from docker/bump-1.11.1 
Bump 1.11.1
 2017-02-09 12:38:41 -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
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