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

6077 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Anca Iordache
fc744a0cc9
Merge pull request #8156 from ulyssessouza/remove-native-log 
Remove log.info for native build
 2021-02-25 16:05:32 +01:00
Anca Iordache
245ede1d75
Merge pull request #8113 from joselfr/master 
Add missing --add-host args to the build command
 2021-02-25 15:54:54 +01:00
José Rodrigues
72f7b086d7 Add missing --add-host args to the build command 
Signed-off-by: José Rodrigues <contact.jrodrigues@gmail.com>
 2021-02-25 11:23:38 -03:00
Ulysses Souza
2f48b6f5e9 Remove log.info for native build 
Signed-off-by: Ulysses Souza <ulyssessouza@gmail.com>
 2021-02-25 11:18:31 -03:00
Anca Iordache
e6fcde422c
Merge pull request #8153 from aiordache/openssl_mismatch_bug 
Fix openssl mismatch bug via docker-py bump (fix in docker-py 4.4.4)
 2021-02-25 14:21:53 +01:00
Anca Iordache
75b2d7905f
Merge pull request #8138 from aiordache/changelog_update_1.28.4 
Update changelog for release 1.28.4
 2021-02-24 18:33:04 +01:00
aiordache
efa5969086 Bump docker-py version to 4.4.4 
Signed-off-by: aiordache <anca.iordache@docker.com>
 2021-02-24 18:26:12 +01:00
Ulysses Souza
2a4aca7f54
Merge pull request #8147 from aiordache/platform_build 
Set `platform` and `isolation` options for cli builder
 2021-02-23 09:11:10 -03:00
aiordache
9c8f5a5705 Set platform and isolation options for cli builder 
Signed-off-by: aiordache <anca.iordache@docker.com>
 2021-02-23 09:50:45 +01:00
aiordache
62bbc5cfe2 Changelog update post-release 1.28.4 
Signed-off-by: aiordache <anca.iordache@docker.com>
 2021-02-19 09:54:39 +01:00
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
Slava Kardakov
4daad056c4
Add init container support 
Fixes #6855

See https://github.com/compose-spec/compose-spec/pull/134

Signed-off-by: Slava Kardakov <ojab@ojab.ru>
 2021-02-18 17:47:59 +00: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
dependabot-preview[bot]
6209baccf3
Bump packaging from 20.4 to 20.9 
Bumps [packaging](https://github.com/pypa/packaging) from 20.4 to 20.9.
- [Release notes](https://github.com/pypa/packaging/releases)
- [Changelog](https://github.com/pypa/packaging/blob/main/CHANGELOG.rst)
- [Commits](https://github.com/pypa/packaging/compare/20.4...20.9)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2021-02-01 22:22:56 +00: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
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