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

4290 Commits

Author SHA1 Message Date
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
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 507e0d7a64 Convert time data back to string values when serializing config 
Signed-off-by: Joffrey F <joffrey@docker.com>
 2017-01-30 16:24:40 -08:00
Joffrey F d454a1d3fb 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-30 16:24:40 -08:00
Joffrey F 10365278cc Don't encode build context path on Windows 
Signed-off-by: Joffrey F <joffrey@docker.com>
 2017-01-30 16:24:40 -08:00
Daniel Nephin ce2219ec37 Add missing network.internal to v3 schema. 
Signed-off-by: Daniel Nephin <dnephin@docker.com>
 2017-01-30 16:24:40 -08:00
Joffrey F e035931f2e Fix volume definition in v3 schema 
Signed-off-by: Joffrey F <joffrey@docker.com>
 2017-01-30 16:24:40 -08:00
Joffrey F 5b912082e1 depends_on merge now retains condition information when present 
Signed-off-by: Joffrey F <joffrey@docker.com>
 2017-01-30 16:24:40 -08:00
Joffrey F 4d94594d37 Merge remote-tracking branch 'source/release' into bump-1.10.1 2017-01-30 16:11:06 -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
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 adcd1901e9 Merge pull request #4340 from docker/bump-1.10.0 
Bump 1.10.0
 2017-01-17 15:25:06 -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 4bd6f1a0d8 Bump 1.10.0 
Signed-off-by: Joffrey F <joffrey@docker.com>
 2017-01-17 13:27:49 -08:00
Joffrey F 4302861b21 Catch healthcheck exceptions in parallel_execute 
Signed-off-by: Joffrey F <joffrey@docker.com>
 2017-01-17 13:27:49 -08:00
Joffrey F 76678747c7 Provide valid serialization of depends_on when format is not 2.1 
Signed-off-by: Joffrey F <joffrey@docker.com>
 2017-01-17 13:27:49 -08:00
Joffrey F ab97716a95 Use correct wheel file name in twine upload command 
Signed-off-by: Joffrey F <joffrey@docker.com>
 2017-01-17 13:27:49 -08:00
Joffrey F 260995fd56 Merge remote-tracking branch 'source/release' into bump-1.10.0 2017-01-17 13:24:01 -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