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

5977 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
aiordache
1473615283 "Bump 1.28.3" 
Signed-off-by: aiordache <anca.iordache@docker.com>
1.28.3 		2021-02-17 20:06:32 +01:00
aiordache
31b95cfc12 Merge branch 'master' into 1.28.x 2021-02-17 18:30:52 +01:00
aiordache
3297bb50bb Update dind setup for tests 
Signed-off-by: aiordache <anca.iordache@docker.com>
 2021-02-17 12:52:14 -03:00
Anca Iordache
e688006444
Merge pull request #8123 from ulyssessouza/fix-dict-access 
Fix dics access on keep-prefix option for up
 2021-02-16 20:16:50 +01:00
Ulysses Souza
e4a83c15ff Fix dics access on keep-prefix option for up 
Signed-off-by: Ulysses Souza <ulyssessouza@gmail.com>
 2021-02-16 15:55:39 -03:00
Anca Iordache
824b9f138e
Merge pull request #8094 from Agrendalath/agrendalath/fix_fish_completion 
Fix fish completion
 2021-02-16 19:48:09 +01:00
Anca Iordache
8654eb2ea3
Merge pull request #8120 from ulyssessouza/bump-docker-py 
Bump docker-py
 2021-02-15 18:54:30 +01:00
Ulysses Souza
9407ee65e5 Bump docker-py 
Signed-off-by: Ulysses Souza <ulyssessouza@gmail.com>
 2021-02-15 14:19:37 -03:00
Anca Iordache
66c6d2757a
Merge pull request #8082 from thaJeztah/remove_log_driver_check 
Remove local check for log-driver read support
 2021-02-15 17:07:34 +01:00
Anca Iordache
17daa93edf
Merge pull request #8109 from docker/dependabot/pip/cryptography-3.3.2 
[Security] Bump cryptography from 3.2.1 to 3.3.2
 2021-02-15 16:41:42 +01:00
dependabot-preview[bot]
9795e39d0c
[Security] Bump cryptography from 3.2.1 to 3.3.2 
Bumps [cryptography](https://github.com/pyca/cryptography) from 3.2.1 to 3.3.2. **This update includes a security fix.**
- [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/3.2.1...3.3.2)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2021-02-12 10:45:09 +00:00
Anca Iordache
393abc5b33
Merge pull request #8112 from aiordache/update_Jenkinsfile 
Update test base image in Jenkinsfile
 2021-02-12 11:33:06 +01:00
aiordache
d0866c8c18 Update test base image in Jenkinsfile 
Signed-off-by: aiordache <anca.iordache@docker.com>
 2021-02-10 15:06:06 +01:00
Anca Iordache
546133c977
Merge pull request #8093 from JimCronqvist/master 
Fix incorrect CLI env variable name for service profiles
 2021-02-10 12:24:02 +01:00
Ulysses Souza
9a2f94713e
Merge pull request #8080 from aiordache/update_changelog_1.28.2 
Post-release 1.28.2 changelog updates
 2021-02-09 16:36:27 -03:00
Agrendalath
b88f635514
Fix fish completion 
Signed-off-by: Agrendalath <piotr@surowiec.it>
 2021-02-03 00:29:16 +01:00
Jim Cronqvist
31002aeacd Fix incorrect CLI variable name for service profiles 
Changed from singular to plural as defined in the docs, i.e. "COMPOSE_PROFILES"

Signed-off-by: Jim Cronqvist <jim.cronqvist@gmail.com>
 2021-02-02 21:41:57 +01:00
Sebastiaan van Stijn
28f8b8549d
Remove local check for log-driver read support 
Starting with Docker 20.10, the docker daemon has support for
"dual logging", which allows reading back logs, irregardless of
the logging-driver that is configured (except for "none" as logging
driver).

This patch removes the local check, which used a hard-coded list of
logging drivers that are expected to support reading logs.

When using an older version of Docker, the API should return an
error that reading logs is not supported, so no local check should
be needed.

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
 2021-01-28 16:55:36 +01:00
aiordache
76a19ec8c5 Post-release changelog update 
Signed-off-by: aiordache <anca.iordache@docker.com>
 2021-01-28 10:28:47 +01:00
Anca Iordache
bba8cd0322
Merge pull request #8045 from aiordache/changelog_1.28.0 
Post-release 1.28.0: Update changelog and version
 2021-01-26 21:07:24 +01:00
aiordache
67630359cf "Bump 1.28.2" 
Signed-off-by: aiordache <anca.iordache@docker.com>
1.28.2 		2021-01-26 20:23:53 +01:00
aiordache
c99c1556aa Add cgroup1 label to Release.Jenkinsfile 
Signed-off-by: aiordache <anca.iordache@docker.com>
 2021-01-26 20:15:15 +01:00
aiordache
0e529bf29b "Bump 1.28.1" 
Signed-off-by: aiordache <anca.iordache@docker.com>
1.28.1 		2021-01-26 20:15:15 +01:00
Harald Albers
27d039d39a Fix formatting of help output for up|logs --no-log-prefix 
Signed-off-by: Harald Albers <github@albersweb.de>
 2021-01-26 20:15:15 +01:00
Harald Albers
ad1baff1b3 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-26 20:15:15 +01:00
Chris Crone
59e9ebe428 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-26 20:15:15 +01:00
aiordache
90373e9e63 "Bump 1.28.0" 
Signed-off-by: aiordache <anca.iordache@docker.com>
 2021-01-26 20:15:15 +01:00
Ulysses Souza
786822e921 Update compose-spec 
Signed-off-by: Ulysses Souza <ulyssessouza@gmail.com>
 2021-01-26 20:15:15 +01:00
Ulysses Souza
95c6adeecf Remove restriction on docker version 
Signed-off-by: Ulysses Souza <ulyssessouza@gmail.com>
 2021-01-26 20:15:15 +01:00
Mike Seplowitz
b6ddddc31a 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-26 20:15:15 +01:00
aiordache
e1fb1e9a3a "Bump 1.28.0-rc3" 
Signed-off-by: aiordache <anca.iordache@docker.com>
 2021-01-26 20:15:15 +01:00
Mark Gallagher
c27c73efae Remove duplicate values check for build.cache_from 
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>
 2021-01-26 20:15:15 +01:00
Sebastiaan van Stijn
a5863de31a 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>
 2021-01-26 20:15:14 +01:00
guillaume.tardif
97056552dc 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-26 20:15:14 +01:00
Ulysses Souza
318741ca5e Add metrics 
Signed-off-by: Ulysses Souza <ulyssessouza@gmail.com>
 2021-01-26 20:15:14 +01:00
aiordache
aa8b7bb392 "Bump 1.28.0-rc2" 
Signed-off-by: aiordache <anca.iordache@docker.com>
 2021-01-26 20:15:14 +01:00
Daniil Sigalov
a8ffcfaefb 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>
 2021-01-26 20:15:14 +01:00
Ulysses Souza
97e009a8cb Avoid setting unsuported parameter for subprocess.Popen on Windows 
Signed-off-by: Ulysses Souza <ulyssessouza@gmail.com>
 2021-01-26 20:15:14 +01:00
aiordache
186e3913f0 "Bump 1.28.0-rc1" 
Signed-off-by: aiordache <anca.iordache@docker.com>
 2021-01-26 20:15:14 +01:00
dependabot-preview[bot]
7bc945654f 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>
 2021-01-26 20:15:14 +01:00
dependabot-preview[bot]
cc299f5cd5 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>
 2021-01-26 20:15:14 +01:00
Anca Iordache
536bea0859 Revert "Bump virtualenv from 20.0.30 to 20.2.1" (#7975) 
This reverts commit 8785279ffd40d04cae409a1d3a94aebd94f2e199.

Signed-off-by: aiordache <anca.iordache@docker.com>
 2021-01-26 20:15:14 +01:00
Anca Iordache
db7b666e40 Revert "Bump gitpython from 3.1.7 to 3.1.11" (#7974) 
Signed-off-by: aiordache <anca.iordache@docker.com>
 2021-01-26 20:15:14 +01:00
aiordache
945123145f Bump docker-py in setup.py 
Signed-off-by: aiordache <anca.iordache@docker.com>
 2021-01-26 20:15:14 +01:00
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