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

5098 Commits

Author SHA1 Message Date
Joffrey F f0264e1991
Merge pull request #6289 from ofek/ofek/requests 
Allow requests 2.20.x for CVE fix
 2018-10-24 19:26:27 -05:00
Ofek Lev e008db5c97 Allow requests 2.20.x 
Signed-off-by: Ofek Lev <ofekmeister@gmail.com>
 2018-10-24 19:48:39 -04:00
Joffrey F 2f5d5fc93f
Merge pull request #6296 from docker/flake8-update 
Fix new flake8 errors/warnings
 2018-10-24 17:32:47 -05:00
Joffrey F 98bb68e404 Fix new flake8 errors/warnings 
Signed-off-by: Joffrey F <joffrey@docker.com>
 2018-10-24 15:06:04 -07:00
Joffrey F de8717cd07
Merge pull request #6288 from docker/update_dockerignore 
Some additional exclusions in .gitignore / .dockerignore
 2018-10-17 14:59:12 -07:00
Joffrey F ca8ab06571 Some additional exclusions in .gitignore / .dockerignore 
Signed-off-by: Joffrey F <joffrey@docker.com>
 2018-10-17 13:39:11 -07:00
Joffrey F 956434504c
Merge pull request #6285 from docker/fix_venv_script 
[Release script] Add workaround for Debian/Ubuntu venv setup failure
 2018-10-17 12:11:13 -07:00
Joffrey F 7712d19b32 Add workaround for Debian/Ubuntu venv setup failure 
Signed-off-by: Joffrey F <joffrey@docker.com>
 2018-10-17 12:10:08 -07:00
Joffrey F b1adcfb7e3
Merge pull request #6284 from docker/new-issue-templates 
Update issue templates
 2018-10-17 10:54:04 -07:00
Joffrey F 5017b25f14 Update issue templates 
Signed-off-by: Joffrey F <joffrey@docker.com>
 2018-10-16 18:18:21 -07:00
Joffrey F 12ed765af8
Merge pull request #6282 from docker/6279-abolish-dot-separator 
Don't use dot as a path separator as it is a valid character in resource identifiers
 2018-10-16 17:43:37 -07:00
Joffrey F 62057d098f Don't use dot as a path separator as it is a valid character in resource identifiers 
Signed-off-by: Joffrey F <joffrey@docker.com>
 2018-10-16 17:21:57 -07:00
Joffrey F fdb7a16212
Merge pull request #6281 from docker/6280-mount-overrides-volume 
Avoid creating duplicate mount points when recreating a service
 2018-10-16 16:22:47 -07:00
Joffrey F 5b869b1ad5
Merge pull request #6277 from docker/bump_dockerfile_versions 
Update versions in Dockerfiles
 2018-10-16 16:22:35 -07:00
Joffrey F 4cb92294a3 Avoid creating duplicate mount points when recreating a service 
Signed-off-by: Joffrey F <joffrey@docker.com>
 2018-10-16 13:57:01 -07:00
Joffrey F 9df0a4f3a9 Remove obsolete curl dependency 
Signed-off-by: Joffrey F <joffrey@docker.com>
 2018-10-15 19:22:25 -07:00
Joffrey F 3844ff2fde Update versions in Dockerfiles 
Signed-off-by: Joffrey F <joffrey@docker.com>
 2018-10-15 19:14:58 -07:00
Joffrey F d82190025a
Merge pull request #6265 from ofek/ofek/colorama 
Upgrade Windows-specific dependency colorama
 2018-10-15 15:50:02 -07:00
Joffrey F 013cb51582
Merge pull request #6270 from docker/release_script_upgrade 
Release script upgrade
 2018-10-15 15:47:32 -07:00
Ofek Lev 402060e419 Update requirements.txt 
Signed-off-by: Ofek Lev <ofekmeister@gmail.com>
 2018-10-12 11:36:38 -04:00
Joffrey F bd67b90869 Fix ImageManager inconsistencies 
Signed-off-by: Joffrey F <joffrey@docker.com>
 2018-10-12 06:39:56 -07:00
Joffrey F 297bee897b Fix arg checks in release.sh 
Signed-off-by: Joffrey F <joffrey@docker.com>
 2018-10-12 06:14:35 -07:00
Joffrey F be324d57a2 Add pypirc check 
Signed-off-by: Joffrey F <joffrey@docker.com>
 2018-10-12 06:13:55 -07:00
Ofek Lev c7c5b5e8c4 Upgrade Windows-specific dependency colorama 
Signed-off-by: Ofek Lev <ofekmeister@gmail.com>
 2018-10-10 22:16:25 -04:00
Joffrey F 9018511750
Merge pull request #6234 from zasca/tilda_src_paths 
Improved expanding source paths of volumes
 2018-10-08 18:51:40 +02:00
Joffrey F 7107431ae0
Merge pull request #6253 from nvllsvm/dockerbase 
Use docker binary from official Docker image
 2018-10-08 18:49:51 +02:00
Andrew Rabert 21a51bcd60 Use Docker binary from official Docker image 
Signed-off-by: Andrew Rabert <ar@nullsum.net>
 2018-10-08 11:56:42 -04:00
Joffrey F 5629f62644
Merge pull request #6236 from ceh-forks/mutable-default-values 
Avoid modifying mutable default value
 2018-10-08 10:22:02 +02:00
Joffrey F 756eae0f01
Merge pull request #6251 from docker/decontainerize-release 
Decontainerize release script
 2018-10-05 19:03:23 +02:00
Joffrey F 6a35663781 Decontainerize release script 
Credentials management inside containers is a mess. Let's work on the host instead.

Signed-off-by: Joffrey F <joffrey@docker.com>
 2018-10-05 08:21:39 -07:00
Alexander 9d7202d122 Squashed commit of the following: 
commit d3fbd3d630099dc0d34cb1a93b0a664f633a1c25
Author: zasca <gorstav@gmail.com>
Date:   Wed Oct 3 11:27:43 2018 +0600

    Fix typo in function name, path separator updated

commit bc3f03cd9a7702b3f2d96b18380d75e10f18def0
Author: zasca <gorstav@gmail.com>
Date:   Tue Oct 2 11:12:28 2018 +0600

    Fix endswith arg in the test

commit 602d2977b4e881850c99c7555bc284690a802815
Author: zasca <gorstav@gmail.com>
Date:   Mon Oct 1 12:24:17 2018 +0600

    Update test

commit 6cd7a4a2c411ddf9b8e7d91194c60fb2238db8d7
Author: zasca <gorstav@gmail.com>
Date:   Fri Sep 28 11:13:36 2018 +0600

    Fix last test

commit 0d37343433caceec18ea15babf924b5975b83c80
Author: zasca <gorstav@gmail.com>
Date:   Fri Sep 28 10:58:57 2018 +0600

    Unit test added

commit fc086e544677dd33bad798c773cb92600aaefc51
Author: zasca <gorstav@gmail.com>
Date:   Thu Sep 27 20:28:03 2018 +0600

    Improved expanding source paths of volumes

    defined with long syntax when paths starts with '~'

    Signed-off-by: Alexander <a.gorst.vinia@gmail.com>
 2018-10-05 14:52:56 +06:00
Joffrey F e3e93d40a8
Merge pull request #6248 from docker/test-betas-and-tps 
Re-enable testing of TP and beta releases
 2018-10-04 11:14:41 +02:00
Joffrey F feccc03e4a
Merge pull request #6247 from docker/fix_parallel_pull_noimg 
Don't attempt iterating on None during parallel pull
 2018-10-04 11:04:11 +02:00
Joffrey F b21a06cd6f Re-enable testing of TP and beta releases 
Signed-off-by: Joffrey F <joffrey@docker.com>
 2018-10-04 01:40:39 -07:00
Joffrey F 7b02f4c3a7
Merge pull request #6246 from docker/fix_twine_upload 
Fix twine upload for RC versions
 2018-10-04 10:39:31 +02:00
Joffrey F cc595a65f0 Don't attempt iterating on None during parallel pull 
Signed-off-by: Joffrey F <joffrey@docker.com>
 2018-10-04 01:09:48 -07:00
Joffrey F 25e419c763 Fix twine upload for RC versions 
Signed-off-by: Joffrey F <joffrey@docker.com>
 2018-10-04 00:48:53 -07: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 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 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