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

5922 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Anca Iordache
6138071538
Merge pull request #7568 from docker/dependabot/pip/distlib-0.3.1 
Bump distlib from 0.3.0 to 0.3.1
 2020-08-05 18:52:53 +02:00
dependabot-preview[bot]
3affbbcf8e
Bump distlib from 0.3.0 to 0.3.1 
Bumps [distlib](https://bitbucket.org/pypa/distlib) from 0.3.0 to 0.3.1.
- [Changelog](https://bitbucket.org/pypa/distlib/src/master/CHANGES.rst)
- [Commits](https://bitbucket.org/pypa/distlib/branches/compare/0.3.1..0.3.0)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2020-08-05 16:10:00 +00:00
Anca Iordache
bf5bdab499
Merge pull request #7570 from docker/dependabot/pip/idna-2.10 
Bump idna from 2.8 to 2.10
 2020-08-05 18:08:02 +02:00
Anca Iordache
80a378eabf
Merge pull request #7569 from docker/dependabot/pip/requests-2.24.0 
Bump requests from 2.22.0 to 2.24.0
 2020-08-05 17:49:13 +02:00
Anca Iordache
80270273df
Merge pull request #7574 from docker/dependabot/pip/pynacl-1.4.0 
Bump pynacl from 1.3.0 to 1.4.0
 2020-08-05 17:24:56 +02:00
Anca Iordache
bc11709891
Merge pull request #7571 from docker/dependabot/pip/wcwidth-0.2.5 
Bump wcwidth from 0.1.9 to 0.2.5
 2020-08-05 17:08:35 +02:00
dependabot-preview[bot]
e1fbd0cd13 Bump pynacl from 1.3.0 to 1.4.0 
Bumps [pynacl](https://github.com/pyca/pynacl) from 1.3.0 to 1.4.0.
- [Release notes](https://github.com/pyca/pynacl/releases)
- [Changelog](https://github.com/pyca/pynacl/blob/master/CHANGELOG.rst)
- [Commits](https://github.com/pyca/pynacl/compare/1.3.0...1.4.0)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2020-08-05 17:07:28 +02:00
dependabot-preview[bot]
a9c191d752
Bump wcwidth from 0.1.9 to 0.2.5 
Bumps [wcwidth](https://github.com/jquast/wcwidth) from 0.1.9 to 0.2.5.
- [Release notes](https://github.com/jquast/wcwidth/releases)
- [Commits](https://github.com/jquast/wcwidth/compare/0.1.9...0.2.5)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2020-08-05 14:50:23 +00:00
Anca Iordache
f935791a02
Merge pull request #7644 from docker/dependabot/pip/tox-3.18.1 
Bump tox from 2.9.1 to 3.18.1
 2020-08-05 16:48:51 +02:00
aiordache
836fc56901 Bump tox version to 3.18.1 in dockerfile 
Signed-off-by: aiordache <anca.iordache@docker.com>
 2020-08-05 15:45:56 +02:00
dependabot-preview[bot]
b4e378934d Bump tox from 2.9.1 to 3.18.1 
Bumps [tox](https://github.com/tox-dev/tox) from 2.9.1 to 3.18.1.
- [Release notes](https://github.com/tox-dev/tox/releases)
- [Changelog](https://github.com/tox-dev/tox/blob/master/docs/changelog.rst)
- [Commits](https://github.com/tox-dev/tox/compare/2.9.1...3.18.1)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2020-08-05 15:44:48 +02:00
Anca Iordache
d4fc35af94
Merge pull request #7643 from docker/dependabot/pip/virtualenv-20.0.29 
Bump virtualenv from 16.2.0 to 20.0.29
 2020-08-05 15:19:48 +02:00
Anca Iordache
933e5a860a
Merge pull request #7603 from docker/dependabot/pip/gitpython-3.1.7 
Bump gitpython from 2.1.15 to 3.1.7
 2020-08-05 14:28:12 +02:00
dependabot-preview[bot]
ef2f0ce5ab
Bump gitpython from 2.1.15 to 3.1.7 
Bumps [gitpython](https://github.com/gitpython-developers/GitPython) from 2.1.15 to 3.1.7.
- [Release notes](https://github.com/gitpython-developers/GitPython/releases)
- [Changelog](https://github.com/gitpython-developers/GitPython/blob/master/CHANGES)
- [Commits](https://github.com/gitpython-developers/GitPython/compare/2.1.15...3.1.7)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2020-08-05 08:53:35 +00:00
Anca Iordache
acb50d9f78
Merge pull request #7633 from docker/dependabot/pip/coverage-5.2.1 
Bump coverage from 5.1 to 5.2.1
 2020-08-05 10:52:00 +02:00
aiordache
5a47b692c1 Bump virtualenv version to 20.0.29 
Signed-off-by: aiordache <anca.iordache@docker.com>
 2020-08-05 10:49:40 +02:00
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
dependabot-preview[bot]
aec2f5acba
Bump virtualenv from 16.2.0 to 20.0.29 
Bumps [virtualenv](https://github.com/pypa/virtualenv) from 16.2.0 to 20.0.29.
- [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/16.2.0...20.0.29)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2020-08-03 21:26:09 +00: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
dependabot-preview[bot]
c145103385
Bump coverage from 5.1 to 5.2.1 
Bumps [coverage](https://github.com/nedbat/coveragepy) from 5.1 to 5.2.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.1...coverage-5.2.1)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2020-07-27 21:22:57 +00: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]
5fb1b139ca
Bump requests from 2.22.0 to 2.24.0 
Bumps [requests](https://github.com/psf/requests) from 2.22.0 to 2.24.0.
- [Release notes](https://github.com/psf/requests/releases)
- [Changelog](https://github.com/psf/requests/blob/master/HISTORY.md)
- [Commits](https://github.com/psf/requests/compare/v2.22.0...v2.24.0)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2020-07-07 09:26:45 +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]
ef565ce7a7
Bump idna from 2.8 to 2.10 
Bumps [idna](https://github.com/kjd/idna) from 2.8 to 2.10.
- [Release notes](https://github.com/kjd/idna/releases)
- [Changelog](https://github.com/kjd/idna/blob/master/HISTORY.rst)
- [Commits](https://github.com/kjd/idna/compare/v2.8...v2.10)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2020-06-29 21:24:11 +00: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