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

5177 Commits

Author SHA1 Message Date
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 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
Joffrey F d1bf27e73a Bump SDK version 
Signed-off-by: Joffrey F <joffrey@docker.com>
 2018-11-28 11:53:26 -08: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
Joffrey F ccc777831c Don't add long path prefix to build context URLs 
Signed-off-by: Joffrey F <joffrey@docker.com>
 2018-11-26 15:26:27 -08:00
Joffrey F 2975b5a279
Merge pull request #6352 from hartwork/issue-6302-stop-run-from-leaving-restarting-containers-behind 
Fix one-off commands for "restart: unless-stopped" (fixes #6302)
 2018-11-26 15:25:32 -08:00
Sebastian Pipping e7f82d2989 Rename build_container_options to build_one_off_container_options 
.. to better reflect that its scope is limited to one-off execution
(i.e. the "run" command)

Signed-off-by: Sebastian Pipping <sebastian@pipping.org>
 2018-11-26 23:23:56 +01:00
Sebastian Pipping 6559af7660 Fix one-off commands for "restart: unless-stopped" (fixes #6302) 
Signed-off-by: Sebastian Pipping <sebastian@pipping.org>
 2018-11-26 23:23:56 +01:00
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