tyler.durden/compose
1
0
Fork 0
mirror of https://github.com/docker/compose.git synced 2025-07-23 21:54:40 +02:00
Code Issues Packages Projects Releases Wiki Activity
2,932 Commits 20 Branches 280 Tags
Commit Graph

2932 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Ian Campbell
6649e9aba3 tearDown the project override at the end of each test case 
self._project.client is a docker.client.Client, so creating a new self._project
leaks (via the embedded connection pool) a bunch of Unix socket file
descriptors for each test which overrides self.project using this mechanism.

In my tests I observed the test harness using 800-900 file descriptor, which is
OK on Linux with the default limit of 1024 but breaks on OSX (e.g. with
Docker4Mac) where the default limit is only 256. The failure can be provoked on
Linux too with `ulimit -n 256`.

With this fix I have observed the process ending with ~100 file descriptors
open, including 83 Unix sockets, so I think there is likely at least one more
leak lurking.

Signed-off-by: Ian Campbell <ian.campbell@docker.com>
 2016-07-20 14:34:12 +01:00
Aanand Prasad
d7db15ce94 Merge pull request #3364 from TomasTomecek/3355-detailed-error-messages 
service: detailed error messages for create and start
 2016-07-11 16:29:35 -04:00
Aanand Prasad
1e60030b94 Merge pull request #3488 from jgiannuzzi/internal_networks 
Add support for creating internal networks
 2016-07-11 15:24:29 -04:00
Jonathan Giannuzzi
83f35e132b Add support for creating internal networks 
Signed-off-by: Jonathan Giannuzzi <jonathan@giannuzzi.be>
 2016-07-11 11:34:01 +02:00
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
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
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
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 8e0458205241f654bb1d75de9babd9880afa7206 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
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`
docs-v1.7.1-2016-06-28 		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