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

3015 Commits

Author SHA1 Message Date
George Lester 6fe5d2b543 Implemented oom_score_adj 
Signed-off-by: George Lester <glester491@gmail.com>
 2016-07-05 23:43:32 -07:00
Aanand Prasad 967dce5807 Merge pull request #3671 from dnephin/fix_pip_version_osx 
Update pip in travis osx build
 2016-07-05 16:08:51 -07:00
Aanand Prasad edd3637b9b Merge pull request #3669 from chrisclark/master 
Docs: Typo leading to possible extreme agony
 2016-07-05 16:08:08 -07:00
Ben Firshman f9f151a51f Merge pull request #3679 from allencloud/make-output-consistent-typo 
make-output-consistent-typo
 2016-07-05 17:36:59 +01:00
allencloud 931b01acf9 make-output-consistent-typo 
Signed-off-by: allencloud <allen.sun@daocloud.io>
 2016-07-02 23:33:13 +08:00
Aanand Prasad f1974f6c5e Merge pull request #3670 from aanand/3343-run-with-env-values-from-system 
[Carry #3373] Unset env vars behavior in 'run' mirroring engine
 2016-07-01 12:12:29 -07:00
Daniel Nephin 3d0a1de023 Upgrade pip on osx 
Signed-off-by: Daniel Nephin <dnephin@docker.com>
 2016-06-30 20:52:15 -04:00
Aanand Prasad 50d5aab8ad Fix test: check container's Env array instead of the output of 'env' 
Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
 2016-06-30 17:00:30 -07:00
Aanand Prasad 10ae81f8cf Post-merge fix - restore Environment import in main.py 
Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
 2016-06-30 15:49:16 -07:00
Joffrey F 5d244ef6d8 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-06-30 15:48:23 -07:00
Chris Clark a62739b906 Signed-off-by: Chris Clark <chris@untrod.com> 
The postgres image expects a specific volume path. The docs had a typo in that path. This can cause a lot of agony. This is not hypothetical agony, but very real agony that was very recently experienced :)
 2016-06-30 15:30:22 -07:00
Daniel Nephin 3d20e25bf8 Merge pull request #3661 from dnephin/fix_requirements 
Add missing deps to requirements.txt
 2016-06-30 18:21:40 -04:00
Aanand Prasad bc0939dcf0 Merge pull request #3645 from leonhartX/zsh-completion-bundle 
add zsh completion support for bundle
 2016-06-30 10:32:44 -07:00
Aanand Prasad c0237a487b Merge pull request #3221 from aeriksson/fix-zsh-autocomplete 
Fix zsh autocomplete
 2016-06-29 11:08:08 -07:00
Aanand Prasad 3c8fdb8752 Merge pull request #3615 from shin-/docker-py-bump190 
Update docker-py version in requirements
 2016-06-29 10:49:59 -07:00
Harald Albers 622de27c1e bash completion for `docker-compose bundle --fetch-digests` 
Signed-off-by: Harald Albers <github@albersweb.de>
 2016-06-29 08:45:36 -07:00
Daniel Nephin 2b6ea847b9 Update requirements.txt 
Signed-off-by: Daniel Nephin <dnephin@docker.com>
 2016-06-29 10:38:01 -04:00
Ben Firshman da2aae2a29 Merge pull request #3570 from davidjb/patch-1 
Fix minor YAML typo
 2016-06-29 15:20:16 +01:00
Ke Xu edd28f09d1 change dsb to dab 
Signed-off-by: Ke Xu <leonhartx.k@gmail.com>
 2016-06-29 11:01:50 +09:00
Joffrey F 93cc2675c8 Merge pull request #3625 from albers/completion-bundle 
bash completion for `docker-compose bundle`
 2016-06-28 15:52:37 -07:00
Joffrey F 3649df83ab Merge pull request #3626 from albers/completion-push 
bash completion for `docker-compose push`
 2016-06-28 15:52:14 -07:00
Joffrey F b89dc99e8e Merge pull request #3646 from leonhartX/zsh-completion-push 
add zsh completion for push
 2016-06-28 15:50:32 -07:00
Joffrey F a822406eb0 Update docker-py version in requirements 
Signed-off-by: Joffrey F <joffrey@docker.com>
 2016-06-28 15:49:06 -07:00
Aanand Prasad 72d3d5d84b Merge pull request #3612 from dnephin/tests_for_bundle 
Add some unit tests and an acceptance test for bundle
 2016-06-28 14:47:29 -07:00
Aanand Prasad 55e20d1727 Merge pull request #3652 from aanand/fix-tests-for-1.12 
Fix tests to accommodate short-id container alias
 2016-06-28 13:27:40 -07:00
Daniel Nephin 7c06f60573 Merge pull request #3563 from adamchainz/readthedocs.io 
Convert readthedocs links for their .org -> .io migration for hosted projects
 2016-06-28 12:35:19 -04:00
Daniel Nephin 00decf8677 Merge pull request #3638 from aanand/update-bundle-extension 
Update bundle extension
 2016-06-28 11:43:58 -04:00
Daniel Nephin 5640bd42a8 Add an acceptance test for bundle. 
Signed-off-by: Daniel Nephin <dnephin@docker.com>
 2016-06-28 10:18:59 -04:00
Daniel Nephin 95207561bb Add some unit tests for new bundle and push commands. 
Signed-off-by: Daniel Nephin <dnephin@docker.com>
 2016-06-28 10:18:20 -04:00
Aanand Prasad 8e04582052 Fix tests to accommodate short-id container alias 
Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
 2016-06-27 16:21:19 -07:00
Aanand Prasad 058a7659ba Update bundle extension 
It's now .dab, for Distributed Application Bundle

Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
 2016-06-27 14:16:44 -07:00
Aanand Prasad fe0654603c Merge pull request #3619 from jgiannuzzi/fix_tests 
Fix assertion that was always true
 2016-06-27 14:16:00 -07:00
Andre Eriksson c3247e7af8 zsh autocomplete: update misleading comment 
Signed-off-by: Andre Eriksson <aepubemail@gmail.com>
 2016-06-27 11:07:59 -07:00
Andre Eriksson b3d4e9c9d7 zsh autocomplete: break out duplicated flag messages into variables 
Signed-off-by: Andre Eriksson <aepubemail@gmail.com>
 2016-06-27 11:00:17 -07:00
Andre Eriksson 0058b4ba0c zsh autocomplete: replace use of sed with cut 
Signed-off-by: Andre Eriksson <aepubemail@gmail.com>
 2016-06-27 11:00:17 -07:00
Andre Eriksson 612d263d74 zsh autocomplete: fix issue when filtering on already selected services 
Previously, the filtering on already selected services would break when
one service was a substring of another.

This commit fixes that.

Signed-off-by: Andre Eriksson <aepubemail@gmail.com>
 2016-06-27 11:00:17 -07:00
Andre Eriksson 048408af48 zsh autocomplete: fix missing services issue for build/pull commands 
Previously, the autocomplete for the build/pull commands would only add
services for which build/image were the _first_ keys, respectively, in
the docker-compose file.

This commit fixes this, so the appropriate services are listed
regardless of the order in which they appear

Signed-off-by: Andre Eriksson <aepubemail@gmail.com>
 2016-06-27 11:00:17 -07:00
Andre Eriksson d990f7899c zsh autocomplete: pass all relevant flags to docker-compose/docker 
For autocomplete to work properly, we need to pass along some flags when
calling docker (--host, --tls, …) and docker-compose (--file, --tls, …).

Previously flags would only be passed to docker-compose, and the only
flags passed were --file and --project-name.

This commit makes sure that all relevant flags are passed to both
docker-compose and docker.

Signed-off-by: Andre Eriksson <aepubemail@gmail.com>
 2016-06-27 11:00:17 -07:00
Andre Eriksson 97ba14c82a zsh autocomplete: use two underscores for all function names 
Signed-off-by: Andre Eriksson <aepubemail@gmail.com>
 2016-06-27 11:00:17 -07:00
Andre Eriksson 1b5a94f4e4 zsh autocomplete: bring flag help texts up to date 
Signed-off-by: Andre Eriksson <aepubemail@gmail.com>
 2016-06-27 11:00:17 -07:00
Andre Eriksson 8d2fbe3a55 zsh autocomplete: add 'build' flag for 'create' and 'up' 
Signed-off-by: Andre Eriksson <aepubemail@gmail.com>
 2016-06-27 11:00:17 -07:00
Andre Eriksson eb10f41d13 zsh autocomplete: fix incorrect flag exclusions for 'create' and 'up' 
Signed-off-by: Andre Eriksson <aepubemail@gmail.com>
 2016-06-27 11:00:17 -07:00
Andre Eriksson 73a1b60ced zsh autocomplete: add missing 'remove-orphans' flag for 'up' and 'down' 
Signed-off-by: Andre Eriksson <aepubemail@gmail.com>
 2016-06-27 11:00:17 -07:00
Andre Eriksson b3d9652cc3 zsh autocomplete: add missing docker-compose base flags 
Signed-off-by: Andre Eriksson <aepubemail@gmail.com>
 2016-06-27 11:00:17 -07:00
Andre Eriksson cbb44b1a14 fix broken zsh autocomplete for version 2 docker-compose files 
This has the added benefit of making autocompletion work when the
docker-compose config file is in a parent directory.

Signed-off-by: Andre Eriksson <aepubemail@gmail.com>
 2016-06-27 11:00:17 -07:00
Ke Xu a0a90b2352 add zsh completion for push 
Signed-off-by: Ke Xu <leonhartx.k@gmail.com>
 2016-06-27 18:00:52 +09:00
Ke Xu aa7f522ab0 add zsh completion support for bundle 
Signed-off-by: Ke Xu <leonhartx.k@gmail.com>
 2016-06-27 17:48:14 +09:00
Sven Dowideit 5c1abe2e29 Merge pull request #3631 from jamesottaway/patch-1 
Document `tmpfs` being v2 only
 2016-06-27 11:50:15 +10:00
James Ottaway f77dbc06cc Document `tmpfs` being v2 only 
Signed-off-by: James Ottaway <git@james.ottaway.io>
 2016-06-24 10:54:51 +10:00
Harald Albers f49b624d95 bash completion for `docker-compose push` 
Signed-off-by: Harald Albers <github@albersweb.de>
 2016-06-22 17:19:20 +02:00