tyler.durden
/
compose
mirror of https://github.com/docker/compose.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity
6,029 Commits 19 Branches 259 Tags 62 MiB
Commit Graph

6029 Commits

Author SHA1 Message Date
Anca Iordache 5db8d86f12 "Bump 1.28.6" 
Signed-off-by: Anca Iordache <anca.iordache@docker.com>
 2021-03-23 14:00:34 +01:00
Anca Iordache b79b2a24ac Merge branch 'master' into 1.28.x 2021-03-23 11:30:04 +01:00
Anca Iordache 8ce5e235e4 Add back `storage_opts` as service property 
Signed-off-by: Anca Iordache <anca.iordache@docker.com>
 2021-03-23 11:02:51 +01:00
Anca Iordache c1dddbe608
Merge pull request #8213 from ulyssessouza/fix-exec-error-msg 
Fix on removing error message on 'exec' error
 2021-03-19 09:45:34 +01:00
Anca Iordache 981b0cd641
Merge pull request #8178 from mgorny/cached-prop-dep 
Use built-in functools.cached_property when possible
 2021-03-18 20:17:49 +01:00
Ulysses Souza 5ec8af582c Fix on removing error message on 'exec' error 
Signed-off-by: Ulysses Souza <ulyssessouza@gmail.com>
 2021-03-17 17:49:15 -03:00
Anca Iordache f5342b600c Add `compose.yaml/.yml` to default filenames 
Signed-off-by: Anca Iordache <anca.iordache@docker.com>
 2021-03-16 18:04:51 +01:00
Anca Iordache 4a26d95de4 Make `--env-file` paths relative to current working directory 
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>
 2021-03-16 18:04:51 +01:00
Ulysses Souza 5b7851f55b
Merge pull request #8188 from aiordache/build_context 
Do not use context as base dir for Dockerfile when context is a git url
 2021-03-11 13:01:07 +01:00
Anca Iordache eaa22df151 Do not use context as base dir for Dockerfile when context is a git url 
Signed-off-by: Anca Iordache <anca.iordache@docker.com>
 2021-03-09 19:21:08 +01:00
Ulysses Souza 551f680751
Merge pull request #8187 from aiordache/build_opts 
Fix build.extra_hosts list format
 2021-03-09 19:20:51 +01:00
Anca Iordache 3e071ec8d9 Fix build.extra_hosts list format 
Signed-off-by: Anca Iordache <anca.iordache@docker.com>
 2021-03-09 18:30:47 +01:00
Michał Górny 2a7c06a050 Use built-in functools.cached_property when possible 
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>
 2021-03-06 18:45:59 +01:00
Ulysses Souza d0b7bc3110
Merge pull request #8160 from aiordache/changelog_1.28.5 
Update changelog for 1.28.5
 2021-03-02 14:14:56 -03:00
Anca Iordache fe4f16e448
Merge pull request #8166 from ulyssessouza/advertise-space-compose 
Advertise `docker compose` for non linux users
 2021-03-02 18:05:10 +01:00
Ulysses Souza 1da4301650 Advertise `docker compose` for non linux users 
This adds messages on:
- Root command (only `docker-compose`)
- Command not found
- `help` command

Signed-off-by: Ulysses Souza <ulyssessouza@gmail.com>
 2021-03-02 11:14:07 -03:00
aiordache c594cb3fc3 Update changelog post-release 1.28.5 
Signed-off-by: aiordache <anca.iordache@docker.com>
 2021-02-26 10:38:59 +01:00
aiordache c4eb3a1f47 "Bump 1.28.5" 
Signed-off-by: aiordache <anca.iordache@docker.com>
 2021-02-25 18:50:52 +01:00
aiordache 665efeed42 Merge branch 'master' into 1.28.x 2021-02-25 18:31:11 +01:00
Anca Iordache 89ad637d50
Merge pull request #8158 from ulyssessouza/fix-log-driver-none 
Stop logging when log_driver is set to 'none'
 2021-02-25 17:47:35 +01:00
Ulysses Souza 6ca2aed7ec Stop logging when log_driver is set to 'none' 
Signed-off-by: Ulysses Souza <ulyssessouza@gmail.com>
 2021-02-25 13:16:39 -03:00
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
aiordache cabd5cfb4f "Bump 1.28.4" 
Signed-off-by: aiordache <anca.iordache@docker.com>
 2021-02-18 20:49:11 +01:00
aiordache b97275024a Merge branch 'master' into 1.28.x 2021-02-18 20:46:27 +01:00
aiordache 324d73d434 fix config path for authentication 
Signed-off-by: aiordache <anca.iordache@docker.com>
 2021-02-18 20:42:47 +01:00
aiordache b83d685a26 Bump docker-py to 4.4.3 in setup.py 
Signed-off-by: aiordache <anca.iordache@docker.com>
 2021-02-18 20:42:47 +01:00
aiordache f3ef2df3fb Fix SSH port parsing via docker-py bump 
Signed-off-by: aiordache <anca.iordache@docker.com>
 2021-02-18 20:42:47 +01:00
Ulysses Souza 1415471b2a Add cgroup1 as filter label 
Signed-off-by: Ulysses Souza <ulyssessouza@gmail.com>
 2021-02-18 20:42:47 +01:00
Ulysses Souza 24a873954b Add label amd64 to filter the agents 
Signed-off-by: Ulysses Souza <ulyssessouza@gmail.com>
 2021-02-18 20:42:47 +01:00
aiordache 5db68315fa Update changelog for release 1.28.3 
Signed-off-by: aiordache <anca.iordache@docker.com>
 2021-02-18 20:42:44 +01:00
Ulysses Souza 0672fcbcad Bump python to 3.7.10 
Signed-off-by: Ulysses Souza <ulyssessouza@gmail.com>
 2021-02-18 20:41:59 +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
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