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

5168 Commits

Author SHA1 Message Date
Heath Milligan abf67565f6 Show more helpful error message when Docker is not running. Fixes #6175 
Signed-off-by: Heath Milligan <heath@pyratron.com>
 2018-10-02 14:25:33 -04:00
Joffrey F 7208a50bdc
Merge pull request #6237 from gmsantos/patch-1 
Reffer Docker for Mac and Windows as Docker Desktop
 2018-10-02 11:14:58 +02:00
Gabriel Machado 8493540a1c Reffer Docker for Mac and Windows as Docker Desktop 
Signed-off-by: Gabriel Machado <gabriel.ms1@hotmail.com>
 2018-09-29 21:17:26 -03:00
Emil Hessman 15089886c2 Avoid modifying mutable default value 
Rationale: http://effbot.org/zone/default-values.htm

Signed-off-by: Emil Hessman <emil@hessman.se>
 2018-09-29 18:32:47 +02:00
Joffrey F 48a6f2132b
Merge pull request #6230 from albers/completion-services--hash 
Fix bash completion for `config --hash`
 2018-09-27 14:36:56 -07:00
Joffrey F 467d910959
Merge pull request #6221 from Dimrok/feature/volumes-order 
Preserve volumes order as declared in the compose file.
 2018-09-27 14:15:26 -07:00
Antony MECHIN 5b9b519e8a utils: Fix typo in unique_everseen. 
Signed-off-by: Antony MECHIN <antony.mechin@docker.com>
 2018-09-27 14:17:32 +02:00
Harald Albers b29ffb49e9 Fix bash completion for `config --hash` 
Signed-off-by: Harald Albers <github@albersweb.de>
 2018-09-27 09:20:44 +02:00
Joffrey F c5d5d42158
Merge pull request #6222 from docker/bump-1.23.0-rc1 
Bump 1.23.0-rc1
 2018-09-26 15:18:00 -07:00
Joffrey F c17274d014
Merge pull request #6227 from docker/release-credentials 
Avoid cred helpers errors in release script
 2018-09-26 15:09:06 -07:00
Joffrey F 320e4819d8 Avoid cred helpers errors in release script 
Signed-off-by: Joffrey F <joffrey@docker.com>
 2018-09-26 21:10:56 +00:00
Joffrey F 772a307192 Avoid cred helpers errors in release script 
Signed-off-by: Joffrey F <joffrey@docker.com>
 2018-09-26 13:58:13 -07:00
Antony MECHIN bf46a6cc60 service: Use OrderedDict to preserve volumes order on versions prior 3.6. 
Signed-off-by: Antony MECHIN <antony.mechin@docker.com>
 2018-09-26 15:57:27 +02:00
Antony MECHIN 39b0518850 tests.unity.service: Make sure volumes order is preserved. 
Signed-off-by: Antony MECHIN <antony.mechin@docker.com>
 2018-09-26 15:57:27 +02:00
Antony MECHIN de1958c5ff utils: Add unique_everseen (from itertools recipies). 
Signed-off-by: Antony MECHIN <antony.mechin@docker.com>
 2018-09-26 15:57:27 +02:00
Antony MECHIN bbcfce4029 tests.unit.config: Make sure volume order is preserved. 
Signed-off-by: Antony MECHIN <antony.mechin@docker.com>
 2018-09-26 15:57:27 +02:00
Antony MECHIN 879f7cb1ed tests.unit.config: Make make_service_dict working dir argument optional. 
Signed-off-by: Antony MECHIN <antony.mechin@docker.com>
 2018-09-26 10:26:55 +02:00
Joffrey F c327a498b0 Don't rely on container names containing the db string to identify them 
Signed-off-by: Joffrey F <joffrey@docker.com>
 2018-09-25 23:45:10 +00:00
Joffrey F 47d740b800 Fix some release script issues 
Signed-off-by: Joffrey F <joffrey@docker.com>
 2018-09-25 23:45:08 +00:00
Joffrey F 54c3136e34
Merge pull request #6225 from docker/fix_recreate_tests 
Don't rely on container names containing the db string to identify them
 2018-09-25 10:49:03 -07:00
Joffrey F cc2462e6f4 Don't rely on container names containing the db string to identify them 
Signed-off-by: Joffrey F <joffrey@docker.com>
 2018-09-25 09:13:12 -07:00
Joffrey F 6194d78813
Merge pull request #6223 from docker/release_script_upgrade 
Fix some release script issues
 2018-09-25 09:03:36 -07:00
Joffrey F 4b4c250638 Fix some release script issues 
Signed-off-by: Joffrey F <joffrey@docker.com>
 2018-09-24 20:05:40 -07:00
Joffrey F ec4ea8d2f1 "Bump 1.23.0-rc1" 
Signed-off-by: Joffrey F <joffrey@docker.com>
 2018-09-25 00:46:52 +00:00
Joffrey F 936e6971f9 "Bump 1.23.0-rc1" 
Signed-off-by: Joffrey F <joffrey@docker.com>
 2018-09-24 23:46:38 +00:00
Joffrey F de2be2bf37
Merge pull request #6168 from jrbenito/update_armhf 
[armhf] Make Dockerfile.armhf compatible with main
 2018-09-21 16:05:32 -07:00
Joffrey F 2a7beb6350
Merge pull request #6204 from docker/5716-unix-paths-from-winhost 
Don't convert slashes for UNIX paths on Windows hosts
 2018-09-21 10:47:22 -07:00
Joffrey F 30afcc4994
Merge pull request #6209 from docker/images-use-service-tag 
Images use service tag
 2018-09-20 16:51:26 -07:00
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
Joffrey F 7d0fb7d3f3 Rewrite images command method to decrease complexity 
Also ensure we properly detect matching image names when tag is omitted

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
Boris HUISGEN a2ec572fdf Use same tag as service definition 
Signed-off-by: Boris HUISGEN <bhuisgen@hbis.fr>
 2018-09-20 15:48:08 -07:00
Joffrey F 0fb6cd1139
Merge pull request #6205 from docker/2473-windows-long-paths 
Force consistent behavior around long paths on Windows builds
 2018-09-19 18:11:29 -07:00
Joffrey F 96a49a0253 Force consistent behavior around long paths on Windows builds 
Signed-off-by: Joffrey F <joffrey@docker.com>
 2018-09-19 16:09:21 -07:00
Joffrey F f80630ffcf
Merge pull request #6140 from docker/4688_no_sequential_ids 
Add randomly generated slug to container names to prevent collisions
 2018-09-19 15:12:41 -07:00
Joffrey F 9f9122cd95 Don't convert slashes for UNIX paths on Windows hosts 
Signed-off-by: Joffrey F <joffrey@docker.com>
 2018-09-19 11:36:51 -07:00
Joffrey F a5f42ae9e4
Merge pull request #6184 from docker/fix-zsh-completion 
Update zsh completion with new options, and ensure service names are properly retrieved
 2018-09-13 17:01:03 -07:00
Joffrey F 17d4845dbb
Merge pull request #6186 from maxwellb/patch-1 
Handle userns security
 2018-09-12 17:04:37 -07:00
Maxwell Bloch a7c05f41f1 Handle userns security 
- Adds `--userns=host` when `userns-remap` is set

Signed-off-by: Maxwell Bloch <maxwellbloch@live.com>
 2018-09-12 19:29:03 -04:00
Joffrey F 265d9dae4b Update zsh completion with new options, and ensure service names are properly retrieved 
Signed-off-by: Joffrey F <joffrey@docker.com>
 2018-09-12 16:17:30 -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 bd8b2dfbbc
Merge pull request #6178 from docker/update-versions-script 
Skip testing TPs/betas for now
 2018-09-10 15:44:42 -07:00
Joffrey F d491a81cec Skip testing TPs/betas for now 
Signed-off-by: Joffrey F <joffrey@docker.com>
 2018-09-10 15:08:10 -07:00
Joffrey F bdd2c80d98
Merge pull request #6172 from riverzhang/typo 
Fix some typos
 2018-09-07 11:41:52 -07:00
Joffrey F 58c5b92f09
Merge pull request #6173 from mirake/fix-typo 
Typo fix: overriden -> overridden
 2018-09-07 11:41:00 -07:00
Joffrey F 7e6275219b
Merge pull request #6171 from tossmilestone/fix-typos 
Fix typos in CHANGELOG
 2018-09-07 11:27:30 -07:00
rongzhang 373c83ccd7 Fix some typo 
Signed-off-by: rongzhang <rongzhang@alauda.io>
 2018-09-07 16:57:43 +08:00
Xiaoxi He b66782b412 Fix typos in CHANGELOG 
Signed-off-by: Xiaoxi He <xxhe@alauda.io>
 2018-09-07 16:42:38 +08:00
ruicao 5713215e84 Typo fix: overriden -> overridden 
Signed-off-by: ruicao <ruicao@alauda.io>
 2018-09-07 16:08:19 +08:00