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

5963 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Anca Iordache
66375c2871
Merge pull request #8135 from aiordache/test_auth 
Fix docker/config path in the test containers
 2021-02-18 19:36:21 +01:00
aiordache
c760600a65 fix config path for authentication 
Signed-off-by: aiordache <anca.iordache@docker.com>
 2021-02-18 19:22:13 +01:00
Ulysses Souza
74c09cac66
Merge pull request #8134 from aiordache/bump_docker_setup 
Bump docker-py to 4.4.3 in setup.py
 2021-02-18 13:27:42 -03:00
aiordache
36e470d640 Bump docker-py to 4.4.3 in setup.py 
Signed-off-by: aiordache <anca.iordache@docker.com>
 2021-02-18 17:19:46 +01:00
aiordache
d28d717884 Fix SSH port parsing via docker-py bump 
Signed-off-by: aiordache <anca.iordache@docker.com>
 2021-02-18 12:52:29 -03:00
Anca Iordache
42c2cfd7a6
Merge pull request #8133 from docker/fix-release-jenkins 
Add cgroup1 as filter label
 2021-02-18 16:51:55 +01:00
Ulysses Souza
5b983ac653 Add cgroup1 as filter label 
Signed-off-by: Ulysses Souza <ulyssessouza@gmail.com>
 2021-02-18 12:24:04 -03:00
Anca Iordache
93425218eb
Merge pull request #8130 from docker/fix-release-jenkins 
Add label amd64 to filter the agents
 2021-02-18 15:58:19 +01:00
aiordache
49d0ee2de5 Update changelog for release 1.28.3 
Signed-off-by: aiordache <anca.iordache@docker.com>
 2021-02-18 11:48:29 -03:00
Ulysses Souza
a92c6d7e17 Add label amd64 to filter the agents 
Signed-off-by: Ulysses Souza <ulyssessouza@gmail.com>
 2021-02-18 11:34:03 -03:00
Anca Iordache
b8800db52e
Merge pull request #8129 from ulyssessouza/bump-python 
Bump python to 3.7.10
 2021-02-18 15:09:42 +01:00
Ulysses Souza
ccabfde353 Bump python to 3.7.10 
Signed-off-by: Ulysses Souza <ulyssessouza@gmail.com>
 2021-02-18 11:04:25 -03: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
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
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