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,942 Commits 23 Branches 268 Tags
Commit Graph

4942 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
Joffrey F
456ff4be0f
Merge pull request #5914 from docker/bump-1.21.1 
Bump 1.21.1
1.21.1 		2018-04-27 14:09:04 -07:00
Joffrey F
d469113b37 Improve release automation 
Signed-off-by: Joffrey F <joffrey@docker.com>
 2018-04-27 12:24:43 -07:00
Harald Albers
5a3f1a3cca Refactor bash completion for services 
Signed-off-by: Harald Albers <github@albersweb.de>
 2018-04-27 19:07:15 +00:00
Harald Albers
7db13582f1 Add support for features added in 1.21.0 to bash completion 
- add support for `docker-compose exec --workdir|-w`
- add support for `docker-compose build --compress`
- add support for `docker-compose pull --no-parallel`, drop deprecated
  option `--parallel`

Signed-off-by: Harald Albers <github@albersweb.de>
 2018-04-27 19:07:14 +00:00
Joffrey F
fe20526d05 Remove obsolete release scripts 
Signed-off-by: Joffrey F <joffrey@docker.com>
 2018-04-27 19:07:13 +00:00
Joffrey F
7503a2eddd Document new release process 
Signed-off-by: Joffrey F <joffrey@docker.com>
 2018-04-27 19:07:12 +00:00
Joffrey F
a50c056d7c Uncomment deploy steps 
Signed-off-by: Joffrey F <joffrey@docker.com>
 2018-04-27 19:07:12 +00:00
Joffrey F
4faf7c19b6 Containerize release tool 
Signed-off-by: Joffrey F <joffrey@docker.com>
 2018-04-27 19:07:12 +00:00
Joffrey F
28f7f79fea Improve monitor function 
Signed-off-by: Joffrey F <joffrey@docker.com>
 2018-04-27 19:07:12 +00:00
Joffrey F
87b8eaa27c Cleanup 
Signed-off-by: Joffrey F <joffrey@docker.com>
 2018-04-27 19:07:12 +00:00
Joffrey F
b68811fd7f Add support for PR cherry picks 
Signed-off-by: Joffrey F <joffrey@docker.com>
 2018-04-27 19:07:12 +00:00
Joffrey F
4fab78d7e0 Default base is master 
Signed-off-by: Joffrey F <joffrey@docker.com>
 2018-04-27 19:07:12 +00:00
Joffrey F
0621739a86 Early check for non-draft release in resume 
Signed-off-by: Joffrey F <joffrey@docker.com>
 2018-04-27 19:07:12 +00:00
Joffrey F
f248dbe280 Avoid accidental prod push 
Signed-off-by: Joffrey F <joffrey@docker.com>
 2018-04-27 19:07:12 +00:00
Joffrey F
05afd5a2db Add finalize step 
Signed-off-by: Joffrey F <joffrey@docker.com>
 2018-04-27 19:07:12 +00:00
Joffrey F
fbbac04fb7 Add images build step and finalize placeholder 
Signed-off-by: Joffrey F <joffrey@docker.com>
 2018-04-27 19:07:12 +00:00
Joffrey F
f083ef3d17 Added logging for asset removal 
Signed-off-by: Joffrey F <joffrey@docker.com>
 2018-04-27 19:07:12 +00:00
Joffrey F
0f4dbba0ec Temp test 
Signed-off-by: Joffrey F <joffrey@docker.com>
 2018-04-27 19:07:12 +00:00
Joffrey F
e4c5b2a248 Implement resuming a release 
Signed-off-by: Joffrey F <joffrey@docker.com>
 2018-04-27 19:07:12 +00:00
Joffrey F
4691515420 Inital pass on comprehensive automated release script 
Signed-off-by: Joffrey F <joffrey@docker.com>
 2018-04-27 19:07:12 +00:00
Joffrey F
192a665569 "Bump 1.21.1" 
Signed-off-by: Joffrey F <joffrey@docker.com>
 2018-04-27 19:03:45 +00:00
Joffrey F
b1a1c6a234 Prevent duplicate binds in generated container config 
Signed-off-by: Joffrey F <joffrey@docker.com>
 2018-04-27 18:48:15 +00:00
Joffrey F
41417aa379 Bump SDK version to latest 
Signed-off-by: Joffrey F <joffrey@docker.com>
 2018-04-27 18:48:13 +00:00