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

247 Commits

Author SHA1 Message Date
Joffrey F
834acca497 Update acceptance test for image matching 
Signed-off-by: Joffrey F <joffrey@docker.com>
 2018-09-20 15:48:08 -07:00
Boris HUISGEN
1b668973a2 Add acceptance test 
Signed-off-by: Boris HUISGEN <bhuisgen@hbis.fr>
 2018-09-20 15:48:08 -07:00
Joffrey F
5916639383 Preserve container numbers, add slug to prevent name collisions 
Signed-off-by: Joffrey F <joffrey@docker.com>
 2018-09-12 12:07:52 -07:00
Joffrey F
4e2de3c1ff Replace sequential container indexes with randomly generated IDs 
Signed-off-by: Joffrey F <joffrey@docker.com>
 2018-09-11 15:26:58 -07:00
Joffrey F
eb63e9f3c7 Fix --project-directory handling to apply to .env files as well 
Signed-off-by: Joffrey F <joffrey@docker.com>
 2018-08-10 17:02:56 -07:00
Joffrey F
ee878aee4c Handle missing (not built) service image in config --hash 
Signed-off-by: Joffrey F <joffrey@docker.com>
 2018-08-07 20:23:21 -07:00
Joffrey F
861031b9b7 Reduce config --hash code complexity and add test 
Signed-off-by: Joffrey F <joffrey@docker.com>
 2018-08-07 17:25:35 -07:00
Gil Raphaelli
89f2bfe4f3 add --parallel option to build 
Signed-off-by: Gil Raphaelli <g@raphaelli.com>
 2018-07-31 12:06:59 -04:00
Joffrey F
635c77db6c
Merge pull request #6071 from nickhiggs/6060-reattach-logger-on-restart 
Attach logger to containers after crashing.
 2018-07-25 15:20:43 -07:00
Joffrey F
e6d18b1881 Fix --exit-code-from to reflect exit code after termination by Compose 
Signed-off-by: Joffrey F <joffrey@docker.com>
 2018-07-10 15:28:55 -04:00
Nicholas Higgins
28085ebee2 Attach logger to containers after crashing. 
Fixes #6060

Signed-off-by: Nicholas Higgins <nickhiggins42@gmail.com>
 2018-07-09 08:47:20 +10:00
Joffrey F
f368b4846f Ignore attachable property on networks in compatibility mode 
Signed-off-by: Joffrey F <joffrey@docker.com>
 2018-05-04 15:16:43 -07:00
Joffrey F
cbb9bff924 Support -H=host notation for interactive run/execs 
Signed-off-by: Joffrey F <joffrey@docker.com>
 2018-03-26 14:25:31 -07:00
Joffrey F
6c7c7902f1
Merge pull request #5788 from mnottale/dash-underscore-in-project-name 
Allow dash and underscore in project name.
 2018-03-19 05:33:21 -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
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
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
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
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
Joffrey F
ec0de7eb68
Merge pull request #5684 from docker/compat_mode 
Compatibility mode
 2018-02-26 10:42:59 -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
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
c6fe564ed5 Add --detach tests 
Signed-off-by: Joffrey F <joffrey@docker.com>
 2018-02-21 16:42:49 -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
Joffrey F
51076b5e12 Tests for compatibility mode 
Signed-off-by: Joffrey F <joffrey@docker.com>
 2018-02-16 16:37:20 -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
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
Harald Albers
6cfbb7ed8a Add missing -q|--quiet options to increase consistency 
Signed-off-by: Harald Albers <github@albersweb.de>
 2018-01-30 01:28:15 +01:00
Joffrey F
d63500a191 Move priority option to service network reference 
Add ordering to networks.get_networks
Fix priority test

Signed-off-by: Joffrey F <joffrey@docker.com>
 2018-01-11 18:48:56 -08:00
Zal Daroga
4839baf877 Fixed python34 comparison issue 
Signed-off-by: Zal Daroga <zaldaroga@yahoo.com>
 2018-01-11 17:29:29 -08:00
Zal Daroga
55ee95b6d0 Fixed network priorities. Resolves #5042 
Signed-off-by: Zal Daroga <zaldaroga@yahoo.com>
 2018-01-11 17:29:29 -08:00
Zal Daroga
f50e1a8c2d Added prioritization of networks 
Signed-off-by: Zal Daroga <zaldaroga@yahoo.com>
 2018-01-11 17:29:29 -08:00
Joffrey F
e174c3fd1c Revert -d/--timeout exclusion 
Signed-off-by: Joffrey F <joffrey@docker.com>
 2018-01-11 12:37:46 -08:00
Joffrey F
c4fda0834d
Merge pull request #5384 from ilinum/1498-docker-compose-services 
Implement --filter flag for docker-compose config --services and use it in bash completion
 2018-01-09 17:02:04 -08:00
Svyatoslav Ilinskiy
a1f0c3ed7c Rename ps --filter option from key to source. 
Signed-off-by: Svyatoslav Ilinskiy <ilinskiy.sv@gmail.com>
 2018-01-09 10:57:06 -06:00
Svyatoslav Ilinskiy
253bed497d Allow only one --filter argument and simplify code 
Signed-off-by: Svyatoslav Ilinskiy <ilinskiy.sv@gmail.com>
 2018-01-07 13:56:05 -06:00
John Harris
963b004749 Add COMPOSE_IGNORE_ORPHANS 
Signed-off-by: John Harris <john@johnharris.io>
 2018-01-04 17:46:11 -08:00
Joffrey F
b13ec16e11 Replace unittest-style asserts with pytest asserts 
Signed-off-by: Joffrey F <joffrey@docker.com>
 2018-01-04 14:38:28 -08:00
Joffrey F
c8ba50ff1e Avoid CLI crash if image has no tags 
Signed-off-by: Joffrey F <joffrey@docker.com>
 2017-12-12 15:26:20 -08:00
Joffrey F
8155ddc7ad Add support for custom names for networks, secrets, configs 
Finalize v3.5 schema

Signed-off-by: Joffrey F <joffrey@docker.com>
 2017-12-06 16:48:14 -08:00
Joffrey F
771bf5f7ea
Merge pull request #5436 from docker/5244-advanced-mount-support 
Add support for mount syntax
 2017-12-05 17:16:28 -08:00
Joffrey F
79b20eb53f Add support for mount syntax 
Signed-off-by: Joffrey F <joffrey@docker.com>
 2017-12-05 16:21:49 -08:00
Joffrey F
eabccda9d1
Merge pull request #5393 from summergirl21/3370-down-timeout 
implement --timeout flag for docker-compose down
 2017-12-05 12:32:43 -08:00
Joffrey F
91bb682bdf
Merge pull request #5435 from summergirl21/5434-up-d-timeout-not-allowed 
Raise error if up used with both -d and --timeout
 2017-12-05 12:30:42 -08:00
Madeline Stager
16cc8437de Raise error if up used with both -d and --timeout 
Fix #5434
Signed-off-by: Madeline Stager <stager.madeline@gmail.com>
 2017-12-05 12:28:28 -06:00
Joffrey F
9098a67394
Merge pull request #5410 from sethktaylor11/5374-build-memory 
Adds support for a memory build-arg in docker-compose build.
 2017-12-04 14:00:09 -08:00
Samantha Miller
a6cdd62726 Adds support for a memory flag to docker-compose build. 
Signed-off-by: Samantha Miller <samantha.a.miller123@gmail.com>
 2017-12-03 13:59:32 -06:00
Svyatoslav Ilinskiy
be0b902631 Add ability to list and filter services in ps 
Also, rename --filter "option=..." to --filter "key=..."

Signed-off-by: Svyatoslav Ilinskiy <ilinskiy.sv@gmail.com>
 2017-12-02 18:37:21 -06:00