tyler.durden
/
compose
mirror of https://github.com/docker/compose.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity
5,420 Commits 24 Branches 262 Tags 66 MiB
Commit Graph

5420 Commits

Author SHA1 Message Date
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
Collins Abitekaniza d980d170a6 error on duplicate mount points 
Signed-off-by: Collins Abitekaniza <abtcolns@gmail.com>
 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 <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 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 <joffrey@docker.com>
 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 <joffrey@docker.com>
 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 <joffrey@docker.com>
 2018-12-13 14:13:20 -08:00
Ulysses Souza a2bcf52665 Fix merge on networks section 
Signed-off-by: Ulysses Souza <ulysses.souza@docker.com>
 2018-12-11 10:36:49 +01:00
Hiroshi Ioka afc161a0b1 reject environment variable that contains white spaces 
Signed-off-by: Hiroshi Ioka <hirochachacha@gmail.com>
 2018-12-11 12:52:29 +09:00
Joffrey F 14e7a11b3c
Merge pull request #6346 from collin5/b5469 
Show failed services 'docker-compose start' when containers are not availabe
 2018-12-10 15:39:16 -08:00
Joffrey F c139455fce Merge branch 'ulyssessouza-6245-docker-compose-multiple-push' 2018-12-04 17:14:12 -08:00
Joffrey F d3933cd34a Move multi-push test to unit tests 
Signed-off-by: Joffrey F <joffrey@docker.com>
 2018-12-04 17:13:40 -08:00
Joffrey F 5b2092688a Merge branch '6245-docker-compose-multiple-push' of https://github.com/ulyssessouza/compose into ulyssessouza-6245-docker-compose-multiple-push 2018-12-04 17:10:31 -08:00
Joffrey F 64633a81cc
Merge pull request #6389 from docker/6386-update-setup-py 
Update setup.py for modern pypi /setuptools
 2018-12-04 13:22:41 -08:00
Joffrey F fc3df83d39 Update setup.py for modern pypi /setuptools 
Remove pandoc dependencies

Signed-off-by: Joffrey F <joffrey@docker.com>
 2018-11-30 17:59:55 -08:00
Joffrey F 0fc3b51b50
Merge pull request #6388 from docker/6336-enable-ssh-support 
Add SSH-enabled docker SDK to requirements
 2018-11-30 17:31:32 -08:00
Joffrey F 7b82b2e8c7 Add SSH-enabled docker SDK to requirements 
Signed-off-by: Joffrey F <joffrey@docker.com>
 2018-11-30 16:24:38 -08:00
Joffrey F cfa5d02b52 Merge branch 'release' 2018-11-30 16:17:36 -08:00
Joffrey F dd240787c2
Merge pull request #6387 from ulyssessouza/reorder-imports-update 
Update `reorder_python_imports` version to fix Unicode problems
 2018-11-30 16:15:54 -08:00
Ulysses Souza d563a66405 Update `reorder_python_imports` version to fix Unicode problems 
Signed-off-by: Ulysses Souza <ulysses.souza@docker.com>
 2018-12-01 00:35:34 +01:00
Joffrey F b0c10cb876
Merge pull request #6382 from docker/bump-1.23.2 
Bump 1.23.2
 2018-11-28 15:14:02 -08:00
Joffrey F dd927e0fdd
Merge pull request #6381 from docker/incorrect_precreate_identifier 
Fix incorrect pre-create container name in up logs
 2018-11-28 14:52:12 -08:00
Joffrey F 1110ad0108 "Bump 1.23.2" 
Signed-off-by: Joffrey F <joffrey@docker.com>
 2018-11-28 14:26:26 -08:00
Joffrey F f266e3459d Fix incorrect pre-create container name in up logs 
Signed-off-by: Joffrey F <joffrey@docker.com>
 2018-11-28 14:24:54 -08:00
Joffrey F bffb6094da Bump SDK version 
Signed-off-by: Joffrey F <joffrey@docker.com>
 2018-11-28 14:24:54 -08:00
Joffrey F 66ed9b492e Don't append slugs to containers created by "up" 
This change reverts the new naming convention introduced in 1.23 for service containers.
One-off containers will now use a slug instead of a sequential number as they do not
present addressability concerns and benefit from being capable of running in parallel.

Signed-off-by: Joffrey F <joffrey@docker.com>
 2018-11-28 14:24:30 -08:00
Joffrey F 07e2717bee Don't add long path prefix to build context URLs 
Signed-off-by: Joffrey F <joffrey@docker.com>
 2018-11-28 14:24:03 -08:00
Joffrey F dce70a5566 Fix parse_key_from_error_msg to not error out on non-string keys 
Signed-off-by: Joffrey F <joffrey@docker.com>
 2018-11-28 14:24:02 -08:00
Joffrey F 4682e766a3 Fix config merging for isolation and storage_opt keys 
Signed-off-by: Joffrey F <joffrey@docker.com>
 2018-11-28 14:23:17 -08:00
Joffrey F 8a0090c18c Only use supported protocols when starting engine CLI subprocess 
Signed-off-by: Joffrey F <joffrey@docker.com>
 2018-11-28 14:22:41 -08:00
Joffrey F a7894ddfea Fix incorrect pre-create container name in up logs 
Signed-off-by: Joffrey F <joffrey@docker.com>
 2018-11-28 14:19:21 -08:00
Joffrey F 516eae0f5a
Merge pull request #6379 from docker/bump_sdk 
Bump SDK version - 3.6.0
 2018-11-28 13:20:09 -08:00
Joffrey F 4bc1cbc32a
Merge pull request #6377 from docker/6316-noslug 
Don't append slugs to containers created by "up"
 2018-11-28 12:15:23 -08:00
Ulysses Souza d9e05f262f Avoids pushing the same image more than once. 
Signed-off-by: Ulysses Souza <ulysses.souza@docker.com>
 2018-11-28 20:55:54 +01:00
Joffrey F d1bf27e73a Bump SDK version 
Signed-off-by: Joffrey F <joffrey@docker.com>
 2018-11-28 11:53:26 -08:00
Collins Abitekaniza b8b6199958 refactor cli tests 
Signed-off-by: Collins Abitekaniza <abtcolns@gmail.com>
 2018-11-28 15:44:58 +03:00
Collins Abitekaniza dbe3a6e9a9 stdout failed for failing services 
Signed-off-by: Collins Abitekaniza <abtcolns@gmail.com>
 2018-11-28 15:44:54 +03:00
Joffrey F 61bb1ea484 Don't append slugs to containers created by "up" 
This change reverts the new naming convention introduced in 1.23 for service containers.
One-off containers will now use a slug instead of a sequential number as they do not
present addressability concerns and benefit from being capable of running in parallel.

Signed-off-by: Joffrey F <joffrey@docker.com>
 2018-11-27 18:58:55 -08:00
Joffrey F eedbb28d5e
Merge pull request #6371 from docker/6354-url-builds 
Don't add long path prefix to build context URLs
 2018-11-26 17:47:36 -08:00
Joffrey F 2e20097f56
Merge pull request #6351 from hartwork/readme-improvements 
Small improvements to README.md
 2018-11-26 15:41:29 -08:00
Sebastian Pipping 10864ba687 README.md: Update bug report link 
Signed-off-by: Sebastian Pipping <sebastian@pipping.org>
 2018-11-27 00:26:56 +01:00
Sebastian Pipping 6421ae5ea3 README.md: Add a few missing full stops 
One full stop is moved out of a link
and a "Thank you!" is added as well.

Signed-off-by: Sebastian Pipping <sebastian@pipping.org>
 2018-11-27 00:26:56 +01:00
Sebastian Pipping 6ea20e43f6 README.md: Drop reference to IRC channel 
Signed-off-by: Sebastian Pipping <sebastian@pipping.org>
 2018-11-27 00:26:56 +01:00