tyler.durden
/
compose
mirror of https://github.com/docker/compose.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity
4,967 Commits 25 Branches 265 Tags 68 MiB
Commit Graph

4967 Commits

Author SHA1 Message Date
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 867ad1550b
Merge pull request #5769 from docker/5766-fix-secopt-extend 
Preserve security_opt values in extends
 2018-03-08 18:20:56 -08:00
Joffrey F 85670e208b
Merge pull request #5751 from mnottale/cpu_period 
Add support for 'cpu_period' for compose v2.1-v2.3.
 2018-03-08 18:12:59 -08:00
Joffrey F 62ecf2c1c7
Merge pull request #5752 from mnottale/fix-parallelstreamwriter 
Revamp ParallelStreamWriter to fix display issues.
 2018-03-08 18:05:25 -08:00
Joffrey F 7e3bbef436 Preserve security_opt values in extends 
Signed-off-by: Joffrey F <joffrey@docker.com>
 2018-03-08 18:03:54 -08:00
Joffrey F 331f86c7ce
Merge pull request #5765 from docker/update-dockerfile.run 
Update Dockerfile.run to produce smaller image
 2018-03-08 17:30:17 -08:00
Joffrey F 08f71a8d3d Update Dockerfile.run to produce smaller image 
Signed-off-by: Joffrey F <joffrey@docker.com>
 2018-03-08 15:44:42 -08:00
Joffrey F 17fe8b9c0f
Merge pull request #5755 from shin-/update-maintainers 
Add new maintainers and move inactive maintainers to alumni
 2018-03-07 12:47:48 -08:00
Joffrey F 4181d23131 Add new maintainers and move inactive maintainers to alumni 
Signed-off-by: Joffrey F <joffrey@docker.com>
 2018-03-07 12:37:45 -08:00
Joffrey F c2052d0370 Add blacklist to versions.py CI script 
Signed-off-by: Joffrey F <joffrey@docker.com>
 2018-03-07 11:39:24 -08:00
Matthieu Nottale b9f9643d24 Add support for 'cpu_period' for compose v2.1-v2.3. 
Signed-off-by: Matthieu Nottale <matthieu.nottale@docker.com>
 2018-03-07 15:23:24 +01:00
Matthieu Nottale 31dcfcff2a Revamp ParallelStreamWriter to fix display issues. 
Signed-off-by: Matthieu Nottale <matthieu.nottale@docker.com>
 2018-03-07 15:22:38 +01:00
Joffrey F eee55231b8
Merge pull request #5750 from docker/bump_docker_py 
SDK version 3.1.1
 2018-03-05 15:55:48 -08:00
Joffrey F d9e023f79f SDK version 3.1.1 
Signed-off-by: Joffrey F <joffrey@docker.com>
 2018-03-05 15:38:42 -08:00
Joffrey F 045d64f1fd
Merge pull request #5734 from albers/new-completions 
Add support for options added in 1.20.0 to bash completion
 2018-03-02 16:15:23 -08:00
Joffrey F 1f84463061
Merge pull request #5748 from docker/fix-brew-python 
Fix brew python install command
 2018-03-02 15:52:22 -08:00
Joffrey F efd3d1db06 Install both versions of python 
Signed-off-by: Joffrey F <joffrey@docker.com>
 2018-03-02 15:45:37 -08:00
Joffrey F 38f7fdfe89
Merge pull request #5709 from mnottale/exec-workdir 
Add '--workdir' option to 'exec'.
 2018-03-02 15:28:07 -08:00
Joffrey F 0156dd6b27
Merge pull request #5735 from mnottale/parallelstreamwriter-race 
Fix a race condition in ParallelStreamWriter.
 2018-03-02 15:25:01 -08:00
Matthieu Nottale 17610e8d19 Fix a race condition in ParallelStreamWriter. 
Signed-off-by: Matthieu Nottale <matthieu.nottale@docker.com>
 2018-03-01 17:09:01 +01:00
Harald Albers 7049bea1bb 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-01 16:04:13 +01: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>
 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 2fed399881 Add '--workdir' option to 'exec'. 
Signed-off-by: Matthieu Nottale <matthieu.nottale@docker.com>
 2018-02-23 16:57:23 +01: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