tyler.durden/compose
1
0
Fork 0
mirror of https://github.com/docker/compose.git synced 2025-07-29 16:44:20 +02:00
Code Issues Packages Projects Releases Wiki Activity
5,848 Commits 21 Branches 282 Tags
Commit Graph

5848 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
aiordache
687ba365cd Merge branch 'master' into 1.27.x 2020-09-03 15:39:08 +02:00
Anca Iordache
155eb91259
Merge pull request #7720 from aiordache/context_bug 
Pass context to docker cli
 2020-09-01 15:16:24 +02:00
aiordache
134319c735 Pass context to docker cli 
Signed-off-by: aiordache <anca.iordache@docker.com>
 2020-09-01 14:31:18 +02:00
Anca Iordache
b04d4e5897
Merge pull request #7715 from ulyssessouza/add-anca-to-maintainers 
Add Anca to Maintainers
 2020-09-01 10:48:38 +02:00
Anca Iordache
c2be70a108
Merge pull request #7714 from ulyssessouza/fix-stderr-returncode 
Rely on returncode to check for errors instead of stderr content.
 2020-09-01 09:56:39 +02:00
Ulysses Souza
3b17b3c2c0 Fix stderr on returncode is different of 0 
Signed-off-by: Ulysses Souza <ulyssessouza@gmail.com>
 2020-08-31 22:20:26 +02:00
Ulysses Souza
827c68fe6f Fix bump of docker-py on setup.py 
Signed-off-by: Ulysses Souza <ulyssessouza@gmail.com>
 2020-08-31 21:55:56 +02:00
Ulysses Souza
9ee6b17d9c Add Anca to Maintainers 
Signed-off-by: Ulysses Souza <ulyssessouza@gmail.com>
 2020-08-31 21:40:11 +02:00
dependabot-preview[bot]
e9b93d706f Bump attrs from 19.3.0 to 20.1.0 
Bumps [attrs](https://github.com/python-attrs/attrs) from 19.3.0 to 20.1.0.
- [Release notes](https://github.com/python-attrs/attrs/releases)
- [Changelog](https://github.com/python-attrs/attrs/blob/master/CHANGELOG.rst)
- [Commits](https://github.com/python-attrs/attrs/compare/19.3.0...20.1.0)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2020-08-31 10:54:28 +02:00
dependabot-preview[bot]
da0e183052 Bump pytest-cov from 2.10.0 to 2.10.1 
Bumps [pytest-cov](https://github.com/pytest-dev/pytest-cov) from 2.10.0 to 2.10.1.
- [Release notes](https://github.com/pytest-dev/pytest-cov/releases)
- [Changelog](https://github.com/pytest-dev/pytest-cov/blob/master/CHANGELOG.rst)
- [Commits](https://github.com/pytest-dev/pytest-cov/compare/v2.10.0...v2.10.1)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2020-08-31 10:52:54 +02:00
Erfan Gholamian
76963e44ad Added integration test for build error when building with docker cli 
Signed-off-by: Erfan Gholamian <egholamian2@gmail.com>
 2020-08-21 20:52:56 +02:00
Erfan Gholamian
76c92b01d4 Check stderr when building with docker cli. 
Signed-off-by: Erfan Gholamian <egholamian2@gmail.com>
 2020-08-21 20:52:56 +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
dff3ce28f4 Fix flake8 
Signed-off-by: Ulysses Souza <ulyssessouza@gmail.com>
 2020-08-21 19:25:24 +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
Anca Iordache
099be62a9c
Merge pull request #7696 from ulyssessouza/fix-api-version-test 
Update API version for docker client
 2020-08-21 18:13:12 +02:00
Ulysses Souza
c447ff8c2c Update API version for docker client 
Signed-off-by: Ulysses Souza <ulyssessouza@gmail.com>
 2020-08-21 18:11:27 +02:00
Anca Iordache
589179a0e1
Merge pull request #7694 from ulyssessouza/fix-docker-api-version-unit-tests 
Update tests to use the version on docker client
 2020-08-21 17:02:56 +02:00
Ulysses Souza
5bbd670166 Update tests to use the version on docker client 
Signed-off-by: Ulysses Souza <ulyssessouza@gmail.com>
 2020-08-21 16:42:00 +02:00
aiordache
81ce72c952 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 13:25:59 +02:00
Anca Iordache
c3f26bf511
Merge pull request #7689 from ulyssessouza/parse_build_cli_network-mode 
Parse network-mode on CLI build
 2020-08-20 18:29:54 +02:00
Ulysses Souza
6cebde77fb Parse network-mode on CLI build 
Signed-off-by: Ulysses Souza <ulyssessouza@gmail.com>
 2020-08-19 22:32:25 +02:00
Anca Iordache
25d773c924
Merge pull request #7676 from aiordache/fix_deploy_parsing 
Update schema and fix scale parsing
 2020-08-18 14:34:25 +02:00
aiordache
2b4d409ac3 Update schema and fix memory limit parsing 
Signed-off-by: aiordache <anca.iordache@docker.com>
 2020-08-17 20:08:06 +02:00
aiordache
d773719060 set scale default to 1 on deploy 
Signed-off-by: aiordache <anca.iordache@docker.com>
 2020-08-17 11:59:23 +02:00
Ryosuke TOKUAMI
35f1334cbd 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-12 15:42:37 +02:00
aiordache
096d938bac Update jenkins node filter 
Signed-off-by: aiordache <anca.iordache@docker.com>
 2020-08-11 20:50:12 +02:00
aiordache
f3928aac7e Set agent in Release.Jenkinsfile 
Signed-off-by: aiordache <anca.iordache@docker.com>
 2020-08-11 19:25:47 +02:00
aiordache
c90ba119f5 Fix tox failures 
Signed-off-by: aiordache <anca.iordache@docker.com>
 2020-08-11 17:24:37 +02:00
ulyssessouza
7009370bf2 Recover ./script/release/release.py 
Signed-off-by: ulyssessouza <ulysses.souza@docker.com>
 2020-08-11 16:48:23 +02:00
Anca Iordache
c13c5a70cf
Merge pull request #7660 from docker/dependabot/pip/cffi-1.14.1 
Bump cffi from 1.14.0 to 1.14.1
 2020-08-11 15:26:11 +02:00