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

1391 Commits

Author SHA1 Message Date
Djordje Lukic c8279bc4db
Merge pull request #6738 from Inconnu08/set-optimization 
Replace sets with set literal syntax for efficiency
 2019-07-15 15:23:24 +02:00
Djordje Lukic 98932e9cb4
Merge pull request #6754 from Goryudyuma/6740-fix-display 
fix: The correct number is displayed
 2019-07-15 10:30:59 +02:00
Goryudyuma 59491c7d77
add: test for units 
Signed-off-by: Kei Matsumoto <umaretekyoumade@gmail.com>
 2019-07-14 04:31:16 +09:00
Kei Matsumoto 75d41edb94
fix: Add test 
Signed-off-by: Kei Matsumoto <umaretekyoumade@gmail.com>
 2019-07-14 03:38:29 +09:00
Ulysses Souza 1b326fce57
Merge pull request #6720 from ijc/pass-env-to-docker-cli 
Pass environment when calling through to docker cli.
 2019-07-12 10:11:47 +02:00
Ulysses Souza cacc9752a3 Pin busybox image version in tests 
Signed-off-by: Ulysses Souza <ulysses.souza@docker.com>
 2019-07-02 13:42:41 +02:00
Inconnu08 57055e0e66 Replace sets with set literal syntax for efficiency 
Signed-off-by: Taufiq Rahman <taufiqrx8@gmail.com>
 2019-06-02 20:21:21 +06:00
Inconnu08 c37fb783fe replace sets with set literal syntax for efficiency 
Signed-off-by: Taufiq Rahman <taufiqrx8@gmail.com>
 2019-06-01 01:31:35 +06:00
Inconnu08 b29b6a1538 replace sets with set literal syntax for efficiency 
Signed-off-by: Taufiq Rahman <taufiqrx8@gmail.com>
 2019-05-31 20:29:09 +06:00
Ian Campbell 9d2508cf58 Pass environment when calling through to docker cli. 
This ensures that settings from any `.env` file (such as `DOCKER_HOST`) are
passed on to the cli.

Unit tests are adjusted for the new parameter and a new case is added to ensure
it is propagated as expected.

Fixes: 6661

Signed-off-by: Ian Campbell <ijc@docker.com>
 2019-05-23 16:29:46 +01:00
Ian Campbell a89128118b
Merge pull request #6342 from collin5/b5547 
--remove-orphans is ignored when using up --no-start
 2019-05-20 15:45:24 +01:00
Ulysses Souza 9de6ec3700
Merge pull request #6695 from Inconnu08/fix_depreciation 
fixes warn method is deprecated
 2019-05-20 12:34:51 +02:00
Inconnu08 99e67d0c06 fix warning method is deprecated with tests 
Signed-off-by: Taufiq Rahman <taufiqrx8@gmail.com>
 2019-05-15 23:46:12 +06:00
Ulysses Souza 8a9575bd0d Remove remaining containers on test_build_run 
Signed-off-by: Ulysses Souza <ulysses.souza@docker.com>
 2019-05-14 19:13:21 +02:00
Ulysses Souza f2dc923084 Avoid race condition on test 
Signed-off-by: Ulysses Souza <ulysses.souza@docker.com>
 2019-04-19 15:53:02 +02:00
Ulysses Souza e047169315 Workaround race conditions on tests 
Signed-off-by: Ulysses Souza <ulysses.souza@docker.com>
 2019-04-17 17:59:12 +02:00
Ian Campbell e84ffb6aeb
Merge pull request #6592 from treatwell/6589-depends_on-recreation-fix 
Fixed depends_on recreation behaviour for issue #6589
 2019-03-26 14:06:14 +00:00
joeweoj 8a339946fa
Fixed depends_on recreation behaviour for issue #6589 
Previously any containers which did *not* have any links were always recreated.
In order to fix depends_on and preserve expected links recreation behaviour, we now only use the ConvergenceStrategy.always recreation strategy for a service if any of the the following conditions are true:
* --always-recreate-deps flag provided
* service container is stopped
* service defines links but the container does not have any
* container has links but the service definition does not

Signed-off-by: joeweoj <joewardell@gmail.com>
 2019-03-26 11:48:20 +00:00
Ian Campbell 6ccbb56fec
Merge pull request #6494 from collin5/b6464 
Only pull images that can't build `docker-compose pull`
 2019-03-25 13:25:32 +00:00
Collins Abitekaniza c6dd7da15e only pull images that can't build 
Signed-off-by: Collins Abitekaniza <abtcolns@gmail.com>
 2019-03-24 01:05:30 +03:00
Henke Adolfsson 853215acf6
Remove project.stop() in test 
Signed-off-by: Henke Adolfsson <catears13@gmail.com>
 2019-03-08 07:43:53 +01:00
Henke Adolfsson 87935893fc
Update data for unit tests 
Signed-off-by: Henke Adolfsson <catears13@gmail.com>
 2019-03-08 07:43:53 +01:00
Henke Adolfsson aa79fb2473
Ensure test passes 
Signed-off-by: Henke Adolfsson <catears13@gmail.com>
 2019-03-08 07:43:53 +01:00
Henke Adolfsson 76d0406fab
Add test and implementation for secret added after container has been created 
The issue is that if a secret is added to the compose file, then it will
not notice that containers have diverged since last run, because secrets
are not part of the config_hash, which determines if the configuration of
a service is the same or not.

Signed-off-by: Henke Adolfsson <catears13@gmail.com>
 2019-03-08 07:43:53 +01:00
Ian Campbell 7bf9963cd6
Merge pull request #6547 from kudos/bugfix/scale-zero-default 
Fix scale attribute to accept 0 as a value
 2019-03-07 15:40:14 +00:00
Michael Irwin d8e390eb9f Added test case to verify fix for #6525 
Signed-off-by: Michael Irwin <mikesir87@gmail.com>
 2019-03-07 15:30:11 +01:00
Jonathan Cremin 087bef4f95 Add tests for compose file 'scale: 0' 
Signed-off-by: Jonathan Cremin <jonathan@crem.in>
 2019-03-06 12:57:14 +00:00
Ian Campbell 40b0ce3e5d
Merge pull request #6542 from akshitgrover/6028-Add_Quiet_Builds 
Add --quiet build flag
 2019-03-05 14:55:32 +00:00
Peter Nagy (NPE) e34d329227 adds --no-interpolate to docker-compose config 
Signed-off-by: Peter Nagy <pnagy@gratex.com>
 2019-03-04 13:03:35 +01:00
Akshit Grover 1f97a572fe
Add --quiet build flag 
Signed-off-by: Akshit Grover <akshit.grover2016@gmail.com>
 2019-03-02 13:07:23 +05:30
slowr b09d8802ed Added additional argument (--env-file) for docker-compose to import environment variables from a given PATH. 
Signed-off-by: Dimitrios Mavrommatis <jim.mavrommatis@gmail.com>
 2019-02-26 16:38:54 +01:00
tuttieee 572032fc0b Fix Project#build_container_operation_with_timeout_func not to mutate a 'option' dict over multiple containers 
Signed-off-by: Yuichiro Tsuchiya <t.yic.yt@gmail.com>
 2019-02-25 13:07:41 +01:00
Ulysses Souza a35aef4953 Add --no-rm to command build 
- When present, build does not remove
intermediate containers after a successful build.

Signed-off-by: Ulysses Souza <ulysses.souza@docker.com>
 2019-02-20 18:09:09 +01:00
Ulysses Souza c8a621b637 Fix Flake8 lint 
This removes extra indentation and replace the use of `is` by `==` when
comparing strings

Signed-off-by: Ulysses Souza <ulysses.souza@docker.com>
 2019-02-05 11:11:52 +01:00
Collins Abitekaniza c27132afad remove stopped containers on --remove-orphans 
Signed-off-by: Collins Abitekaniza <abtcolns@gmail.com>

kill orphan containers, catch APIError Exception

Signed-off-by: Collins Abitekaniza <abtcolns@gmail.com>

test remove orphans with --no-start

Signed-off-by: Collins Abitekaniza <abtcolns@gmail.com>
 2019-01-25 14:28:56 +03:00
Ulysses Domiciano Souza f158fb03e7
Merge pull request #6364 from ulyssessouza/6350-avoid-warning-on-exec 
Avoids misleading warning concerning env vars when perfoming an `exec` command
 2019-01-21 12:01:31 +01:00
Chris Crone 8f5f7e72be
Merge pull request #6466 from rumpl/credential-spec 
Support for credential_spec
 2019-01-21 11:03:34 +01:00
Djordje Lukic ae0f3c74a0 Support for credential_spec 
Signed-off-by: Djordje Lukic <djordje.lukic@docker.com>
 2019-01-17 16:00:22 +01:00
Djordje Lukic 0c20fc5d91 Resolve digests without pulling image 
If there is no image locally `docker-compose --resolve-image-digests`
will try and get the digest from the repository.

Fixes https://github.com/docker/compose/issues/5818

Signed-off-by: Djordje Lukic <djordje.lukic@docker.com>
 2019-01-15 14:24:26 +01:00
Joffrey F cf96fcb4af
Merge pull request #6452 from docker/collin5-b6446 
Fix failure check in parallel_execute_watch
 2019-01-10 17:55:33 -08:00
Joffrey F 2ed171cae9 Bring zero container check up in the call stack 
Signed-off-by: Joffrey F <joffrey@docker.com>
 2019-01-10 15:48:37 -08:00
Collins Abitekaniza 325637d9d5 test image pull done 
Signed-off-by: Collins Abitekaniza <abtcolns@gmail.com>
 2019-01-10 15:48:37 -08:00
Stephan Müller 56fbd22825
fix race condition after pulling image 
Signed-off-by: Stephan Müller <mail@stephanmueller.eu>
 2019-01-09 23:14:12 +01:00
Joffrey F 4bd93b95a9
Merge pull request #6406 from collin5/b5948 
Error on duplicate mount points.
 2019-01-02 10:11:50 -08:00
Collins Abitekaniza 47ff8d710c test create from config with duplicate mount points 
Signed-off-by: Collins Abitekaniza <abtcolns@gmail.com>
 2019-01-02 17:51:22 +03:00
Andriy Maletsky 01eb4b6250 Lower severity to "warning" if `down` tries to remove nonexisting image 
Signed-off-by: Andriy Maletsky <andriy.maletsky@gmail.com>
 2018-12-28 13:21:23 -08:00
Ulysses Souza f4ed9b2ef5 Detects the execution on an`exec` command and sets the environment to `silent` mode. 
Signed-off-by: Ulysses Souza <ulysses.souza@docker.com>
 2018-12-28 02:43:41 +01:00
Joffrey F b7374b6271
Merge pull request #6390 from ulyssessouza/6369-override-networks-settings 
Fix merge on networks section
 2018-12-28 07:25:57 +09:00
Joffrey F 6b3855335e
Merge pull request #6410 from docker/2618-new-events-api 
Use improved API fields for project events when possible
 2018-12-28 07:22:24 +09:00
Joffrey F 5232100331 Merge branch 'feature/reject_environment_variable_that_contains_white_spaces' of https://github.com/hirochachacha/compose into hirochachacha-feature/reject_environment_variable_that_contains_white_spaces 2018-12-14 13:42:05 -08:00