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

5162 Commits

Author SHA1 Message Date
Joffrey F c32bc095f3
Merge pull request #6363 from ulyssessouza/6157-build-from-source 
Adopts 'unknown' as build revision in case git cannot retrieve it.
 2018-11-26 12:57:37 -08:00
Ulysses Souza 1affc55b17 Adopts 'unknown' as build revision in case git cannot retrieve it. 
Signed-off-by: Ulysses Souza <ulysses.souza@docker.com>
 2018-11-22 15:58:41 +01:00
Joffrey F e86e10fb6b
Merge pull request #6327 from collin5/b6271 
Add option for `--all` flag to `ps`
 2018-11-15 14:32:58 -08:00
Collins Abitekaniza e0e06a4b56 add detail to description for --all flag 
Signed-off-by: Collins Abitekaniza <abtcolns@gmail.com>
 2018-11-15 15:24:50 +03:00
Collins Abitekaniza 05efe52ccd test --all flag 
Signed-off-by: Collins Abitekaniza <abtcolns@gmail.com>
 2018-11-06 14:59:48 +03:00
Collins Abitekaniza ba1e0311a7 add option to list all processes 
Signed-off-by: Collins Abitekaniza <abtcolns@gmail.com>
 2018-11-06 14:52:24 +03:00
Joffrey F 8edb0d872d
Merge pull request #6326 from docker/6325-fix-validation-error-parsing 
Fix validation error parsing to not raise on non-string keys
 2018-11-05 14:27:03 -08:00
Joffrey F d5eb209be0 Fix parse_key_from_error_msg to not error out on non-string keys 
Signed-off-by: Joffrey F <joffrey@docker.com>
 2018-11-05 14:02:13 -08:00
Joffrey F f009de025c
Merge pull request #6322 from alexpusch/fix/zsh-autocomplete 
Fix ZSH autocomplete for multiple -f flags
 2018-11-05 11:25:59 -08:00
Alex Puschinsky 5b02922455 Fix ZSH autocomplete for multiple -f flags 
Signed-off-by: Alex Puschinsky <alexpoo@gmail.com>
 2018-11-03 18:37:34 +02:00
Joffrey F 2b604c1e8b
Merge pull request #6320 from docker/6319-isolation-storageopt-merge 
Fix config merging for isolation and storage_opt keys
 2018-11-02 14:08:07 -07:00
Joffrey F db819bf0b2 Fix config merging for isolation and storage_opt keys 
Signed-off-by: Joffrey F <joffrey@docker.com>
 2018-11-02 11:35:34 -07:00
Joffrey F afa5d93c90
Merge pull request #6313 from docker/6310-fix-project-directory 
Impose consistent behavior across command for --project-directory flag
 2018-10-31 15:14:22 -07:00
Joffrey F fb8cd7d813
Merge pull request #6244 from Cyral/windows-conn-err-msg 
Show more helpful error message when Docker is not running. Fixes #6175
 2018-10-31 14:56:08 -07:00
Joffrey F 8f4d56a648 Impose consistent behavior across command for --project-directory flag 
Signed-off-by: Joffrey F <joffrey@docker.com>
 2018-10-31 14:35:09 -07:00
Joffrey F 9b12f489aa
Merge pull request #6312 from docker/6311-container_slug_none 
Don't attempt to truncate a None value in Container.slug
 2018-10-31 14:25:53 -07:00
Joffrey F 03bdd67eb5 Don't attempt to truncate a None value in Container.slug 
Signed-off-by: Joffrey F <joffrey@docker.com>
 2018-10-31 13:55:20 -07:00
Joffrey F 69fe42027a
Merge pull request #6297 from docker/6293-cli-protocols 
Only use supported protocols when starting engine CLI subprocess
 2018-10-30 16:31:05 -05:00
Joffrey F 7925f8cfa8 Fix version 
Signed-off-by: Joffrey F <joffrey@docker.com>
 2018-10-30 14:30:11 -07:00
Joffrey F 147a8e9ab8 Bump next dev version 
Signed-off-by: Joffrey F <joffrey@docker.com>
 2018-10-30 14:29:07 -07:00
Joffrey F 91182ccb34 Merge branch 'release' 
Signed-off-by: Joffrey F <joffrey@docker.com>
 2018-10-30 14:26:40 -07:00
Joffrey F a7ca78d854
Merge pull request #6306 from docker/bump-1.23.0 
Bump 1.23.0
 2018-10-30 16:06:05 -05:00
Joffrey F 9194b8783e
Merge pull request #6307 from docker/bump_requests 
Bump requests version in requirements.txt
 2018-10-29 18:33:25 -05:00
Joffrey F c8524dc1aa Bump requests version in requirements.txt 
Signed-off-by: Joffrey F <joffrey@docker.com>
 2018-10-29 14:40:32 -07:00
Joffrey F fd83791d55 Bump requests version in requirements.txt 
Signed-off-by: Joffrey F <joffrey@docker.com>
 2018-10-29 14:38:50 -07:00
Joffrey F 140431d3b9 "Bump 1.23.0" 
Signed-off-by: Joffrey F <joffrey@docker.com>
 2018-10-29 12:22:22 -07:00
Joffrey F 3104597e7d "Bump 1.23.0" 
Signed-off-by: Joffrey F <joffrey@docker.com>
 2018-10-29 11:43:45 -07:00
Joffrey F 1c002b5844 Fix new flake8 errors/warnings 
Signed-off-by: Joffrey F <joffrey@docker.com>
 2018-10-29 11:38:22 -07:00
Ofek Lev 8f9ead34d3 Allow requests 2.20.x 
Signed-off-by: Ofek Lev <ofekmeister@gmail.com>
 2018-10-29 11:38:20 -07:00
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 4368b8ac05 Only use supported protocols when starting engine CLI subprocess 
Signed-off-by: Joffrey F <joffrey@docker.com>
 2018-10-24 16:08:56 -07: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 7bd4291f90
Merge pull request #6286 from docker/bump-1.23.0-rc3 
Bump 1.23.0-rc3
 2018-10-17 14:48:37 -07:00
Joffrey F ea3d406eed Some additional exclusions in .gitignore / .dockerignore 
Signed-off-by: Joffrey F <joffrey@docker.com>
 2018-10-17 13:40:42 -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 45189c134d "Bump 1.23.0-rc3" 
Signed-off-by: Joffrey F <joffrey@docker.com>
 2018-10-17 12:16:34 -07:00
Joffrey F 5ab3e47b42 Add workaround for Debian/Ubuntu venv setup failure 
Signed-off-by: Joffrey F <joffrey@docker.com>
 2018-10-17 12:12:52 -07:00
Joffrey F 0fa1462b0f 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-17 12:12:51 -07:00
Joffrey F 5e4098d228 Avoid creating duplicate mount points when recreating a service 
Signed-off-by: Joffrey F <joffrey@docker.com>
 2018-10-17 12:12:50 -07:00
Joffrey F 12f7e0d2fb Remove obsolete curl dependency 
Signed-off-by: Joffrey F <joffrey@docker.com>
 2018-10-17 12:12:50 -07:00
Joffrey F 23beeb353c Update versions in Dockerfiles 
Signed-off-by: Joffrey F <joffrey@docker.com>
 2018-10-17 12:12:50 -07:00
Joffrey F da25be8f99 Fix ImageManager inconsistencies 
Signed-off-by: Joffrey F <joffrey@docker.com>
 2018-10-17 12:12:49 -07:00
Joffrey F c9107cff39 Fix arg checks in release.sh 
Signed-off-by: Joffrey F <joffrey@docker.com>
 2018-10-17 12:12:49 -07:00
Joffrey F 51d44c7ebc Add pypirc check 
Signed-off-by: Joffrey F <joffrey@docker.com>
 2018-10-17 12:12:49 -07:00
Ofek Lev e722190d50 Update requirements.txt 
Signed-off-by: Ofek Lev <ofekmeister@gmail.com>
 2018-10-17 12:12:48 -07:00
Ofek Lev fe347321c9 Upgrade Windows-specific dependency colorama 
Signed-off-by: Ofek Lev <ofekmeister@gmail.com>
 2018-10-17 12:12:48 -07:00
Andrew Rabert 9bccfa8dd0 Use Docker binary from official Docker image 
Signed-off-by: Andrew Rabert <ar@nullsum.net>
 2018-10-17 12:12:47 -07:00