tyler.durden/compose
1
0
Fork 0
mirror of https://github.com/docker/compose.git synced 2025-07-28 08:04:09 +02:00
Code Issues Packages Projects Releases Wiki Activity
4,126 Commits 21 Branches 282 Tags
Commit Graph

4126 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Ian Campbell
5cdf30fc12 Teardown project and db in ResilienceTest 
These hold a reference to a docker.client.Client object and therefore a
connection pool which leaves fds open once the test has completed.

Signed-off-by: Ian Campbell <ian.campbell@docker.com>
 2016-07-21 13:17:53 +01:00
Aanand Prasad
26b819ca67 Merge pull request #3748 from ijc25/master 
tearDown the project override at the end of each test case
 2016-07-20 16:28:45 +01:00
Ian Campbell
0483bcb472 delete DockerClientTestCase.client class attribute on tearDownClass 
This is a docker.client.Client and therefore contains a connection pool, so
each subclass of DockerClientTestCase can end up holding on to up to 10 Unix
socket file descriptors after the tests contained in the sub-class are
complete.

Before this by the end of a test run I was seeing ~100 open file descriptors,
~80 of which were Unix domain sockets. By cleaning these up only 15 Unix
sockets remain at the end (out of ~25 fds, the rest of which are the Python
interpretter, opened libraries etc).

Signed-off-by: Ian Campbell <ian.campbell@docker.com>
 2016-07-20 15:51:22 +01:00
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
425303992c Reorder/clarify args docs 
Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
 2016-07-20 12:47:47 +01:00
Jarrod Pooler
9ab1d55d06 Updating arg docs in the proper place 
Signed-off-by: Jarrod Pooler <jarrod.pooler@homesite.com>
 2016-07-20 12:45:11 +01:00
Aanand Prasad
907b0690e6 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-20 12:23:51 +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
593d1aeb09 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-11 16:15:13 -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
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>
1.8.0-rc2 		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 8e0458205241f654bb1d75de9babd9880afa7206 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 c0237a487b31e1d3e4b67fb180bd7db219e5d858)

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 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