tyler.durden/compose
1
0
Fork 0
mirror of https://github.com/docker/compose.git synced 2025-10-31 03:03:49 +01:00
Code Issues Packages Projects Releases Wiki Activity
5,517 Commits 22 Branches 289 Tags
Commit Graph

5517 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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>
1.10.0 		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
muicoder
931027c598 add IMAGE_EVENTS: load/save 
Signed-off-by: muicoder <muicoder@gmail.com>
 2017-01-16 10:53:40 +08:00
Joffrey F
5ade097d74 Merge pull request #4324 from shin-/4321-v3-depends-on 
Provide valid serialization of depends_on when format is not 2.1
 2017-01-12 11:52:15 -08:00
Joffrey F
62cdd25b7d Merge pull request #4323 from shin-/fix-push-release-script 
Use correct wheel file name in twine upload command
 2017-01-12 11:52:05 -08:00
Joffrey F
2df31bb13c Provide valid serialization of depends_on when format is not 2.1 
Signed-off-by: Joffrey F <joffrey@docker.com>
 2017-01-11 16:25:40 -08:00
Joffrey F
29b46d5b26 Use correct wheel file name in twine upload command 
Signed-off-by: Joffrey F <joffrey@docker.com>
 2017-01-11 15:39:48 -08:00
Joffrey F
0f8a1aa7a3 Merge pull request #4312 from docker/bump-1.10.0-rc2 
Bump 1.10.0 rc2
 2017-01-11 11:36:56 -08:00
Joffrey F
2091149fee Merge pull request #4317 from shin-/release-script-fixes 
Fix docker image build script when using universal wheels
 2017-01-10 17:21:27 -08:00
Joffrey F
fb241d0906 Bump 1.10.0-rc2 
Signed-off-by: Joffrey F <joffrey@docker.com>
1.10.0-rc2 		2017-01-10 16:47:40 -08:00
Joffrey F
71dd874600 Fix docker image build script when using universal wheels 
Signed-off-by: Joffrey F <joffrey@docker.com>
 2017-01-10 16:47:40 -08:00
Joffrey F
19190ea0df Fix docker image build script when using universal wheels 
Signed-off-by: Joffrey F <joffrey@docker.com>
 2017-01-10 16:43:26 -08:00
Joffrey F
1c1fe89e43 Merge pull request #4316 from shin-/update-setup-py 
Update setup.py extra_requires
 2017-01-10 15:50:11 -08:00
Joffrey F
740a6842e8 Update setup.py extra_requires 
Signed-off-by: Joffrey F <joffrey@docker.com>
 2017-01-10 15:01:13 -08:00
Thomas Grainger
340a3fc09c enable universal wheels 
Signed-off-by: Thomas Grainger <tom.grainger@procensus.com>
 2017-01-10 15:01:13 -08:00
Joffrey F
52792b7a96 Update setup.py extra_requires 
Signed-off-by: Joffrey F <joffrey@docker.com>
 2017-01-10 14:59:11 -08:00
Joffrey F
9f6778aa73 Merge pull request #4172 from graingert/enable-universal-wheels 
enable universal wheels
 2017-01-10 14:57:22 -08:00
Jun Guo
cbb730172f Fix 404 issue, change APIError to more accureate ImageNotFound 
Signed-off-by: Jun Guo <blackhumour.gj@gmail.com>
 2017-01-09 16:44:32 -08:00
Joffrey F
545153f117 Merge pull request #4288 from tntC4stl3/fix_404_issue 
Fix 404 issue, change APIError to more accureate ImageNotFound
 2017-01-09 16:43:57 -08:00
Daniel Nephin
91851cd5ae Fix schema typo. 
Signed-off-by: Daniel Nephin <dnephin@docker.com>
 2017-01-09 16:38:42 -08:00
Joffrey F
22b837975d Add support for stop_grace_period in v2 
Signed-off-by: Joffrey F <joffrey@docker.com>
 2017-01-09 16:38:25 -08:00
Joffrey F
de38c023ce Falsy values in COMPOSE_CONVERT_WINDOWS_PATHS are properly recognized 
Signed-off-by: Joffrey F <joffrey@docker.com>
 2017-01-09 16:38:23 -08:00
Joffrey F
344f015a22 Use docker SDK 2.0.1 
Signed-off-by: Joffrey F <joffrey@docker.com>
 2017-01-09 16:38:14 -08:00
Joffrey F
5dabe4ae62 Merge remote-tracking branch 'source/release' into bump-1.10.0-rc2 2017-01-09 16:27:38 -08:00
Joffrey F
3f7b3fbf0a Merge pull request #4304 from shin-/4302-dockerignore-windows 
Use docker SDK patch
 2017-01-09 16:14:57 -08:00