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

4763 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Joffrey F
a2f685927a
Merge pull request #5812 from docker/bump-1.20.1 
Bump 1.20.1
 2018-03-21 16:36:54 +01:00
Joffrey F
5d8c71b2c6 Bump 1.20.1 
Signed-off-by: Joffrey F <joffrey@docker.com>
1.20.1 		2018-03-21 14:52:08 +01:00
Joffrey F
e5ce2e6c07 Bump Docker python SDK -> 3.1.4 
Signed-off-by: Joffrey F <joffrey@docker.com>
 2018-03-21 14:52:08 +01:00
Joffrey F
b7ab358c54 Merge remote-tracking branch 'origin/release' into bump-1.20.1 2018-03-21 14:45:44 +01:00
Joffrey F
de00770d60
Merge pull request #5807 from docker/bump-1.20.0 
Bump 1.20.0
 2018-03-20 15:23:21 +01:00
Joffrey F
ca8d3c6c18 Bump 1.20.0 
Signed-off-by: Joffrey F <joffrey@docker.com>
1.20.0 		2018-03-20 15:10:49 +01:00
Joffrey F
80ce4eafa7 pip3? 
Signed-off-by: Joffrey F <joffrey@docker.com>
 2018-03-20 15:10:49 +01:00
Joffrey F
538e982c93 Bump Docker SDK -> 3.1.3 
Signed-off-by: Joffrey F <joffrey@docker.com>
 2018-03-20 14:55:41 +01:00
Joffrey F
fd94fab264 Manage encoding errors in progress_stream 
Signed-off-by: Joffrey F <joffrey@docker.com>
 2018-03-20 14:55:23 +01:00
Joffrey F
fd43dfba25 Merge remote-tracking branch 'origin/release' into bump-1.20.0 2018-03-20 14:51:57 +01:00
Joffrey F
e35be8b0d4
Merge pull request #5770 from docker/bump-1.20.0-rc2 
Bump 1.20.0 RC2
 2018-03-12 11:31:24 -07:00
Joffrey F
8c4af54257 Bump 1.20.0-rc2 
Signed-off-by: Joffrey F <joffrey@docker.com>
1.20.0-rc2 		2018-03-08 18:34:23 -08:00
Joffrey F
768e28ee30 Update Dockerfile.run to produce smaller image 
Signed-off-by: Joffrey F <joffrey@docker.com>
 2018-03-08 18:34:23 -08:00
Joffrey F
742979371d Install both versions of python 
Signed-off-by: Joffrey F <joffrey@docker.com>
 2018-03-08 18:34:23 -08:00
Joffrey F
ca012640c1 Preserve security_opt values in extends 
Signed-off-by: Joffrey F <joffrey@docker.com>
 2018-03-08 18:29:22 -08:00
Matthieu Nottale
d2b5d59dd8 Revamp ParallelStreamWriter to fix display issues. 
Signed-off-by: Matthieu Nottale <matthieu.nottale@docker.com>
 2018-03-08 18:29:17 -08:00
Joffrey F
4d1dad24ae SDK version 3.1.1 
Signed-off-by: Joffrey F <joffrey@docker.com>
 2018-03-08 18:29:14 -08:00
Harald Albers
9e42b50063 Add support for options added in 1.20.0 to bash completion 
New options:
- `docker-compose --log-level`
- `docker-compose pull --include-deps`
- `docker-compose run --use-aliases`

Signed-off-by: Harald Albers <github@albersweb.de>
 2018-03-08 18:29:09 -08:00
Matthieu Nottale
d36f222c7e Fix a race condition in ParallelStreamWriter. 
Signed-off-by: Matthieu Nottale <matthieu.nottale@docker.com>
 2018-03-08 18:29:02 -08:00
Joffrey F
8ac59a7b5d Merge remote-tracking branch 'origin/release' into bump-1.20.0-rc2 2018-03-08 18:22:37 -08:00
Joffrey F
296d8ed155
Merge pull request #5726 from docker/bump-1.20.0-rc1 
Bump 1.20.0 rc1
 2018-02-27 15:22:38 -08:00
Joffrey F
86428af5bc Bump 1.20.0-rc1 
Signed-off-by: Joffrey F <joffrey@docker.com>
1.20.0-rc1 		2018-02-27 14:44:21 -08:00
Joffrey F
4ceeaad089
Merge pull request #5725 from docker/geigerzaehler-run-with-network-alias 
Add --use-aliases flag to run command
 2018-02-27 14:01:09 -08:00
Joffrey F
4444293c61
Merge pull request #5724 from docker/ghsatpute-5582_UnsetEntrypoint 
Allow unsetting entrypoint in run command
 2018-02-27 13:49:22 -08:00
Joffrey F
07199fac37 Restore container ID alias 
Signed-off-by: Joffrey F <joffrey@docker.com>
 2018-02-27 13:46:27 -08:00
Joffrey F
1096a903be unset entrypoint test 
Signed-off-by: Joffrey F <joffrey@docker.com>
 2018-02-27 13:25:52 -08:00
Jim Dalton
e78c0bf533 Add acceptance test for use-aliases feature 
Signed-off-by: Jim Dalton <jim.dalton@gmail.com>
 2018-02-27 13:13:50 -08:00
Thomas Scholtes
5b6e02d13a 'run' command can use network aliases for service 
It is now possible for the 'run' command to use the network aliases
defined for the service.

Fixes #3492

Signed-off-by: Thomas Scholtes <thomas-scholtes@gmx.de>
 2018-02-27 13:13:50 -08:00
Ganesh Satpute
59c8ed77e4 Allow unset of entrypoint (resolves #5582) 
When an empty string is passed to the 'entrypoint' parameter, for example
`docker-compose run --entrypoint='' ...`
OR
`docker-compose run --entrypoint '' ...`
It allows the default entrypoint to be overriden by empty value.

Signed-off-by: Ganesh Satpute <ghsatpute@gmail.com>
 2018-02-27 13:02:05 -08:00
Joffrey F
9b2efd50f5
Merge pull request #5722 from docker/5700-call-docker-with-args 
Re-use TLS and host options when shelling out to docker CLI
 2018-02-27 12:27:49 -08:00
Joffrey F
a7d1fada52 Unify toplevel command handlers 
Signed-off-by: Joffrey F <joffrey@docker.com>
 2018-02-27 11:57:25 -08:00
Joffrey F
7ce5766f6a Re-use TLS and host options when shelling out to docker CLI 
Signed-off-by: Joffrey F <joffrey@docker.com>
 2018-02-27 11:14:28 -08:00
Joffrey F
2578813147
Merge pull request #5706 from docker/5601-config-proxy 
Use config file-provided proxy values to populate buildargs and env
 2018-02-27 10:13:37 -08:00
Joffrey F
57a243786b
Merge pull request #5718 from docker/5622-device-cgroup-rules 
Add support for device_cgroup_rules in v2.3 files
 2018-02-27 10:13:12 -08:00
Joffrey F
a35335a75c Add support for device_cgroup_rules in v2.3 files 
Signed-off-by: Joffrey F <joffrey@docker.com>
 2018-02-26 14:43:44 -08:00
Joffrey F
37a48073ed
Merge pull request #5701 from docker/5574-seccomp-file 
Add support for seccomp files
 2018-02-26 11:22:01 -08:00
Joffrey F
a6c31b80fe Add support for seccomp files 
Signed-off-by: Joffrey F <joffrey@docker.com>
 2018-02-26 10:46:10 -08:00
Joffrey F
ec0de7eb68
Merge pull request #5684 from docker/compat_mode 
Compatibility mode
 2018-02-26 10:42:59 -08:00
Joffrey F
5e4700b176 Add proxy_config tests 
Signed-off-by: Joffrey F <joffrey@docker.com>
 2018-02-23 14:32:43 -08:00
Joffrey F
6659e99aff
Merge pull request #5703 from mnottale/log-level 
New --log-level option.
 2018-02-23 12:57:32 -08:00
Joffrey F
a0cbb68e2f
Merge pull request #5702 from mnottale/up-quiet 
Add '--quiet' option to 'up' to pull silently.
 2018-02-23 12:55:41 -08:00
Matthieu Nottale
59b08c7d1d New --log-level option. 
Signed-off-by: Matthieu Nottale <matthieu.nottale@docker.com>
 2018-02-23 13:14:26 +01:00
Matthieu Nottale
5eefa81f9e Add '--quiet' option to 'up' to pull silently. 
Signed-off-by: Matthieu Nottale <matthieu.nottale@docker.com>
 2018-02-23 11:03:26 +01:00
Joffrey F
551b4b4b31
Merge pull request #5705 from docker/bump_docker_py 
Bump SDK version
 2018-02-22 16:20:17 -08:00
Joffrey F
d4106679a6 Use configfile-provided proxy values to populate buildargs and env values 
Signed-off-by: Joffrey F <joffrey@docker.com>
 2018-02-22 16:19:50 -08:00
Joffrey F
ad683b2d8d Bump SDK version 
Signed-off-by: Joffrey F <joffrey@docker.com>
 2018-02-22 15:18:18 -08:00
Joffrey F
2fa201660c
Merge pull request #5699 from docker/pantuza-cli-add-detach-option 
Add long-form --detach CLI flag
 2018-02-22 12:52:28 -08:00
Joffrey F
c16820eca0 Update bash completion 
Signed-off-by: Joffrey F <joffrey@docker.com>
 2018-02-21 17:00:42 -08:00
Joffrey F
cd3ffe651b
Merge pull request #5698 from docker/artagnon-build-args-services 
Allow buildargs for multi-service builds
 2018-02-21 16:59:07 -08:00
Joffrey F
c6fe564ed5 Add --detach tests 
Signed-off-by: Joffrey F <joffrey@docker.com>
 2018-02-21 16:42:49 -08:00