tyler.durden
/
compose
mirror of https://github.com/docker/compose.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity
3,346 Commits 20 Branches 267 Tags 56 MiB
Commit Graph

3346 Commits

Author SHA1 Message Date
Joffrey F 606358cfb7 Update docker-py requirement to the latest release 
Signed-off-by: Joffrey F <joffrey@docker.com>
 2016-07-27 16:27:05 +01:00
Aanand Prasad 0488dd3709 Rename --fetch-digests to --push-images and remove auto-pull 
Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
 2016-07-27 16:27:05 +01:00
Aanand Prasad b72f911ccf Fix timeout value in error message 
Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
 2016-07-27 16:27:05 +01:00
Aanand Prasad f9c5816ab8 Stop checking the deprecated DOCKER_CLIENT_TIMEOUT variable 
Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
 2016-07-27 16:27:05 +01:00
Aanand Prasad 2ecbf25445 Fix bugs with entrypoint/command in docker-compose run 
- When no command is passed but `--entrypoint` is, set Cmd to `[]`
- When command is a single empty string, set Cmd to `[""]`

Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
 2016-07-27 16:27:05 +01:00
Aanand Prasad 8f842d55d7 Reorder/clarify args docs 
Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
 2016-07-27 16:27:05 +01:00
Jarrod Pooler ad19ff6c67 Updating arg docs in the proper place 
Signed-off-by: Jarrod Pooler <jarrod.pooler@homesite.com>
 2016-07-27 16:27:05 +01:00
Aanand Prasad 4fb7033d9c Clarify environment and env_file docs 
Add note to say that environment variables will not be automatically
made available at build time, and point to the `args` documentation.

Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
 2016-07-27 16:27:05 +01:00
Tomas Tomecek e1b7510e4a service: detailed error messages for create and start 
Fixes: #3355

Signed-off-by: Tomas Tomecek <ttomecek@redhat.com>
 2016-07-27 16:27:05 +01:00
Harald Albers f7853a30bd bash completion for `docker-compose bundle --fetch-digests` 
Signed-off-by: Harald Albers <github@albersweb.de>
 2016-07-27 16:27:05 +01:00
Aanand Prasad 3b4a53c959 Merge remote-tracking branch 'release/release' into bump-1.8.0-rc3 2016-07-27 15:53:08 +01:00
Aanand Prasad 7f54850b4a Merge pull request #3698 from docker/bump-1.8.0-rc2 
Bump 1.8.0 rc2
 2016-07-06 19:11:03 -07:00
Aanand Prasad c72c966abc Bump 1.8.0-rc2 
Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
 2016-07-06 18:05:11 -07:00
Aanand Prasad 801167d271 Pin base image to alpine:3.4 in Dockerfile.run 
Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
 2016-07-06 18:05:10 -07:00
Daniel Nephin 408e4719e1 Update requirements.txt 
Signed-off-by: Daniel Nephin <dnephin@docker.com>
 2016-07-06 16:49:14 -07:00
Jonathan Giannuzzi dbf40d8244 Fix assertion that was always true 
Signed-off-by: Jonathan Giannuzzi <jonathan@giannuzzi.be>
 2016-07-06 16:36:10 -07:00
Victoria Bialas 6021237a69 fixes broken links in 3 Compose docs files due to topic re-org in PR#23492 
Signed-off-by: Victoria Bialas <victoria.bialas@docker.com>
 2016-07-06 16:26:38 -07:00
Aanand Prasad e4159cfd42 Fix alias tests on 1.11 
The fix in 8e04582052 caused a regression
when testing against 1.11.

Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
 2016-07-06 16:20:18 -07:00
Daniel Nephin d8ec9c1572 Upgrade pip on osx 
Signed-off-by: Daniel Nephin <dnephin@docker.com>
 2016-07-06 16:20:18 -07:00
Aanand Prasad 244b303625 Fix test: check container's Env array instead of the output of 'env' 
Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
 2016-07-06 16:20:18 -07:00
Aanand Prasad 217f762a60 Post-merge fix - restore Environment import in main.py 
Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
 2016-07-06 16:20:18 -07:00
Joffrey F 70da16103a Unset env vars behavior in 'run' mirroring engine 
Unset env vars passed to `run` via command line options take the
value of the system's var with the same name.

Signed-off-by: Joffrey F <joffrey@docker.com>
 2016-07-06 16:20:17 -07:00
Aanand Prasad 6b71645ed7 Fix tests to accommodate short-id container alias 
Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
 2016-07-06 16:20:17 -07:00
Ke Xu 05bf9a054a add zsh completion for push 
Signed-off-by: Ke Xu <leonhartx.k@gmail.com>
 2016-07-06 16:20:17 -07:00
Ke Xu 6e3d82eea6 change dsb to dab 
Signed-off-by: Ke Xu <leonhartx.k@gmail.com>
 2016-07-06 16:20:17 -07:00
Ke Xu 21d114b879 add zsh completion support for bundle 
Signed-off-by: Ke Xu <leonhartx.k@gmail.com>
 2016-07-06 16:20:17 -07:00
Aanand Prasad 72849d99c0 Update bundle extension 
It's now .dab, for Distributed Application Bundle

Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
 2016-07-06 16:20:17 -07:00
Harald Albers 85e3ad2655 bash completion for `docker-compose push` 
Signed-off-by: Harald Albers <github@albersweb.de>
 2016-07-06 16:20:17 -07:00
Harald Albers a3e30c3eed bash completion for `docker-compose bundle` 
Signed-off-by: Harald Albers <github@albersweb.de>
 2016-07-06 16:20:17 -07:00
Joffrey F 6fd77fa698 Update docker-py version in requirements 
Signed-off-by: Joffrey F <joffrey@docker.com>
 2016-07-06 16:20:17 -07:00
Daniel Nephin a7fc3e2220 Add an acceptance test for bundle. 
Signed-off-by: Daniel Nephin <dnephin@docker.com>
 2016-07-06 16:20:16 -07:00
Daniel Nephin db02c9f537 Add some unit tests for new bundle and push commands. 
Signed-off-by: Daniel Nephin <dnephin@docker.com>
 2016-07-06 16:20:16 -07:00
Aanand Prasad 33cc601176 Warn on missing digests, don't push/pull by default 
Add a --fetch-digests flag to automatically push/pull

Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
 2016-07-06 16:20:16 -07:00
Aanand Prasad 44e82edc5f Merge pull request #3221 from aeriksson/fix-zsh-autocomplete 
Fix zsh autocomplete
(cherry picked from commit c0237a487b)

Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
 2016-07-06 16:20:16 -07:00
Aanand Prasad 53341b82f9 Merge remote-tracking branch 'release/release' into bump-1.8.0-rc2 2016-07-06 16:05:34 -07:00
Joffrey F 0de9a1b388 Merge pull request #3598 from docker/bump-1.8.0-rc1 
Bump 1.8.0 rc1
 2016-06-14 13:06:29 -07:00
Joffrey F 9bf6bc6dbd Bump 1.8.0-rc1 
Signed-off-by: Joffrey F <joffrey@docker.com>
 2016-06-14 12:35:46 -07:00
Joffrey F 80afbd3961 Skip TLS version test if TLSv1_2 is not available on platform 
Signed-off-by: Joffrey F <joffrey@docker.com>
 2016-06-14 12:35:45 -07:00
Joffrey F de374d845e Merge remote-tracking branch 'source/release' into bump-1.8.0-rc1 2016-06-14 11:03:45 -07:00
Joffrey F 0fe82614a6 Merge pull request #3595 from dnephin/add-push-and-bundle 
Add docker-compose push and docker-compose bundle
 2016-06-14 10:57:32 -07:00
Aanand Prasad 8f8c17bf66 Merge pull request #3549 from shin-/KalleDK-master 
Add support for COMPOSE_TLS_VERSION config option
 2016-06-14 10:57:12 -07:00
Daniel Nephin 9b7bd69cfc Support entrypoint, labels, and user in the bundle. 
Signed-off-by: Daniel Nephin <dnephin@docker.com>
 2016-06-14 13:00:12 -04:00
Aanand Prasad 1ea9dda1d3 Implement 'docker-compose push' and 'docker-compose bundle' 
Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
 2016-06-14 12:06:14 -04:00
Aanand Prasad 21f20cbc9b Merge pull request #3449 from Andrey9kin/ready/3281 
Fix #3281: Unexpected result when using build args with default values
 2016-06-14 08:05:07 -07:00
Aanand Prasad 2123906586 Merge pull request #3577 from sanmai-NL/3576-byte_str_fix 
Fix byte/str typing error
 2016-06-14 01:58:27 +01:00
Aanand Prasad 59e96fea4f Merge pull request #3588 from shin-/3285-root-mount 
Fix split_path_mapping behavior when mounting "/"
 2016-06-14 01:45:20 +01:00
Joffrey F 60f7e021ad Fix split_path_mapping behavior when mounting "/" 
Signed-off-by: Joffrey F <joffrey@docker.com>
 2016-06-13 15:32:10 -07:00
Sander Maijers 61324ef308
Fix byte/str typing error 
Signed-off-by: Sander Maijers <S.N.Maijers@gmail.com>
 2016-06-10 16:30:46 +02:00
Aanand Prasad e502417df2 Merge pull request #3475 from shin-/3429-networks-config-serialize 
Output valid config in config command
 2016-06-07 18:01:39 +02:00
Ben Firshman 6e2d1eb80e Merge pull request #3516 from albers/completion-rm--all 
remove command completion for `docker-compose rm --a`
 2016-06-06 22:23:56 +01:00