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

5095 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Joffrey F
6cb17b90ef 1.23.0dev 
Signed-off-by: Joffrey F <joffrey@docker.com>
 2018-07-18 11:11:34 -07:00
Joffrey F
bb00352c34 Fix up_with_networks test 
Signed-off-by: Joffrey F <joffrey@docker.com>
 2018-07-18 11:09:25 -07:00
Joffrey F
1396cdb4be
Merge pull request #6088 from docker/release 
Resync master with release
 2018-07-18 11:00:56 -07:00
Joffrey F
e20d808ed2
Merge pull request #6087 from docker/bump-1.22.0 
Bump 1.22.0
1.22.0 		2018-07-17 16:01:56 -07:00
Joffrey F
f46880fe9a "Bump 1.22.0" 
Signed-off-by: Joffrey F <joffrey@docker.com>
 2018-07-17 22:48:24 +00:00
Joffrey F
cda827cbfc Improve finalize robustness and allow resume using special --finalize-resume flag 
Signed-off-by: Joffrey F <joffrey@docker.com>
 2018-07-17 22:47:23 +00:00
Joffrey F
8c0411910d Avoid unrelated file uploads with twine 
Signed-off-by: Joffrey F <joffrey@docker.com>
 2018-07-17 22:47:23 +00:00
Joffrey F
d9545a5909 Add distclean to remove old build files 
Signed-off-by: Joffrey F <joffrey@docker.com>
 2018-07-17 22:47:23 +00:00
Joffrey F
cb1b88c4f8 s/release.py/release.sh/ 
Signed-off-by: Joffrey F <joffrey@docker.com>
 2018-07-17 22:47:23 +00:00
Joffrey F
9271f9f46f
Merge pull request #6077 from docker/5966-exitcode-from-sigkill 
Fix --exit-code-from to reflect exit code after termination by Compose
 2018-07-16 20:04:35 -04:00
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
Nicholas Higgins
28085ebee2 Attach logger to containers after crashing. 
Fixes #6060

Signed-off-by: Nicholas Higgins <nickhiggins42@gmail.com>
 2018-07-09 08:47:20 +10:00
Matthieu Nottale
5985d046e3
Merge pull request #6065 from docker/bump-1.22.0-rc2 
Bump 1.22.0-rc2
1.22.0-rc2 		2018-07-05 17:24:31 +02:00
Matthieu Nottale
6817b533a8 "Bump 1.22.0-rc2" 
Signed-off-by: Matthieu Nottale <matthieu.nottale@docker.com>
 2018-07-05 15:10:31 +00:00
Joffrey F
15718810c0 Prevent attempts to create image names starting with - or _ 
Signed-off-by: Joffrey F <joffrey@docker.com>
 2018-07-05 15:07:35 +00:00
Joffrey F
969525c190 Docker SDK -> 3.4.1 
Signed-off-by: Joffrey F <joffrey@docker.com>
 2018-07-05 15:07:34 +00: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
bdd7d47640
Merge pull request #6034 from docker/bump-1.22.0-rc1 
Bump 1.22.0-rc1
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