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

3712 Commits

Author SHA1 Message Date
Tomas Tomecek fea970dff3 service: detailed error messages for create and start 
Fixes: #3355

Signed-off-by: Tomas Tomecek <ttomecek@redhat.com>
 2016-07-11 10:45:27 +02:00
Aanand Prasad c3fd6a8f4d Merge pull request #3704 from aanand/update-install-and-changelog-for-1.7.1 
Update install.md and CHANGELOG.md for 1.7.1
 2016-07-07 16:01:55 -07:00
Aanand Prasad 4207d43b85 Fix timeout value in error message 
Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
 2016-07-07 12:08:47 -07:00
Aanand Prasad 576a2ee7ae Stop checking the deprecated DOCKER_CLIENT_TIMEOUT variable 
Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
 2016-07-07 11:58:10 -07:00
Aanand Prasad 49d4fd2795 Update install.md and CHANGELOG.md for 1.7.1 
Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
 2016-07-07 11:41:11 -07:00
Joffrey F 79ddf06267 Merge pull request #3662 from albers/completion-bundle--fetch-digests 
bash completion for `docker-compose bundle --fetch-digests`
 2016-07-07 10:39:18 -07: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
Aanand Prasad 89c9aed339 Merge pull request #3697 from aanand/pin-alpine-base-image 
Pin base image to alpine:3.4 in Dockerfile.run
 2016-07-06 18:04:47 -07:00
Aanand Prasad 08127625a0 Pin base image to alpine:3.4 in Dockerfile.run 
Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
 2016-07-06 18:01:27 -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
Aanand Prasad 1e176b58c5 Merge pull request #3592 from stakodiak/fix-privilege-typo 
Fix a typo in a test's name.
 2016-07-06 15:22:05 -07:00
Aanand Prasad 98818d4e50 Merge pull request #3591 from staticshock/togather 
Fix a typo (togather -> together)
 2016-07-06 11:45:22 -07:00
Aanand Prasad 554dc2496a Merge pull request #3590 from Knetic/oomscore 
Added support for oom_score_adj
 2016-07-06 11:45:09 -07:00
Aanand Prasad dcc09b677b Merge pull request #3691 from aanand/fix-alias-tests-on-1.11 
Fix alias tests on 1.11
 2016-07-06 11:03:54 -07:00
Aanand Prasad 949b88fff9 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 09:56:25 -07:00
Aanand Prasad e659cd139b Merge pull request #3689 from bfirsh/docker-mac-not-running-error 
Suggest to run Docker for Mac if it isn't running
 2016-07-06 09:55:19 -07:00
Ben Firshman 5dabc81c16 Suggest to run Docker for Mac if it isn't running 
Instead of suggesting docker-machine.

Signed-off-by: Ben Firshman <ben@firshman.co.uk>
 2016-07-06 15:43:22 +01:00
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