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

5087 Commits

Author SHA1 Message Date
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
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
Gustavo Pantuza Coelho Pinto 1833860614 CLI: Add --detach option for up, run and exec commands 
This contribution allows the usage of --detach option when running:

docker-compose run --detach
docker-compose exec --detach
docker-compose up --detach

The behavior is the same as the -d option.

Signed-off-by: Gustavo Pantuza Coelho Pinto <gustavopantuza@gmail.com>
 2018-02-21 16:09:46 -08:00
Joffrey F 8e268afc93 Add version guard for multi-service buildarg 
Add buildarg tests

Signed-off-by: Joffrey F <joffrey@docker.com>
 2018-02-21 15:56:02 -08:00
Ramkumar Ramachandra ac209a2485 [cli] Lift artificial limitation on --build-arg 
Currently, `docker-compose --build-arg` requires that a service be
specified as part of the command-line invocation. So,

  $ docker-compose build --build-arg nocache=`git rev-parse @` foom

works. However, when using out-of-band scripts to automate the build
process of several Docker containers (in a CI system, for instance), it
becomes difficult to specify exactly which service requires the
build-arg. Docker has supported Dockerfiles that ignore build-args for a
long time, so there is no problem is specifying spurious build-args to
builds that don't consume it.

The limitation on `docker-compose build` today is artificial, and there
are no other commands that require specifying a service. Allow
`--build-arg` to also match all services so this is possible:

  $ docker-compose build --build-arg nocache=`git rev-parse @`

Please refer to #3790 for discussion on the original feature.

Signed-off-by: Ramkumar Ramachandra <artagnon@gmail.com>
 2018-02-21 15:24:27 -08:00
Joffrey F 1b3acd0be8
Merge pull request #5697 from docker/5692-restore-default-cert-path-detection 
Retrieve certs from default path if not provided explicitly
 2018-02-21 14:10:49 -08:00
Joffrey F cd7ccad81e Retrieve certs from default path if not provided explicitly 
Signed-off-by: Joffrey F <joffrey@docker.com>
 2018-02-21 13:33:27 -08:00
Joffrey F 51076b5e12 Tests for compatibility mode 
Signed-off-by: Joffrey F <joffrey@docker.com>
 2018-02-16 16:37:20 -08:00
Joffrey F e716643857
Merge pull request #5679 from docker/kcboschert-master 
Add optional argument to pull dependencies on docker-compose pull.
 2018-02-14 13:44:41 -08:00
kcboschert 64b466c0bc Add optional argument to pull dependencies on docker-compose pull. 
Signed-off-by: Kevin Boschert <kcboschert@gmail.com>
 2018-02-14 13:11:01 -08:00
Joffrey F db5af97326 Merge branch 'dihmuzikien-5525-ps-show-health' 2018-02-12 12:10:23 -08:00
Sorawis Nilparuk bb16d9e951 Add health string generator to match `docker ps` output 2018-02-12 12:10:05 -08:00
Joffrey F 70b2d3b7cb
Merge pull request #5674 from docker/5673-update-contributing-md 
Keep CONTRIBUTING.md information up to date
 2018-02-12 12:07:54 -08:00
Joffrey F 981df93f12 Keep CONTRIBUTING.md information up to date 
Signed-off-by: Joffrey F <joffrey@docker.com>
 2018-02-12 12:06:37 -08:00
Joffrey F cc3f3c182d Merge branch 'master' of github.com:docker/compose 2018-02-12 11:54:33 -08:00
Joffrey F 515ea20f25 Fix Dockerfile.run indentation 
Signed-off-by: Joffrey F <joffrey@docker.com>
 2018-02-12 11:54:08 -08:00
Joffrey F 56b2a80d50
Merge pull request #5670 from briandealwis/patch-1 
Fix bash completion on systems where extglob is not set
 2018-02-12 10:45:05 -08:00
Brian de Alwis bb8c2e1f45 Fix bash completion on systems where extglob is not set 
Signed-off-by: Brian de Alwis <bsd@mt.ca>
 2018-02-09 11:25:58 -05:00
Joffrey F 54afe3e1c0
Merge pull request #5665 from docker/5659-dockerfile.run-needs-cli 
Add `docker` CLI to the `docker/compose` image
 2018-02-08 14:25:28 -08:00
Joffrey F cd87d88882 Add `docker` CLI to the `docker/compose` image 
Signed-off-by: Joffrey F <joffrey@docker.com>
 2018-02-08 13:59:27 -08:00
Joffrey F c3a5488d11 Merge branch 'release' 
Signed-off-by: Joffrey F <joffrey@docker.com>
 2018-02-08 13:56:22 -08:00
Joffrey F 578edc41d9
Merge pull request #5657 from docker/garribas-4909-terminate-containers-on-sighup 
Terminate one-off run on SIGHUP
 2018-02-07 14:23:52 -08:00
Joffrey F 75572f3860 Immediately kill / force-rm one-off container when receiving SIGHUP 
Signed-off-by: Joffrey F <joffrey@docker.com>
 2018-02-07 14:03:31 -08:00
Joffrey F a6459efcad Merge branch '4909-terminate-containers-on-sighup' of https://github.com/garribas/compose into garribas-4909-terminate-containers-on-sighup 
Signed-off-by: Joffrey F <joffrey@docker.com>
 2018-02-07 13:59:22 -08:00
Joffrey F c223c3fde9
Merge pull request #5625 from albers/option-consistency 
Add missing `-q|--quiet` options to increase consistency
 2018-02-07 13:54:05 -08:00
Joffrey F 8ea89efdd8 1.20.0-dev 
Signed-off-by: Joffrey F <joffrey@docker.com>
 2018-02-07 12:21:41 -08:00
Joffrey F 522825e411 Merge branch 'release' 2018-02-07 12:18:28 -08:00
Joffrey F 4fa296e7e8
Merge pull request #5656 from docker/bump-1.19.0 
Bump 1.19.0
 2018-02-07 11:53:01 -08:00