tyler.durden/compose
1
0
Fork 0
mirror of https://github.com/docker/compose.git synced 2025-07-21 12:44:54 +02:00
Code Issues Packages Projects Releases Wiki Activity
6,035 Commits 21 Branches 280 Tags
Commit Graph

6035 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Anca Iordache
f2ec6a2176
Merge pull request #8070 from aiordache/Jenkins_cgroup1_label 
Add `cgroup1` label to Release.Jenkinsfile
 2021-01-25 19:11:50 +01:00
aiordache
7f7f1607de Add cgroup1 label to Release.Jenkinsfile 
Signed-off-by: aiordache <anca.iordache@docker.com>
 2021-01-25 19:00:39 +01:00
Anca Iordache
4990a7f935
Merge pull request #8067 from albers/completion-no-log-prefix 
Add bash completion for `docker-compose logs|up --no-log-prefix`, fix formatting of help message
 2021-01-25 15:06:34 +01:00
Anca Iordache
72f8551466
Merge pull request #8058 from docker/py-37-revert 
Revert to Python 3.7 bump for Linux static builds
 2021-01-25 14:34:42 +01:00
Harald Albers
487779960c Fix formatting of help output for up|logs --no-log-prefix 
Signed-off-by: Harald Albers <github@albersweb.de>
 2021-01-24 22:19:37 +00:00
Harald Albers
99b6776fd2 Add bash completion for logs|up --no-log-prefix 
This adds bash completion for https://github.com/docker/compose/pull/7435

Signed-off-by: Harald Albers <github@albersweb.de>
 2021-01-24 22:18:36 +00:00
Harald Albers
4e382b9c28 Add bash completion for --profile 
Signed-off-by: Harald Albers <github@albersweb.de>
 2021-01-22 19:24:15 +00:00
Harald Albers
862107a32a Add option for listing service profiles 
For command completion of `docker-compose --profile`, we need a portable
way to get a list of profiles used in the current config.

This commit adds a new option `docker-compose config --profiles`.

Signed-off-by: Harald Albers <github@albersweb.de>
 2021-01-22 19:24:15 +00:00
Chris Crone
6a3af5b707 build.linux: Revert to Python 3.7 
This allows us to revert from Debian Buster to Stretch which allows
us to relax the glibc version requirements.

Signed-off-by: Chris Crone <christopher.crone@docker.com>
 2021-01-22 11:35:37 +01:00
aiordache
205d520805 Post-release 1.28.0: update changelog and version 
Signed-off-by: aiordache <anca.iordache@docker.com>
 2021-01-20 11:30:25 +01:00
Anca Iordache
8f2bb66e73
Merge pull request #8043 from docker/update-compose-spec 
Update compose-spec
 2021-01-19 19:00:43 +01:00
Ulysses Souza
af4eaae006 Update compose-spec 
Signed-off-by: Ulysses Souza <ulyssessouza@gmail.com>
 2021-01-19 14:57:59 -03:00
Anca Iordache
1c547b270e Merge pull request #8042 from docker/fix-docker-version 
Remove restriction on docker version
 2021-01-19 18:37:22 +01:00
Ulysses Souza
1c499bb2eb Remove restriction on docker version 
Signed-off-by: Ulysses Souza <ulyssessouza@gmail.com>
 2021-01-19 14:33:16 -03:00
Mike Seplowitz
4fa72a066a
Improve control over ANSI output (#6858) 
* Move global console_handler into function scope

Signed-off-by: Mike Seplowitz <mseplowitz@bloomberg.net>

* Improve control over ANSI output

- Disabled parallel logger ANSI output if not attached to a tty.
  The console handler and progress stream already checked whether the
  output stream is a tty, but ParallelStreamWriter did not.

- Added --ansi=(never|always|auto) option to allow clearer control over
  ANSI output. Since --no-ansi is the same as --ansi=never, --no-ansi is
  now deprecated.

Signed-off-by: Mike Seplowitz <mseplowitz@bloomberg.net>
 2021-01-19 18:17:55 +01:00
Anca Iordache
b9249168bd
Merge pull request #7926 from maaarghk/no_build_cache_from_duplicate_check 
Remove duplicate values check for build.cache_from
 2021-01-11 18:33:16 +01:00
Anca Iordache
e36ac32120
Merge pull request #7978 from thaJeztah/default_to_cli_build 
Make COMPOSE_DOCKER_CLI_BUILD=1 the default
 2021-01-11 18:29:42 +01:00
Guillaume Tardif
5be6bde76c
Merge pull request #7989 from docker/add-metrics 
Add metrics capturing
 2021-01-06 09:38:52 +01:00
guillaume.tardif
c380604a9e Support windows npipe, set content type & corrrect URL /usage. Also fixed socket name for desktop mac 
Signed-off-by: guillaume.tardif <guillaume.tardif@gmail.com>
 2021-01-05 15:45:10 +01:00
Ulysses Souza
369eb3220a Add metrics 
Signed-off-by: Ulysses Souza <ulyssessouza@gmail.com>
 2021-01-04 15:16:51 -03:00
Ulysses Souza
2e273c5029
Merge pull request #8005 from asterite3/up-only-attach-foreground-services 
Only attach services we're going to read logs from in "up"
 2021-01-04 13:44:12 +00:00
Anca Iordache
21e196f20a
Merge pull request #8009 from ulyssessouza/fix-windows-popen 
Avoid setting unsuported parameter for subprocess.Popen on Windows
 2021-01-04 09:55:53 +01:00
Ulysses Souza
b9d86f4b51 Avoid setting unsuported parameter for subprocess.Popen on Windows 
Signed-off-by: Ulysses Souza <ulyssessouza@gmail.com>
 2020-12-22 17:52:24 -03:00
Daniil Sigalov
1b5278f977 Only attach services we'll read logs from in up 
When 'up' is run with explicit list of services, compose will
start them together with their dependencies. It will attach to all
started services, but won't read output from dependencies (their
logs are not printed by 'up') - so the receive buffer of
dependencies will fill and at some point will start blocking those
services. Fix that by only attaching to services given in the
list.
To do that, move logic of choosing which services to attach from
cli/main.py to utils.py and use it from project.py to decide if
service should be attached.

Fixes #6018

Signed-off-by: Daniil Sigalov <asterite@seclab.cs.msu.ru>
 2020-12-20 15:58:58 +03:00
Sebastiaan van Stijn
affb0d504d
Make COMPOSE_DOCKER_CLI_BUILD=1 the default 
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>
 2020-12-08 12:26:41 +01:00
Anca Iordache
8034bc3bd6
Merge pull request #7977 from docker/bumps-virtenv-gitpython 
Bump virtualenv from 20.0.30 to 20.2.2 and gitpython to 3.1.11
 2020-12-07 19:59:16 +01:00
dependabot-preview[bot]
89fcfc5499 Bump virtualenv from 20.0.30 to 20.2.2 
Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
(cherry picked from commit 8785279ffd40d04cae409a1d3a94aebd94f2e199)
Signed-off-by: Ulysses Souza <ulyssessouza@gmail.com>
 2020-12-07 15:57:24 -03:00
Anca Iordache
40a4ec1624
Merge pull request #7679 from docker/dependabot/pip/bcrypt-3.2.0 
Bump bcrypt from 3.1.7 to 3.2.0
 2020-12-07 19:18:30 +01:00
Anca Iordache
6c55ef6a5d
Revert "Bump virtualenv from 20.0.30 to 20.2.1" (#7975) 
This reverts commit 8785279ffd40d04cae409a1d3a94aebd94f2e199.

Signed-off-by: aiordache <anca.iordache@docker.com>
 2020-12-04 17:32:14 +01:00
Anca Iordache
3f46dc1d76
Revert "Bump gitpython from 3.1.7 to 3.1.11" (#7974) 
Signed-off-by: aiordache <anca.iordache@docker.com>
 2020-12-04 17:22:31 +01:00
Anca Iordache
f2bc89a876
Merge pull request #7971 from aiordache/update_docker_setup 
Bump docker-py in setup.py
 2020-12-03 19:23:30 +01:00
aiordache
fee4756e33 Bump docker-py in setup.py 
Signed-off-by: aiordache <anca.iordache@docker.com>
 2020-12-03 19:00:39 +01:00
Anca Iordache
030b347673
Merge pull request #7965 from docker/fix-project-dir 
Fix project_dir to take first file in account
 2020-12-03 14:21:01 +01:00
Ulysses Souza
e0edc908b5 Fix project_dir to take first file in account 
The order of precedence is:
- '--project-directory' option
- first file directory in '--file' option
- current directory

Signed-off-by: Ulysses Souza <ulyssessouza@gmail.com>
 2020-12-02 16:59:47 -03:00
Paco Xu
6f3f696bd1
parallel_pull is default behavior in new versions (#7395) 
Signed-off-by: pacoxu <paco.xu@daocloud.io>
 2020-12-02 20:58:22 +01:00
lcsdtw
3f4d1ea97e
docker-compose-help: improve help about down (#7411) 
One could think just using `docker-compose down` already remove volumes

Signed-off-by: Dara Keon <lc.sales.duarte@gmail.com>
 2020-12-02 20:56:34 +01:00
Ofek Lev
7b5be97c45
Upgrade Windows dependency (#7537) 
Signed-off-by: Ofek Lev <ofekmeister@gmail.com>
 2020-12-02 20:51:39 +01:00
EricsonMacedo
3e31f80977
Setup environment variables for compose. (#7490) 
* Setup environment variables for compose.

- Setup environment variables to work as expected for compose
  config and context in container mode.
- Setup volume mounts based on -f, --file argument for compose
  config and context.

Signed-off-by: Ericson Macedo <macedoericson@gmail.com>

* Improve parsing of specified compose file

- Update parsing of multiple -f, --file parameters.
- Remove usage of eval command.

Signed-off-by: Ericson Macedo <macedoericson@gmail.com>
 2020-12-02 20:49:54 +01:00
dependabot-preview[bot]
059fd29ec3
Bump tox from 3.19.0 to 3.20.1 (#7863) 
* Bump tox from 3.19.0 to 3.20.1
* Bump tox version in Dockerfile

Bumps [tox](https://github.com/tox-dev/tox) from 3.19.0 to 3.20.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/3.19.0...3.20.1)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
Signed-off-by: aiordache <anca.iordache@docker.com>
 2020-12-02 20:14:04 +01:00
Anca Iordache
f1059d75ed
Merge pull request #7866 from luca-nardelli/improve-mandatory-variables-issues 
Report which variable fails interpolation when they are mandatory
 2020-12-02 20:06:25 +01:00
Anca Iordache
c45e93971f
Merge pull request #7946 from aiordache/config_warning 
Bring back warning for configs in non-swarm mode
 2020-12-02 20:05:28 +01:00
Anca Iordache
ff42a783de
Merge pull request #7889 from docker/dependabot/pip/gitpython-3.1.11 
Bump gitpython from 3.1.7 to 3.1.11
 2020-12-02 20:03:38 +01:00
Anca Iordache
6ec45cf2d2
Merge pull request #7902 from docker/dependabot/pip/more-itertools-8.6.0 
Bump more-itertools from 8.4.0 to 8.6.0
 2020-12-02 20:02:23 +01:00
dependabot-preview[bot]
4139d701f3
Bump bcrypt from 3.1.7 to 3.2.0 
Bumps [bcrypt](https://github.com/pyca/bcrypt) from 3.1.7 to 3.2.0.
- [Release notes](https://github.com/pyca/bcrypt/releases)
- [Changelog](https://github.com/pyca/bcrypt/blob/master/release.py)
- [Commits](https://github.com/pyca/bcrypt/compare/3.1.7...3.2.0)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2020-12-02 19:01:24 +00:00
Anca Iordache
c56f57da12
Merge pull request #7939 from docker/dependabot/pip/virtualenv-20.2.1 
Bump virtualenv from 20.0.30 to 20.2.1
 2020-12-02 20:00:53 +01:00
Anca Iordache
687fa65557
Merge pull request #7917 from docker/dependabot/pip/attrs-20.3.0 
Bump attrs from 20.1.0 to 20.3.0
 2020-12-02 20:00:03 +01:00
Anca Iordache
5e3708e605
Merge pull request #7930 from acran/profiles 
Implement service profiles
 2020-12-02 19:57:19 +01:00
aiordache
d6e3af36dd Bump version in build scripts 
Signed-off-by: aiordache <anca.iordache@docker.com>
 2020-12-02 19:54:36 +01:00
dependabot-preview[bot]
ac06e35c00
Bump attrs from 20.1.0 to 20.3.0 
Bumps [attrs](https://github.com/python-attrs/attrs) from 20.1.0 to 20.3.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/20.1.0...20.3.0)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2020-12-02 18:47:11 +00:00
Anca Iordache
9a913b110c
Merge pull request #7952 from docker/dependabot/pip/cffi-1.14.4 
Bump cffi from 1.14.1 to 1.14.4
 2020-12-02 19:45:46 +01:00