5752 Commits

Author SHA1 Message Date
Anca Iordache
06adc740d5
Merge pull request #7573 from docker/dependabot/pip/py-1.9.0
Bump py from 1.8.2 to 1.9.0
2020-08-05 10:27:50 +02:00
Anca Iordache
debcdde27d
Merge pull request #7543 from jarulsamy/7540-flag_nullifier
Add `--` as a separator of flags and arguments.
2020-08-04 14:28:14 +02:00
Anca Iordache
05a5aae552
Merge pull request #7425 from kaspanet/master
Add 'local' to list of logging drivers that support `docker-compose logs`
2020-08-03 15:30:17 +02:00
Anca Iordache
a2095a2a0c
Merge pull request #7510 from hartwork/issue-7501-stop-using-deprecated-assertequal
tests: Stop using deprecated assertEquals (fixes #7501)
2020-08-03 15:29:39 +02:00
Anca Iordache
96d15acca6
Merge pull request #7607 from smola/run-in-docker-macos
avoid using realpath in scripts
2020-08-03 11:57:44 +02:00
Anca Iordache
52d2fcc274
Merge pull request #7588 from aiordache/rm_version
Merge V2 - V3 compose file formats (optional version field)
2020-07-27 11:11:34 +02:00
Santiago M. Mola
6311511117 avoid using realpath in scripts
scripts/run uses realpath when COMPOSE_FILE is set. realpath is not available in
some systems (e.g. macOS), and readlink -f isn't either. Replaced with a more
portable approach.

Signed-off-by: Santiago M. Mola <santi@mola.io>
2020-07-15 18:44:00 +02:00
aiordache
6cf72381f9 error out on both scale and deploy.replicas being set
Signed-off-by: aiordache <anca.iordache@docker.com>
2020-07-10 18:54:02 +02:00
aiordache
faedc4aa9e Add ipam.patternProperties to schema
Signed-off-by: aiordache <anca.iordache@docker.com>
2020-07-10 13:31:12 +02:00
aiordache
945faab54d parse deploy.resources
Signed-off-by: aiordache <anca.iordache@docker.com>
2020-07-10 11:39:39 +02:00
aiordache
4823260310 align schema with compose-spec
Signed-off-by: aiordache <anca.iordache@docker.com>
2020-07-09 23:40:15 +02:00
aiordache
cb56036a6e rename schema to compose_spec
Signed-off-by: aiordache <anca.iordache@docker.com>
2020-07-09 15:52:46 +02:00
aiordache
c06b30548d cleanup compatibility and tests
Signed-off-by: aiordache <anca.iordache@docker.com>
2020-07-08 19:07:38 +02:00
aiordache
b78c1ec193 Merge 2.x and 3.x schemas
Signed-off-by: aiordache <anca.iordache@docker.com>
2020-07-08 12:31:39 +02:00
dependabot-preview[bot]
64299dd467
Bump py from 1.8.2 to 1.9.0
Bumps [py](https://github.com/pytest-dev/py) from 1.8.2 to 1.9.0.
- [Release notes](https://github.com/pytest-dev/py/releases)
- [Changelog](https://github.com/pytest-dev/py/blob/master/CHANGELOG.rst)
- [Commits](https://github.com/pytest-dev/py/compare/1.8.2...1.9.0)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
2020-07-07 09:26:47 +00:00
dependabot-preview[bot]
789bfb0e8b Bump python-dotenv from 0.13.0 to 0.14.0
Bumps [python-dotenv](https://github.com/theskumar/python-dotenv) from 0.13.0 to 0.14.0.
- [Release notes](https://github.com/theskumar/python-dotenv/releases)
- [Changelog](https://github.com/theskumar/python-dotenv/blob/master/CHANGELOG.md)
- [Commits](https://github.com/theskumar/python-dotenv/compare/v0.13.0...v0.14.0)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
2020-07-07 11:25:27 +02:00
Santiago M. Mola
0ea51906cd pass COMPOSE_PROJECT_NAME env var in container mode
Avoids the surprise of finding the project name set to the directory
name when COMPOSE_PROJECT_NAME is being used.

Signed-off-by: Santiago M. Mola <santi@mola.io>
2020-07-07 09:06:02 +02:00
Ben Firshman
c17ef995b4 Improve version help message
Signed-off-by: Ben Firshman <ben@firshman.co.uk>
2020-07-06 11:10:31 +02:00
Ulysses Souza
a383cae615 Enforce pip3 and python3 on Release Jenkins
Signed-off-by: Ulysses Souza <ulyssessouza@gmail.com>
2020-07-02 18:06:08 +02:00
Ulysses Souza
6824abf2df
Merge pull request #7581 from ulyssessouza/fix-ci-labels
Apply more specific filtering CI machines
2020-07-02 15:29:46 +02:00
Ulysses Souza
deaa3d68c3 Apply more specific filtering CI machines
Signed-off-by: Ulysses Souza <ulyssessouza@gmail.com>
2020-07-02 15:09:52 +02:00
Ulysses Souza
ea6c7cb5f4
Merge pull request #7580 from thaJeztah/forward_port_changelog
[master] forward-port "Bump 1.26.1"
2020-07-02 13:34:56 +02:00
Ulysses Souza
6862d774be
Merge pull request #7579 from thaJeztah/fix_docker_py_dep
setyp.py: fix minimum docker-py requirement to 4.2.2
2020-07-02 13:34:23 +02:00
Ulysses Souza
7728bf6c8b
[master] forward-port "Bump 1.26.1"
Signed-off-by: Ulysses Souza <ulyssessouza@gmail.com>
(cherry picked from commit f216ddbf05c131058cb11323023f8b43cd381926)
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2020-07-02 12:57:46 +02:00
Sebastiaan van Stijn
a559d50db8
setyp.py: fix minimum docker-py requirement to 4.2.2
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2020-07-02 12:50:15 +02:00
Ulysses Souza
15c1cabdad
Merge pull request #7563 from aiordache/validate_context_endpoint
Error out when context target is not a docker engine
2020-06-30 18:46:57 +02:00
aiordache
9c376dbe2f check context in use targets a docker engine
Signed-off-by: aiordache <anca.iordache@docker.com>
2020-06-30 18:27:47 +02:00
dependabot-preview[bot]
d8c996a65e Bump pyyaml from 5.3 to 5.3.1
Bumps [pyyaml](https://github.com/yaml/pyyaml) from 5.3 to 5.3.1.
- [Release notes](https://github.com/yaml/pyyaml/releases)
- [Changelog](https://github.com/yaml/pyyaml/blob/master/CHANGES)
- [Commits](https://github.com/yaml/pyyaml/compare/5.3...5.3.1)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
2020-06-23 04:38:19 +02:00
dependabot-preview[bot]
500a322125 Bump coverage from 5.0.3 to 5.1
Bumps [coverage](https://github.com/nedbat/coveragepy) from 5.0.3 to 5.1.
- [Release notes](https://github.com/nedbat/coveragepy/releases)
- [Changelog](https://github.com/nedbat/coveragepy/blob/master/CHANGES.rst)
- [Commits](https://github.com/nedbat/coveragepy/compare/coverage-5.0.3...coverage-5.1)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
2020-06-23 04:37:58 +02:00
dependabot-preview[bot]
af2d336c95 Bump py from 1.8.1 to 1.8.2
Bumps [py](https://github.com/pytest-dev/py) from 1.8.1 to 1.8.2.
- [Release notes](https://github.com/pytest-dev/py/releases)
- [Changelog](https://github.com/pytest-dev/py/blob/master/CHANGELOG)
- [Commits](https://github.com/pytest-dev/py/compare/1.8.1...1.8.2)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
2020-06-23 04:37:35 +02:00
dependabot-preview[bot]
92501a1076 Bump pytest-cov from 2.8.1 to 2.10.0
Bumps [pytest-cov](https://github.com/pytest-dev/pytest-cov) from 2.8.1 to 2.10.0.
- [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.8.1...v2.10.0)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
2020-06-23 04:37:20 +02:00
dependabot-preview[bot]
b1250a541a Bump more-itertools from 8.3.0 to 8.4.0
Bumps [more-itertools](https://github.com/more-itertools/more-itertools) from 8.3.0 to 8.4.0.
- [Release notes](https://github.com/more-itertools/more-itertools/releases)
- [Commits](https://github.com/more-itertools/more-itertools/compare/v8.3.0...v8.4.0)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
2020-06-23 01:47:05 +02:00
dependabot-preview[bot]
23f05e67b0 Bump gitdb2 from 2.0.6 to 4.0.2
Bumps [gitdb2](https://github.com/gitpython-developers/gitdb) from 2.0.6 to 4.0.2.
- [Release notes](https://github.com/gitpython-developers/gitdb/releases)
- [Commits](https://github.com/gitpython-developers/gitdb/compare/2.0.6...4.0.2)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
2020-06-23 00:33:29 +02:00
dependabot-preview[bot]
caee9fc136 Bump pytest from 5.4.2 to 5.4.3
Bumps [pytest](https://github.com/pytest-dev/pytest) from 5.4.2 to 5.4.3.
- [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.2...5.4.3)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
2020-06-23 00:33:08 +02:00
dependabot-preview[bot]
71de72d259 Bump pyflakes from 2.1.1 to 2.2.0
Bumps [pyflakes](https://github.com/PyCQA/pyflakes) from 2.1.1 to 2.2.0.
- [Release notes](https://github.com/PyCQA/pyflakes/releases)
- [Changelog](https://github.com/PyCQA/pyflakes/blob/master/NEWS.rst)
- [Commits](https://github.com/PyCQA/pyflakes/compare/2.1.1...2.2.0)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
2020-06-23 00:32:59 +02:00
dependabot-preview[bot]
7665715800 Bump pycodestyle from 2.5.0 to 2.6.0
Bumps [pycodestyle](https://github.com/PyCQA/pycodestyle) from 2.5.0 to 2.6.0.
- [Release notes](https://github.com/PyCQA/pycodestyle/releases)
- [Changelog](https://github.com/PyCQA/pycodestyle/blob/master/CHANGES.txt)
- [Commits](https://github.com/PyCQA/pycodestyle/compare/2.5.0...2.6.0)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
2020-06-23 00:32:35 +02:00
dependabot-preview[bot]
de7f864008 Bump certifi from 2020.4.5.1 to 2020.6.20
Bumps [certifi](https://github.com/certifi/python-certifi) from 2020.4.5.1 to 2020.6.20.
- [Release notes](https://github.com/certifi/python-certifi/releases)
- [Commits](https://github.com/certifi/python-certifi/compare/2020.04.05.1...2020.06.20)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
2020-06-23 00:31:28 +02:00
Ulysses Souza
62144b4f95 Remove the empty file
Signed-off-by: Ulysses Souza <ulyssessouza@gmail.com>
2020-06-23 00:31:05 +02:00
Ulysses Souza
278ec711d3
Merge pull request #7522 from docker/dependabot/pip/flake8-3.8.3
Bump flake8 from 3.8.1 to 3.8.3
2020-06-22 10:26:40 +02:00
Joshua Arulsamy
d0f9fa84ad Add tests for -- seperator of flags and args.
Signed-off-by: Joshua Arulsamy <joshua.gf.arul@gmail.com>
2020-06-17 23:14:39 -06:00
Joshua Arulsamy
717085c8c2 Add -- as a seperator of flags and arguments.
`--` is common practice to clearly say where the
flags stop and and arguments start.

Fixes #7540

Signed-off-by: Joshua Arulsamy <joshua.gf.arul@gmail.com>
2020-06-17 23:14:09 -06:00
Ulysses Souza
854c14a5bc
Merge pull request #7031 from venthur/remove_python2
Removed Python2 support
2020-06-10 17:03:19 +02:00
Sebastian Pipping
59d03b1d5e tests: Stop using deprecated assertEquals (fixes #7501)
Signed-off-by: Sebastian Pipping <sebastian@pipping.org>
2020-06-09 19:59:36 +02:00
Ulysses Souza
2caf573b89
Merge pull request #7506 from ulyssessouza/indirect-dependencies
Pin all indirect dependencies
2020-06-09 11:00:26 +02:00
dependabot-preview[bot]
2657601a88
Bump flake8 from 3.8.1 to 3.8.3
Bumps [flake8](https://gitlab.com/pycqa/flake8) from 3.8.1 to 3.8.3.
- [Release notes](https://gitlab.com/pycqa/flake8/tags)
- [Commits](https://gitlab.com/pycqa/flake8/compare/3.8.1...3.8.3)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
2020-06-08 21:24:27 +00:00
Ulysses Souza
234f8d6ca3
Merge pull request #7509 from ulyssessouza/enforce-docker-421
Enforce docker>=4.2.1 on pip install
2020-06-08 17:52:19 +02:00
Ulysses Souza
312344f088 Enforce docker>=4.2.1 on pip install
Signed-off-by: Ulysses Souza <ulyssessouza@gmail.com>
2020-06-08 17:28:42 +02:00
Ulysses Souza
e365a920e6
Merge pull request #7519 from ulyssessouza/xfail-blkio
Expect failure of `test_create_container_with_blkio_config`
2020-06-08 17:24:57 +02:00
Ulysses Souza
7b84b66b0b Expect failure of test_create_container_with_blkio_config
On Linux kernel >= 5.3.x at least the daemon prints 2 warnings:
"Your kernel does not support cgroup blkio weight"
"Your kernel does not support cgroup blkio weight_device"

Signed-off-by: Ulysses Souza <ulyssessouza@gmail.com>
2020-06-08 16:41:59 +02:00
Ulysses Souza
9f734f7c53 Pin all indirect dependencies
Signed-off-by: Ulysses Souza <ulyssessouza@gmail.com>
2020-06-04 13:43:27 +02:00