tyler.durden/compose
1
0
Fork 0
mirror of https://github.com/docker/compose.git synced 2025-04-08 17:05:13 +02:00
Code Issues Packages Projects Releases Wiki Activity
4,965 Commits 23 Branches 268 Tags
Commit Graph

4965 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Joffrey F
e6d18b1881 Fix --exit-code-from to reflect exit code after termination by Compose 
Signed-off-by: Joffrey F <joffrey@docker.com>
 2018-07-10 15:28:55 -04:00
Joffrey F
8c4fc4bc2e
Merge pull request #6073 from docker/release-tool-improve 
Misc improvements to release script
 2018-07-10 15:04:31 -04:00
Joffrey F
64918235d2
Merge pull request #6072 from docker/6037-external-false 
Avoid overriding external = False in serializer
 2018-07-09 13:55:59 -07:00
Joffrey F
d7f5220292 Improve finalize robustness and allow resume using special --finalize-resume flag 
Signed-off-by: Joffrey F <joffrey@docker.com>
 2018-07-09 16:51:01 -04:00
Joffrey F
0b5f68098c Avoid unrelated file uploads with twine 
Signed-off-by: Joffrey F <joffrey@docker.com>
 2018-07-09 16:25:06 -04:00
Joffrey F
8a7ee5a7d5 Add distclean to remove old build files 
Signed-off-by: Joffrey F <joffrey@docker.com>
 2018-07-09 16:19:17 -04:00
Joffrey F
e9aaece40d s/release.py/release.sh/ 
Signed-off-by: Joffrey F <joffrey@docker.com>
 2018-07-09 15:46:56 -04:00
Joffrey F
9c2ffe6384 Avoid overriding external = False in serializer 
Signed-off-by: Joffrey F <joffrey@docker.com>
 2018-07-09 15:28:32 -04:00
Joffrey F
40631f9a01
Merge pull request #6051 from docker/bump_sdk 
Docker SDK -> 3.4.1
 2018-06-29 13:32:51 -07:00
Joffrey F
e8713d7cef Docker SDK -> 3.4.1 
Signed-off-by: Joffrey F <joffrey@docker.com>
 2018-06-29 13:05:20 -07:00
Joffrey F
7ae632a9ee
Merge pull request #6041 from docker/5929-underscore-projname-2 
Don't create image names starting with - or _
 2018-06-22 16:25:08 -07:00
Joffrey F
b00db08aa9 Prevent attempts to create image names starting with - or _ 
Signed-off-by: Joffrey F <joffrey@docker.com>
 2018-06-22 15:56:53 -07:00
Joffrey F
6e30c130d5
Merge pull request #6035 from docker/fix-api-version-typo 
Fix API version typo
 2018-06-21 14:40:10 -07:00
Joffrey F
a82986943b Fix release script 
Signed-off-by: Joffrey F <joffrey@docker.com>
 2018-06-21 13:48:32 -07:00
Joffrey F
73663e46b9 3.7 --> API v1.38 
Signed-off-by: Joffrey F <joffrey@docker.com>
 2018-06-21 13:47:44 -07:00
Joffrey F
47584a37c9 Fix bintray API client 
Signed-off-by: Joffrey F <joffrey@docker.com>
 2018-06-21 11:49:35 -07:00
Joffrey F
709ba0975d Release script fixes 
Signed-off-by: Joffrey F <joffrey@docker.com>
 2018-06-21 11:40:32 -07:00
Joffrey F
429b1c8b3c
Merge pull request #6017 from docker/6015-utf8-bom 
Better support for UTF8+bom Compose files
 2018-06-18 17:05:56 -07:00
Joffrey F
7f0734ca3c
Merge pull request #6012 from docker/5930-credstore-ldpath 
Use original LD_LIBRARY_PATH when shelling out to credential stores
 2018-06-18 17:05:37 -07:00
Joffrey F
80322cfa5b Better support for UTF8+bom Compose files 
Signed-off-by: Joffrey F <joffrey@docker.com>
 2018-06-18 16:46:37 -07:00
Joffrey F
c187d3c39f Use original LD_LIBRARY_PATH when shelling out to credential stores 
Signed-off-by: Joffrey F <joffrey@docker.com>
 2018-06-18 16:07:55 -07:00
Joffrey F
f0674be578
Merge pull request #6027 from docker/bump_sdk 
Bump Python SDK -> 3.4.0
 2018-06-18 16:06:07 -07:00
Joffrey F
a728ff6a59 Bump Python SDK -> 3.4.0 
Signed-off-by: Joffrey F <joffrey@docker.com>
 2018-06-18 15:31:25 -07:00
Joffrey F
9cb1a07c66
Merge pull request #6025 from vdemeester/init-in-3.7 
Add `init` support in 3.7 schema
 2018-06-18 11:14:54 -07:00
Vincent Demeester
c584ad67fc
Add init support in 3.7 schema 
> Run an init inside the container that forwards signals and reaps
> processes

This is already supported in 2.4 schema

Signed-off-by: Vincent Demeester <vincent@sbr.pm>
 2018-06-18 10:52:57 +02:00
Joffrey F
13d8cf413e
Merge pull request #5995 from vdemeester/x-objects 
Allow `x-*` extension on 3rd level objects
 2018-06-05 09:41:35 -07:00
Vincent Demeester
7a19b7548f
Allow x-* extension on 3rd level objects 
As for top-level key, any 3rd-level key which starts with `x-` will be
ignored by compose. This allows for users to:
* include additional metadata in their compose files
* create YAML anchor objects that can be re-used in other parts of the config

This matches a similar feature in the swagger spec definition:
https://swagger.io/specification/#specificationExtensions

This means a composefile like the following is valid

```
verison: "3.7"
services:
  foo:
    image: foo/bar
    x-foo: bar
network:
  bar:
    x-bar: baz
```

It concerns services, volumes, networks, configs and secrets.

Signed-off-by: Vincent Demeester <vincent@sbr.pm>
 2018-05-31 14:15:10 +02:00
Joffrey F
b9cccf2efc
Merge pull request #5992 from vdemeester/3.7-rollback-config 
Add 3.7 schema and add rollback_config to it
 2018-05-30 12:41:36 -07:00
Vincent Demeester
70574efd5b
Support for rollback config in compose 3.7 
Ignoring it on docker-compose

Signed-off-by: Vincent Demeester <vincent@sbr.pm>
 2018-05-30 13:36:59 +02:00
Vincent Demeester
025fb7f860
Add composefile v3.7 
Signed-off-by: Vincent Demeester <vincent@sbr.pm>
 2018-05-29 11:58:54 +02:00
Joffrey F
706164accd
Merge pull request #5982 from docker/5933-retrieve-legacy-containers 
Allow all Compose commands to retrieve and handle legacy-name containers
 2018-05-24 11:33:43 -07:00
Joffrey F
e245fb04cf Allow all Compose commands to retrieve and handle legacy-name containers 
Signed-off-by: Joffrey F <joffrey@docker.com>
 2018-05-24 11:11:23 -07:00
Joffrey F
cc62764c12
Merge pull request #5968 from albers/completion-fix-running-services 
Fix bash completion for running services
 2018-05-22 15:36:21 -07:00
Harald Albers
7846f6e2a0 Fix bash completion for running services 
Signed-off-by: Harald Albers <github@albersweb.de>
 2018-05-17 15:57:07 +02:00
Joffrey F
c15c79ed2f
Merge pull request #5940 from docker/5929-underscore-projname 
Don't attempt to create resources with name starting with illegal chars
 2018-05-04 16:44:22 -07:00
Joffrey F
263e939125
Merge pull request #5939 from docker/5928-compatibility-attachable 
Ignore attachable property on networks in compatibility mode
 2018-05-04 16:44:00 -07:00
Joffrey F
d5ebc73482 Don't attempt to create resources with name starting with illegal characters 
Signed-off-by: Joffrey F <joffrey@docker.com>
 2018-05-04 16:15:52 -07:00
Joffrey F
f368b4846f Ignore attachable property on networks in compatibility mode 
Signed-off-by: Joffrey F <joffrey@docker.com>
 2018-05-04 15:16:43 -07:00
Joffrey F
1cf1217ecb
Merge pull request #5938 from docker/5931-ignore-default-platform 
Ignore default platform if API version doesn't support platform param
 2018-05-04 15:13:40 -07:00
Joffrey F
c3bb958865 Ignore default platform if API version doesn't support platform param 
Signed-off-by: Joffrey F <joffrey@docker.com>
 2018-05-04 14:51:53 -07:00
Joffrey F
ddcd5c9fe9
Merge pull request #5925 from docker/5923-iprange 
iprange -> ip_range
 2018-05-02 17:49:26 -07:00
Joffrey F
5aafa54667 iprange -> ip_range 
Signed-off-by: Joffrey F <joffrey@docker.com>
 2018-05-01 17:11:14 -07:00
Joffrey F
05638ab5ea Esnure docker-compose binary is executable (fixes #5917) 
Signed-off-by: Joffrey F <joffrey@docker.com>
 2018-04-28 13:42:24 -07:00
Joffrey F
31a4ceeab0
Merge pull request #5916 from docker/autotests_fixes 
Auto release improvements
 2018-04-27 19:16:25 -07:00
Joffrey F
e6aedb1ce0 Partial revert bc034415501 
Signed-off-by: Joffrey F <joffrey@docker.com>
 2018-04-27 18:48:30 -07:00
Joffrey F
5eb3f4b32f Typo fix 
Signed-off-by: Joffrey F <joffrey@docker.com>
 2018-04-27 18:43:05 -07:00
Joffrey F
bc03441550 Automatically detect pickable PRs for patch releases 
Signed-off-by: Joffrey F <joffrey@docker.com>
 2018-04-27 18:36:48 -07:00
Joffrey F
bb44d06f07
Merge pull request #5915 from docker/autotests_fixes 
Improve release automation
 2018-04-27 15:26:28 -07:00
Joffrey F
90c89e34f1 Finalize fixes 
Signed-off-by: Joffrey F <joffrey@docker.com>
 2018-04-27 15:06:36 -07:00
Joffrey F
948ce555da Merge branch 'release' 
Conflicts:
	compose/__init__.py
 2018-04-27 14:50:37 -07:00