tyler.durden
/
compose
mirror of https://github.com/docker/compose.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity
5,168 Commits 25 Branches 262 Tags 66 MiB
Commit Graph

5168 Commits

Author SHA1 Message Date
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 bdd7d47640
Merge pull request #6034 from docker/bump-1.22.0-rc1 
Bump 1.22.0-rc1
 2018-06-21 14:30:26 -07:00
Joffrey F e7de1bc3c9 3.7 --> API v1.38 
Signed-off-by: Joffrey F <joffrey@docker.com>
 2018-06-21 20:51:50 +00: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 1fb5039585 Bump 1.22.0-rc1 
Signed-off-by: Joffrey F <joffrey@docker.com>
 2018-06-21 13:28:13 -07:00
Joffrey F e8af19daa3 Fix release script 
Signed-off-by: Joffrey F <joffrey@docker.com>
 2018-06-21 13:28:13 -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 156ce2bc1d Merge remote-tracking branch 'origin/release' into bump-1.22.0-rc1 2018-06-21 18:47:21 +00: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 0898c783ad
Merge pull request #5926 from docker/bump-1.21.2 
Bump 1.21.2
 2018-05-02 16:04:55 -07:00
Joffrey F a133471152 Fix appveyor build 
Signed-off-by: Joffrey F <joffrey@docker.com>
 2018-05-02 11:19:42 -07:00
Joffrey F f336694912 "Bump 1.21.2" 
Signed-off-by: Joffrey F <joffrey@docker.com>
 2018-05-01 17:37:27 -07:00
Joffrey F 7db742d3f2 Esnure docker-compose binary is executable (fixes #5917) 
Signed-off-by: Joffrey F <joffrey@docker.com>
 2018-05-01 17:37:14 -07:00
Joffrey F 064471e640 iprange -> ip_range 
Signed-off-by: Joffrey F <joffrey@docker.com>
 2018-05-02 00:28:45 +00:00
Joffrey F f05f1699c4 Partial revert bc03441550 
Signed-off-by: Joffrey F <joffrey@docker.com>
 2018-05-02 00:28:44 +00:00
Joffrey F d8b4b94585 Typo fix 
Signed-off-by: Joffrey F <joffrey@docker.com>
 2018-05-02 00:28:44 +00:00
Joffrey F d3ca20074d Automatically detect pickable PRs for patch releases 
Signed-off-by: Joffrey F <joffrey@docker.com>
 2018-05-02 00:28:44 +00:00
Joffrey F 7b4603dc22 Finalize fixes 
Signed-off-by: Joffrey F <joffrey@docker.com>
 2018-05-02 00:28:43 +00:00
Joffrey F 507376549c Improve release automation 
Signed-off-by: Joffrey F <joffrey@docker.com>
 2018-05-02 00:28:43 +00: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 bc03441550 
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