docker/compose
1
0
Fork 0
mirror of https://github.com/docker/compose.git synced 2026-10-12 10:59:50 +00:00
Code Issues Packages Projects Releases Wiki Activity
5,256 Commits 34 Branches 307 Tags
1.24.1-patch
Commit Graph
5256 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
Djordje Lukic 3fbb9fe51e Bump docker-py 
Signed-off-by: Djordje Lukic <[email protected]>
 2019-06-21 17:30:32 +02:00
Ulysses Souza d9fa8158c3 Merge pull request #6616 from docker/bump-1.24.0 
Bump 1.24.0
1.24.0 		2019-03-28 18:58:40 +01:00
Ulysses Souza 0aa590649c "Bump 1.24.0" 
Signed-off-by: Ulysses Souza <[email protected]>
 2019-03-28 18:34:02 +01:00
Ulysses Souza eb2fdf81b4 Bump docker-py 3.7.2 
Signed-off-by: Ulysses Souza <[email protected]>
 2019-03-28 18:29:27 +01:00
Ulysses Souza 917c2701f2 Fix script for release file already present case 
This avoids a:
"AttributeError: 'HTTPError' object has no attribute 'message'"

Signed-off-by: Ulysses Souza <[email protected]>
 2019-03-28 18:29:25 +01:00
Ulysses Souza 3a3288c54b Merge pull request #6609 from docker/bump-1.24.0-rc3 
Bump 1.24.0-rc3
1.24.0-rc3 		2019-03-22 15:51:21 +01:00
Ulysses Souza 428942498b "Bump 1.24.0-rc3" 
Signed-off-by: Ulysses Souza <[email protected]>
 2019-03-22 15:15:52 +01:00
Ulysses Souza c54341758a Fix bintray docker-compose link 
Signed-off-by: Ulysses Souza <[email protected]>
 2019-03-22 15:15:22 +01:00
Ulysses Souza 662761dbba Fix typo on finalize 
Signed-off-by: Ulysses Souza <[email protected]>
 2019-03-22 15:15:22 +01:00
Ulysses Souza 0e05ac6d2c Use os.system() instead of run_setup() 
Use `os.system()` instead of `run_setup()` because the last
is not taking any effect

Signed-off-by: Ulysses Souza <[email protected]>
 2019-03-22 15:15:22 +01:00
Ulysses Souza 295dd9abda Bump docker-py version to 3.7.1 
This docker-py version includes ssh fixes

Signed-off-by: Ulysses Souza <[email protected]>
 2019-03-22 15:15:21 +01:00
Ben Firshman 81b30c4380 Enable bootloader_ignore_signals in pyinstaller 
Fixes #3347

Signed-off-by: Ben Firshman <[email protected]>
 2019-03-22 15:15:19 +01:00
Michael Irwin 360753ecc1 Added test case to verify fix for #6525 
Signed-off-by: Michael Irwin <[email protected]>
 2019-03-22 15:15:18 +01:00
Michael Irwin 3fae0119ca Fix merging of compose files when network has None config 
Signed-off-by: Michael Irwin <[email protected]>

Resolves #6525
 2019-03-22 15:15:18 +01:00
Christopher Crone 0fdb9783cd circleci: Fix virtualenv version to 16.2.0 
Signed-off-by: Christopher Crone <[email protected]>
 2019-03-22 15:15:17 +01:00
Ulysses Souza 0dec6b5ff1 Fix Flake8 lint 
This removes extra indentation and replace the use of `is` by `==` when
comparing strings

Signed-off-by: Ulysses Souza <[email protected]>
 2019-03-22 15:15:16 +01:00
Christopher Crone e0412a2488 Dockerfile: Force version of virtualenv to 16.2.0 
Signed-off-by: Christopher Crone <[email protected]>
 2019-03-22 15:15:16 +01:00
Christopher Crone 3fc5c6f563 script.build.linux: Do not tail image build logs 
Signed-off-by: Christopher Crone <[email protected]>
 2019-03-22 15:15:16 +01:00
Christopher Crone 28310b3ba4 requirements-dev: Fix version of mock to 2.0.0 
Signed-off-by: Christopher Crone <[email protected]>
 2019-03-22 15:15:16 +01:00
Christopher Crone 4585db124a macOS: Bump Python and OpenSSL 
Signed-off-by: Christopher Crone <[email protected]>
 2019-03-22 15:15:16 +01:00
Ulysses Souza 1f9b20d97b Add --parallel to docker build's options in bash and zsh completion 
Signed-off-by: Ulysses Souza <[email protected]>
 2019-03-22 15:15:13 +01:00
Djordje Lukic 82a89aef1c Support for credential_spec 
Signed-off-by: Djordje Lukic <[email protected]>
 2019-03-22 15:15:12 +01:00
Harald Albers 3934617e37 Add bash completion for ps --all|-a 
Signed-off-by: Harald Albers <[email protected]>
 2019-03-22 15:15:10 +01:00
Djordje Lukic 82db4fd4f2 Merge pull request #6455 from docker/bump-1.24.0-rc1 
Bump 1.24.0-rc1
1.24.0-rc1 		2019-01-14 17:54:34 +01:00
Djordje Lukic 0f3d4ddaa7 "Bump 1.24.0-rc1" 
Signed-off-by: Djordje Lukic <[email protected]>
 2019-01-11 18:28:30 +01:00
Djordje Lukic 2007951731 "Bump 1.24.0-rc1" 
Signed-off-by: Djordje Lukic <[email protected]>
 2019-01-11 17:57:05 +01:00
Djordje Lukic 60f8ce09f9 "Bump 1.24.0-rc1" 
Signed-off-by: Djordje Lukic <[email protected]>
 2019-01-11 17:43:47 +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 bcccac69fa Merge pull request #6444 from qboot/master 
Upgrade pyyaml to 4.2b1
 2019-01-10 16:31:29 -08:00
Joffrey F 2ec7615ed6 Merge pull request #6448 from smueller18/race-condition-pull 
fix race condition after pulling image
 2019-01-10 15:53:07 -08:00
Joffrey F 2ed171cae9 Bring zero container check up in the call stack 
Signed-off-by: Joffrey F <[email protected]>
 2019-01-10 15:48:37 -08:00
Collins Abitekaniza 325637d9d5 test image pull done 
Signed-off-by: Collins Abitekaniza <[email protected]>
 2019-01-10 15:48:37 -08:00
Collins Abitekaniza bab8b3985e check for started containers only on service_start 
Signed-off-by: Collins Abitekaniza <[email protected]>
 2019-01-10 15:48:37 -08:00
Joffrey F 532d00fede Merge pull request #6451 from docker/bump_sdk 
Bump SDK version -> 3.7.0
 2019-01-10 14:52:48 -08:00
Joffrey F ab0a0d69d9 Bump SDK version -> 3.7.0 
Signed-off-by: Joffrey F <[email protected]>
 2019-01-10 14:25:20 -08:00
Stephan Müller 56fbd22825 fix race condition after pulling image 
Signed-off-by: Stephan Müller <[email protected]>
 2019-01-09 23:14:12 +01:00
Quentin Brunet 8419a670ae Upgrade pyyaml to 4.2b1 
Signed-off-by: Quentin Brunet <[email protected]>
 2019-01-08 14:19:57 +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 <[email protected]>
 2019-01-02 17:51:22 +03:00
Collins Abitekaniza d980d170a6 error on duplicate mount points 
Signed-off-by: Collins Abitekaniza <[email protected]>
 2019-01-02 17:34:26 +03:00
Joffrey F f9061720b5 Merge pull request #6434 from docker/and800-master 
Lower severity to "warning" if `down` tries to remove nonexisting image
 2018-12-28 14:25:33 -08:00
Andriy Maletsky 01eb4b6250 Lower severity to "warning" if down tries to remove nonexisting image 
Signed-off-by: Andriy Maletsky <[email protected]>
 2018-12-28 13:21:23 -08: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 6e697c3b97 Merge pull request #6419 from docker/6416-runsh-no-input 
Always connect Compose container to stdin
 2018-12-20 08:47:24 +09:00
Joffrey F fee5261014 Always connect Compose container to stdin 
Signed-off-by: Joffrey F <[email protected]>
 2018-12-19 00:24:33 -08:00
Joffrey F 0612d973c7 Merge branch 'hirochachacha-feature/reject_environment_variable_that_contains_white_spaces' 2018-12-14 14:37:36 -08:00
Joffrey F 0323920957 Style and language fixes 
Signed-off-by: Joffrey F <[email protected]>
 2018-12-14 14:36:40 -08: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
Joffrey F 8b293d486e Use improved API fields for project events when possible 
Signed-off-by: Joffrey F <[email protected]>
 2018-12-13 14:13:20 -08:00