summaryrefslogtreecommitdiff
path: root/compose/config
Commit message (Collapse)AuthorAge
* Add placement.max_replicas_per_node to conversion mapAnca Iordache2021-04-13
| | | | Signed-off-by: Anca Iordache <anca.iordache@docker.com>
* Merge pull request #8122 from ojab/add_init_containersAnca Iordache2021-04-06
|\ | | | | Add init container support
| * Add init container supportSlava Kardakov2021-02-18
| | | | | | | | | | | | | | | | Fixes #6855 See https://github.com/compose-spec/compose-spec/pull/134 Signed-off-by: Slava Kardakov <ojab@ojab.ru>
* | Add back `storage_opts` as service propertyAnca Iordache2021-03-23
| | | | | | | | Signed-off-by: Anca Iordache <anca.iordache@docker.com>
* | Merge pull request #8178 from mgorny/cached-prop-depAnca Iordache2021-03-18
|\ \ | | | | | | Use built-in functools.cached_property when possible
| * | Use built-in functools.cached_property when possibleMichał Górny2021-03-06
| |/ | | | | | | | | | | | | | | The cached_property decorator is built-in in functools module since Python 3.8. Use the external cached_property package only for older versions of Python. Signed-off-by: Michał Górny <mgorny@gentoo.org>
* | Add `compose.yaml/.yml` to default filenamesAnca Iordache2021-03-16
| | | | | | | | Signed-off-by: Anca Iordache <anca.iordache@docker.com>
* | Make `--env-file` paths relative to current working directoryAnca Iordache2021-03-16
|/ | | | | | | | Look up compose files in project dir as fallback to no compose file in current working directory Update config and env-file tests - get_default_config does not raise error anymore, returns None if no compose file is found Signed-off-by: Anca Iordache <anca.iordache@docker.com>
* Update compose-specUlysses Souza2021-01-19
| | | | Signed-off-by: Ulysses Souza <ulyssessouza@gmail.com>
* Merge pull request #7926 from maaarghk/no_build_cache_from_duplicate_checkAnca Iordache2021-01-11
|\ | | | | Remove duplicate values check for build.cache_from
| * Remove duplicate values check for build.cache_fromMark Gallagher2020-11-13
| | | | | | | | | | | | | | | | | | The `docker` command accepts duplicate values, so there is no benefit to performing this check. Fixes #7342. Signed-off-by: Mark Gallagher <mark@fts.scot>
* | Make COMPOSE_DOCKER_CLI_BUILD=1 the defaultSebastiaan van Stijn2020-12-08
| | | | | | | | | | | | | | | | | | | | | | | | This changes compose to use "native" build through the CLI by default. With this, docker-compose can take advantage of BuildKit (which is now enabled by default on Docker Desktop 2.5 and up). Users that want to use the python client for building can opt-out of this feature by setting COMPOSE_DOCKER_CLI_BUILD=0 Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
* | Merge pull request #7866 from luca-nardelli/improve-mandatory-variables-issuesAnca Iordache2020-12-02
|\ \ | | | | | | Report which variable fails interpolation when they are mandatory
| * | Report which variable fails interpolation when they are mandatoryLuca Nardelli2020-10-15
| | | | | | | | | | | | | | | | | | Add default value before raising UnsetRequiredSubstitution Signed-off-by: Luca Nardelli <luca.nardelli@protonmail.com>
* | | Merge pull request #7946 from aiordache/config_warningAnca Iordache2020-12-02
|\ \ \ | | | | | | | | Bring back warning for configs in non-swarm mode
| * | | Bring back warning for swarm configsaiordache2020-12-02
| | | | | | | | | | | | | | | | Signed-off-by: aiordache <anca.iordache@docker.com>
* | | | Merge pull request #7930 from acran/profilesAnca Iordache2020-12-02
|\ \ \ \ | | | | | | | | | | Implement service profiles
| * | | | Implement service profilesRoman Anasal2020-12-02
| |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Implement profiles as introduced in compose-spec/compose-spec#110 fixes #7919 closes #1896 closes #6742 closes #7539 Signed-off-by: Roman Anasal <roman.anasal@bdsu.de>
* / / / Add devices to config hash to trigger container recreate on changeaiordache2020-12-02
|/ / / | | | | | | | | | | | | | | | | | | * add unit test * update path to compose spec schema in Makefile Signed-off-by: aiordache <anca.iordache@docker.com>
* | / Implement device requests for GPU supportaiordache2020-11-17
| |/ |/| | | | | Signed-off-by: aiordache <anca.iordache@docker.com>
* | Add Makefile including spec download targetUlysses Souza2020-10-27
|/ | | | Signed-off-by: Ulysses Souza <ulyssessouza@gmail.com>
* Remove path check for bind mountsaiordache2020-09-24
| | | | Signed-off-by: aiordache <anca.iordache@docker.com>
* Fix port renderingUlysses Souza2020-09-24
| | | | Signed-off-by: Ulysses Souza <ulyssessouza@gmail.com>
* Allow strings for cpus fieldsaiordache2020-09-16
| | | | Signed-off-by: aiordache <anca.iordache@docker.com>
* fix flake8 complexityaiordache2020-09-16
| | | | Signed-off-by: aiordache <anca.iordache@docker.com>
* Enable relative paths for driver_opts.deviceaiordache2020-09-16
| | | | Signed-off-by: aiordache <anca.iordache@docker.com>
* Fix depends_on serialisation on `docker-compose config`aiordache2020-09-14
| | | | Signed-off-by: aiordache <anca.iordache@docker.com>
* Added merge for max_replicas_per_nodeKevin Clark2020-09-11
| | | | Signed-off-by: Kevin Clark <kclark@edustaff.org>
* Merge pull request #7745 from ulyssessouza/maintain-versionAnca Iordache2020-09-10
|\ | | | | Preserve the version when specified in the file
| * Preserve the version when specified in the fileUlysses Souza2020-09-10
| | | | | | | | Signed-off-by: Ulysses Souza <ulyssessouza@gmail.com>
* | Allow driver property for external networksaiordache2020-09-10
|/ | | | Signed-off-by: aiordache <anca.iordache@docker.com>
* Use docker-py's default api version for engine queriesaiordache2020-08-21
| | | | | | Bump docker-py version to 4.3.1 Signed-off-by: aiordache <anca.iordache@docker.com>
* Update schema and fix memory limit parsingaiordache2020-08-17
| | | | Signed-off-by: aiordache <anca.iordache@docker.com>
* Fix tox failuresaiordache2020-08-11
| | | | Signed-off-by: aiordache <anca.iordache@docker.com>
* Removed Python2 supportalexrecuenco2020-08-11
| | | | | | | | | | | | | | | | | | | | | 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>
* Ignore build context path validation when it is not necessaryVitor Anjos2020-08-10
| | | | Signed-off-by: Vitor Anjos <vitorbartier@hotmail.com>
* Implement service mode for ipcEric Hripko2020-08-07
| | | | Signed-off-by: Eric Hripko <ehripko@bloomberg.net>
* Add ipam.patternProperties to schemaaiordache2020-07-10
| | | | Signed-off-by: aiordache <anca.iordache@docker.com>
* parse deploy.resourcesaiordache2020-07-10
| | | | Signed-off-by: aiordache <anca.iordache@docker.com>
* align schema with compose-specaiordache2020-07-09
| | | | Signed-off-by: aiordache <anca.iordache@docker.com>
* rename schema to compose_specaiordache2020-07-09
| | | | Signed-off-by: aiordache <anca.iordache@docker.com>
* cleanup compatibility and testsaiordache2020-07-08
| | | | Signed-off-by: aiordache <anca.iordache@docker.com>
* Merge 2.x and 3.x schemasaiordache2020-07-08
| | | | Signed-off-by: aiordache <anca.iordache@docker.com>
* Removed sixBastian Venthur2020-06-03
| | | | Signed-off-by: Bastian Venthur <bastian.venthur@flixbus.com>
* Removed Python2 supportBastian Venthur2020-06-03
| | | | | | Closes: #6890 Signed-off-by: Bastian Venthur <bastian.venthur@flixbus.com>
* Simplify code in compose/config/config.pyJoe Hattori2020-04-19
| | | | Signed-off-by: Joe Hattori <joe2ninja21@gmail.com>
* Merge pull request #6937 from apollo13/issue6871Ulysses Souza2020-02-24
|\ | | | | Properly escape values coming from env_files, fixes #6871
| * Pass the interpolation value to python-dotenvUlysses Souza2020-01-29
| | | | | | | | Signed-off-by: Ulysses Souza <ulyssessouza@gmail.com>
| * Properly escape values coming from env_files, fixes #6871Florian Apolloner2020-01-28
| | | | | | | | Signed-off-by: Florian Apolloner <florian@apolloner.eu>
* | add warning when max_replicas_per_node limits scaleAnca Iordache2020-02-10
| | | | | | | | Signed-off-by: Anca Iordache <anca.iordache@docker.com>