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

5082 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Joffrey F
af8ac1a67f Merge branch 'remove-myself-as-maintainer' of https://github.com/dnephin/compose into dnephin-remove-myself-as-maintainer 2018-03-15 12:13:14 -07:00
Matthieu Nottale
8336407830 pull: Deprecate '--parallel' and enable it by default. 
Signed-off-by: Matthieu Nottale <matthieu.nottale@docker.com>
 2018-03-15 15:47:29 +01:00
Matthieu Nottale
c7b76b1d12 pull: Honor --quiet in parallel mode. 
Signed-off-by: Matthieu Nottale <matthieu.nottale@docker.com>
 2018-03-15 15:47:20 +01:00
Matthieu Nottale
5fe3aff1c3 Allow dash and underscore in project name. 
Signed-off-by: Matthieu Nottale <matthieu.nottale@docker.com>
 2018-03-15 15:44:43 +01:00
Wes Higbee
e7f0ab04a1 Fix docker-compose zsh running service name completion 
This applies to commands that operate on running services. For example: top, stop, restart, etc.

Configuring a custom psFormat in ~/.docker/config.json can break zsh
running service name completion that depends upon default `docker ps`
output. This breaks when you don't include the output needed by
completion.

The fix specifies the explicit format needed for completion and is based
on a previous fix in the docker CLI completion: 8b38343e46

Signed-off-by: Wes Higbee <wes.mcclure@gmail.com>
 2018-03-14 22:34:11 -04:00
Joffrey F
4e0fdd70bd
Merge pull request #5776 from docker/5772-catch-volume-divergence 
Check volume config against remote and error out if diverged
 2018-03-14 12:00:14 -07:00
Daniel Nephin
a43ec0aa2e Remove myself as maintainer 
Signed-off-by: Daniel Nephin <dnephin@docker.com>
 2018-03-13 14:41:20 -04:00
Joffrey F
0112c740ad Check volume config against remote and error out if diverged 
Signed-off-by: Joffrey F <joffrey@docker.com>
 2018-03-12 17:19:03 -07: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
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>
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