Compare commits

...

30 Commits

Author SHA1 Message Date
aiordache
18f557f920 "Bump 1.27.2"
Signed-off-by: aiordache <anca.iordache@docker.com>
2020-09-10 18:04:13 +02:00
aiordache
c5d32da9ad Merge branch 'master' into 1.27.x 2020-09-10 17:59:55 +02:00
aiordache
509cfb9979 "Bump 1.27.1"
Signed-off-by: aiordache <anca.iordache@docker.com>
2020-09-10 15:22:57 +02:00
aiordache
4d8d0769a4 Merge branch 'master' into 1.27.x 2020-09-10 15:08:45 +02:00
aiordache
980ec85bf4 "Bump 1.27.0"
Signed-off-by: aiordache <anca.iordache@docker.com>
2020-09-07 19:09:24 +02:00
aiordache
ad87891ef8 "Bump 1.27.0-rc4"
Signed-off-by: aiordache <anca.iordache@docker.com>
2020-09-07 16:52:17 +02:00
aiordache
7d2a308b44 Merge branch 'master' into 1.27.x 2020-09-07 16:37:28 +02:00
aiordache
b920010afe "Bump 1.27.0-rc3"
Signed-off-by: aiordache <anca.iordache@docker.com>
2020-09-03 16:16:51 +02:00
aiordache
687ba365cd Merge branch 'master' into 1.27.x 2020-09-03 15:39:08 +02:00
Ulysses Souza
45c6730e64 "Bump 1.27.0-rc2"
Signed-off-by: Ulysses Souza <ulyssessouza@gmail.com>
2020-08-21 19:27:48 +02:00
Ulysses Souza
dcb1d3b781 Fix flake8
Signed-off-by: Ulysses Souza <ulyssessouza@gmail.com>
2020-08-21 19:27:48 +02:00
Ulysses Souza
0f651d71c7 Update API version for docker client
Signed-off-by: Ulysses Souza <ulyssessouza@gmail.com>
2020-08-21 18:32:29 +02:00
Ulysses Souza
b6e84b0f1c Update tests to use the version on docker client
Signed-off-by: Ulysses Souza <ulyssessouza@gmail.com>
2020-08-21 18:32:29 +02:00
aiordache
0dad2367e6 Use docker-py's default api version for engine queries
Bump docker-py version to 4.3.1

Signed-off-by: aiordache <anca.iordache@docker.com>
2020-08-21 18:32:29 +02:00
Ulysses Souza
dfd5ff396a Parse network-mode on CLI build
Signed-off-by: Ulysses Souza <ulyssessouza@gmail.com>
2020-08-21 18:32:29 +02:00
aiordache
3f18d599b4 Update schema and fix memory limit parsing
Signed-off-by: aiordache <anca.iordache@docker.com>
2020-08-21 18:32:29 +02:00
aiordache
ae5e505de0 set scale default to 1 on deploy
Signed-off-by: aiordache <anca.iordache@docker.com>
2020-08-21 18:32:29 +02:00
Ryosuke TOKUAMI
89cf753299 Use docker cli on run when the envvar passed.
Make docker-compose run pass the the cli option
to project.up to build images using docker cli
considering COMPOSE_DOCKER_CLI_BUILD environment
variable.

Signed-off-by: Ryosuke TOKUAMI <mail@pokutuna.com>
2020-08-21 18:32:29 +02:00
aiordache
ea7772d599 "Bump 1.27.0-rc1"
Signed-off-by: aiordache <anca.iordache@docker.com>
2020-08-21 18:32:29 +02:00
aiordache
2963363240 Update jenkins node filter
Signed-off-by: aiordache <anca.iordache@docker.com>
2020-08-21 18:32:29 +02:00
aiordache
8041319bfd Set agent in Release.Jenkinsfile
Signed-off-by: aiordache <anca.iordache@docker.com>
2020-08-21 18:32:29 +02:00
aiordache
824b4943ed Fix tox failures
Signed-off-by: aiordache <anca.iordache@docker.com>
2020-08-21 18:32:29 +02:00
ulyssessouza
35d71511b3 Recover ./script/release/release.py
Signed-off-by: ulyssessouza <ulysses.souza@docker.com>
2020-08-21 18:32:29 +02:00
dependabot-preview[bot]
7d73cb76b3 Bump cffi from 1.14.0 to 1.14.1
Bumps [cffi](https://github.com/python-cffi/release-doc) from 1.14.0 to 1.14.1.
- [Release notes](https://github.com/python-cffi/release-doc/releases)
- [Commits](https://github.com/python-cffi/release-doc/commits)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
2020-08-21 18:32:29 +02:00
dependabot-preview[bot]
796588ec35 Bump urllib3 from 1.25.9 to 1.25.10
Bumps [urllib3](https://github.com/urllib3/urllib3) from 1.25.9 to 1.25.10.
- [Release notes](https://github.com/urllib3/urllib3/releases)
- [Changelog](https://github.com/urllib3/urllib3/blob/master/CHANGES.rst)
- [Commits](https://github.com/urllib3/urllib3/compare/1.25.9...1.25.10)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
2020-08-21 18:32:29 +02:00
dependabot-preview[bot]
d120a6f07b Bump pytest from 5.4.3 to 6.0.1
Bumps [pytest](https://github.com/pytest-dev/pytest) from 5.4.3 to 6.0.1.
- [Release notes](https://github.com/pytest-dev/pytest/releases)
- [Changelog](https://github.com/pytest-dev/pytest/blob/master/CHANGELOG.rst)
- [Commits](https://github.com/pytest-dev/pytest/compare/5.4.3...6.0.1)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
2020-08-21 18:32:29 +02:00
dependabot-preview[bot]
5ddd881dbd Bump cryptography from 2.9.2 to 3.0
Bumps [cryptography](https://github.com/pyca/cryptography) from 2.9.2 to 3.0.
- [Release notes](https://github.com/pyca/cryptography/releases)
- [Changelog](https://github.com/pyca/cryptography/blob/master/CHANGELOG.rst)
- [Commits](https://github.com/pyca/cryptography/compare/2.9.2...3.0)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
2020-08-21 18:32:29 +02:00
dependabot-preview[bot]
22b0f5d20c Bump virtualenv from 20.0.29 to 20.0.30 (#7657)
* Bump virtualenv from 20.0.29 to 20.0.30

Bumps [virtualenv](https://github.com/pypa/virtualenv) from 20.0.29 to 20.0.30.
- [Release notes](https://github.com/pypa/virtualenv/releases)
- [Changelog](https://github.com/pypa/virtualenv/blob/master/docs/changelog.rst)
- [Commits](https://github.com/pypa/virtualenv/compare/20.0.29...20.0.30)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>

* Bump virtualenv version in all files

Signed-off-by: aiordache <anca.iordache@docker.com>

Co-authored-by: dependabot-preview[bot] <27856297+dependabot-preview[bot]@users.noreply.github.com>
Co-authored-by: aiordache <anca.iordache@docker.com>
Co-authored-by: Anca Iordache <aiordache@users.noreply.github.com>
2020-08-21 18:32:29 +02:00
alexrecuenco
f74ff28728 Suggestions by @ulyssessouza
Removed unused versions, (we only support python3.4 onwards)

Signed-off-by: alexrecuenco <alejandrogonzalezrecuenco@gmail.com>
2020-08-21 18:32:29 +02:00
alexrecuenco
1285960d3c Removed Python2 support
Closes: #6890

Some remarks,

- `# coding ... utf-8` statements are not needed
- isdigit on strings instead of a try-catch.
- Default opening mode is read, so we can do `open()` without the `'r'` everywhere
- Removed inheritinng from `object` class, it isn't necessary in python3.
- `super(ClassName, self)` can now be replaced with `super()`
- Use of itertools and `chain` on a couple places dealing with sets.
- Used the operator module instead of lambdas when warranted
    `itemgetter(0)` instead of `lambda x: x[0]`
    `attrgetter('name')` instead of `lambda x: x.name`
- `sorted` returns a list, so no need to use `list(sorted(...))`
- Removed `dict()` using dictionary comprehensions whenever possible
- Attempted to remove python3.2 support

Signed-off-by: alexrecuenco <alejandrogonzalezrecuenco@gmail.com>
2020-08-21 18:32:29 +02:00
4 changed files with 22 additions and 2 deletions

View File

@@ -1,6 +1,26 @@
Change log
==========
1.27.2 (2020-09-10)
-------------------
### Bugs
- Fix bug on `docker-compose run` container attach
1.27.1 (2020-09-10)
-------------------
### Bugs
- Fix `docker-compose run` when `service.scale` is specified
- Allow `driver` property for external networks as temporary workaround for swarm network propagation issue
- Pin new internal schema version to `3.9` as the default
- Preserve the version when configured in the compose file
1.27.0 (2020-09-07)
-------------------

View File

@@ -1 +1 @@
__version__ = '1.28.0dev'
__version__ = '1.27.2'

0
script/release/release.py Normal file → Executable file
View File

View File

@@ -15,7 +15,7 @@
set -e
VERSION="1.26.1"
VERSION="1.27.2"
IMAGE="docker/compose:$VERSION"