c64f7dde04
Fix failing unit tests
...
Signed-off-by: Joey Payne <jyapayne@gmail.com>
2017-02-21 19:01:30 -07:00
33fcfca040
Add test for cache_from
...
Signed-off-by: Joey Payne <jyapayne@gmail.com>
2017-02-21 19:01:30 -07:00
d20e3f3342
function-name-modification for tests/*
...
Signed-off-by: Aaron.L.Xu <likexu@harmonycloud.cn>
2017-02-16 15:25:20 +08:00
abce83ef25
Fix `config` command output with service.secrets section
...
Signed-off-by: Joffrey F <joffrey@docker.com>
2017-02-13 16:51:50 -08:00
dc5b3f3b3e
Fix secrets config.
...
Signed-off-by: Daniel Nephin <dnephin@docker.com>
2017-02-10 17:11:24 -05:00
c092fa37de
Fix version 3.1
...
Signed-off-by: Daniel Nephin <dnephin@docker.com>
2017-02-09 12:39:57 -05:00
951497c0f2
Merge pull request #4419 from shin-/4418-healthcheck-extends
...
Don't re-parse healthcheck values coming from extended services
2017-02-03 12:24:53 -08:00
e22164ec9f
Merge pull request #4035 from urda/urda/compose-top
...
Added `top` to `docker-compose` to display running processes
2017-02-02 15:41:14 -08:00
cf43e6edf7
Don't re-parse healthcheck values coming from extended services
...
Signed-off-by: Joffrey F <joffrey@docker.com>
2017-02-02 14:50:53 -08:00
7e8958e6ca
Add missing comma in DOCKER_CONFIG_KEYS list
...
Signed-off-by: Joffrey F <joffrey@docker.com>
2017-02-01 16:40:43 -08:00
a67500ee57
Added `top` to `docker-compose` to display running processes.
...
This commit allows `docker-compose` to access `top` for containers
much like running `docker top` directly on a given container.
This commit includes:
* `docker-compose` CLI changes to expose `top`
* Completions for `bash` and `zsh`
* Required testing for the new `top` command
Signed-off-by: Peter Urda <peter.urda@gmail.com>
2017-02-01 15:42:30 -08:00
59d1847d9b
Fix some test failures.
...
Signed-off-by: Daniel Nephin <dnephin@docker.com>
2017-01-31 09:53:40 -05:00
4053adc7d3
Add an integration test for secrets using bind mounts.
...
Signed-off-by: Daniel Nephin <dnephin@docker.com>
2017-01-31 09:53:16 -05:00
e0c6397999
Implement secrets using bind mounts
...
Signed-off-by: Daniel Nephin <dnephin@docker.com>
2017-01-31 09:53:16 -05:00
e10d1140b9
Convert time data back to string values when serializing config
...
Signed-off-by: Joffrey F <joffrey@docker.com>
2017-01-26 11:59:22 -08:00
9a0962dacb
Merge pull request #4361 from shin-/4348-serialize-ext-volumes
...
Remove external_name from volume def in config output
2017-01-19 17:41:08 -08:00
d83d31889e
Remove external_name from volume def in config output
...
Signed-off-by: Joffrey F <joffrey@docker.com>
2017-01-19 16:05:13 -08:00
5c2165eaaf
Fix volume definition in v3 schema
...
Signed-off-by: Joffrey F <joffrey@docker.com>
2017-01-19 15:41:31 -08:00
1a02121ab5
depends_on merge now retains condition information when present
...
Signed-off-by: Joffrey F <joffrey@docker.com>
2017-01-18 17:52:03 -08:00
56a1b02aac
Catch healthcheck exceptions in parallel_execute
...
Signed-off-by: Joffrey F <joffrey@docker.com>
2017-01-17 13:22:16 -08:00
2df31bb13c
Provide valid serialization of depends_on when format is not 2.1
...
Signed-off-by: Joffrey F <joffrey@docker.com>
2017-01-11 16:25:40 -08:00
534b4ed820
Falsy values in COMPOSE_CONVERT_WINDOWS_PATHS are properly recognized
...
Signed-off-by: Joffrey F <joffrey@docker.com>
2017-01-04 15:45:11 -08:00
8145429399
Unify healthcheck spec definition in v2 and v3
...
Signed-off-by: Joffrey F <joffrey@docker.com>
2017-01-04 13:14:23 -08:00
bef2308530
Fix condition name in config tests
...
Signed-off-by: Joffrey F <joffrey@docker.com>
2017-01-04 11:28:30 -08:00
04394b1d0a
Expand depends_on to allow different conditions (service_start, service_healthy)
...
Rework "up" and "start" to wait on conditional state of dependent services
Add integration tests
Signed-off-by: Joffrey F <joffrey@docker.com>
2017-01-04 11:28:30 -08:00
ba47fb99ba
Add default labels to networks and volumes created by Compose
...
Signed-off-by: Joffrey F <joffrey@docker.com>
2016-12-19 20:43:35 -08:00
e6b2949edc
Merge pull request #4216 from lawliet89/userns_mode
...
Implement `userns_mode` HostConfig for services
2016-12-19 18:12:15 -08:00
fb165d9c15
Add v3_only marker to healthcheck test
...
Signed-off-by: Joffrey F <joffrey@docker.com>
2016-12-16 12:21:59 -08:00
04e5925a23
Use docker SDK 2.0
...
Signed-off-by: Joffrey F <joffrey@docker.com>
2016-12-14 15:36:08 -08:00
635a281777
Merge pull request #4163 from aanand/add-healthcheck
...
Implement 'healthcheck' option
2016-12-14 15:35:05 -08:00
e04a12b5ca
Increase minimum version for v3.
...
Signed-off-by: Daniel Nephin <dnephin@docker.com>
2016-12-07 11:16:40 -05:00
62f8b1402e
Implement `userns_mode` HostConfig for services
...
Fixes #3349
This allows the key `userns_mode` to be used in service definitions.
Since `userns_mode` requires API version > 1.23, this is only available
in 2.1 and 3.0 versions of compose file
Signed-off-by: Yong Wen Chua <me@yongwen.xyz>
2016-12-05 14:25:56 +08:00
fbcc1510cc
Handle giving help a nonexistent command
...
The CLI would show an unhandled exception when running:
$ docker-compose help foobar
Now, it lists the commands.
Signed-off-by: Danny Guo <dannyguo91@gmail.com>
2016-12-03 14:58:15 -05:00
716a6baa59
Implement 'healthcheck' option
...
Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
2016-11-18 14:47:02 +00:00
079c95c340
Use stop grace period for container stop.
...
Signed-off-by: Daniel Nephin <dnephin@docker.com>
2016-11-16 12:12:28 -05:00
6cac48c056
Add a vendored and modified pytimeparse
...
Signed-off-by: Daniel Nephin <dnephin@docker.com>
2016-11-16 12:10:32 -05:00
d717c88b6e
Support version 3.0 of the Compose file format
...
Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
2016-11-16 16:07:02 +00:00
721bf89447
Merge pull request #4134 from shin-/fix_none_opts_network_check
...
Avoid breaking when remote driver options are null
2016-11-15 15:01:24 -08:00
09540339e0
Merge pull request #4131 from aanand/test-environment-overrides-env-file
...
Test that values in 'environment' override env files
2016-11-15 14:18:54 -08:00
7f60ff5ae6
Avoid breaking when remote driver options are null.
...
Signed-off-by: Joffrey F <joffrey@docker.com>
2016-11-15 12:00:52 -08:00
efb4ed1b9e
Handle new pull failures behavior in Engine 1.13
...
Signed-off-by: Joffrey F <joffrey@docker.com>
2016-11-15 11:30:52 -08:00
ba249e5179
Test that values in 'environment' override env files
...
Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
2016-11-09 15:10:27 +00:00
10417eebd7
Fix logging dict merging
...
Signed-off-by: Joffrey F <joffrey@docker.com>
2016-11-03 17:22:31 -07:00
ba43d08fbd
Add whitelisted driver option added by the overlay driver to avoid breakage
...
Signed-off-by: Joffrey F <joffrey@docker.com>
2016-11-01 11:47:12 -07:00
8b5782ba9f
Merge pull request #4067 from shin-/portable-find-exe
...
Replace "which" calls with the portable find_executable function
2016-10-24 16:15:21 -07:00
60d005b055
Improve robustness of a couple integration tests with occasional failures
...
Signed-off-by: Joffrey F <joffrey@docker.com>
2016-10-24 13:58:45 -07:00
d2fb146913
Replace "which" calls with the portable find_executable function
...
Signed-off-by: Joffrey F <joffrey@docker.com>
2016-10-24 13:22:52 -07:00
efb09af271
Do not normalize volume paths on Windows by default
...
Add environment variable to enable normalization if needed.
Do not normalize internal paths
Signed-off-by: Joffrey F <joffrey@docker.com>
2016-10-18 12:17:56 -07:00
086ae04b9e
Fix TypeError : unorderable types: str() < int()
...
While merging list items into a set, strings and ints are compared which is not possible.
We cast everything to strings to avoid the issue.
The issue was seen with python 3.5 while overriding configuration files
with heterogenous port types (int in one file, string in another).
Signed-off-by: Nicolas Barbey <nicolas.a.barbey@gmail.com>
2016-10-18 12:01:00 +02:00
14716bc2da
Merge branch 'master' of https://github.com/dbdd4us/compose into dbdd4us-master
2016-10-17 14:09:09 -07:00
a5c1e4b0cd
Merge pull request #3991 from shin-/3906-isolation-config
...
Add support for "isolation" in config
2016-10-17 11:02:11 -07:00
95c6cc0420
Merge pull request #3994 from shin-/3430-enable-ipv6
...
Add support for enable_ipv6 in network definition.
2016-10-17 11:02:00 -07:00
22d91f60be
fix serialize restart spec with null string
...
Signed-off-by: realityone <realityone@me.com>
2016-10-14 18:20:55 +08:00
bdcce13f4a
add support for creating volume and network with label definition
...
Signed-off-by: dbdd <wangtong2712@gmail.com>
2016-10-12 10:35:14 +08:00
e4bb9bde30
Merge pull request #3964 from shin-/3963-unicode-env
...
Don't break when interpolating environment with unicode characters
2016-10-11 12:00:36 -07:00
7f1606545d
Merge pull request #4004 from shin-/4000-extend-logging
...
Properly merge logging dictionaries in overriding configs
2016-10-11 12:00:06 -07:00
0603b445e2
Properly merge logging dictionaries in overriding configs
...
Signed-off-by: Joffrey F <joffrey@docker.com>
2016-10-10 15:39:05 -07:00
9248298a4a
Merge pull request #4016 from shin-/4008-unicode-formatter
...
Handle formatter case where logrecord message is binary containing unicode
2016-10-06 16:49:03 -07:00
bc3ed6dead
Merge pull request #3992 from shin-/3701-npipe-windows-default
...
Use docker-py's default behavior when no explicit host on Windows
2016-10-06 16:48:35 -07:00
e5ded6ff9b
Add support for enable_ipv6 in network definition.
...
Signed-off-by: Joffrey F <joffrey@docker.com>
2016-10-06 15:49:08 -07:00
17c5b45641
Handle formatter case where logrecord message is binary containing
...
unicode characters.
Signed-off-by: Joffrey F <joffrey@docker.com>
2016-10-06 15:39:47 -07:00
2bce81508e
Support non-alphanumeric default values.
...
Signed-off-by: Daniel Nephin <dnephin@docker.com>
2016-10-06 17:04:19 -04:00
fe08be698d
Support inline default values.
...
Signed-off-by: Daniel Nephin <dnephin@docker.com>
2016-09-29 12:46:11 -04:00
007cf96452
Use docker-py's default behavior when no explicit host on Windows
...
Signed-off-by: Joffrey F <joffrey@docker.com>
2016-09-28 15:36:57 -07:00
dc8a39f70d
Add support for "isolation" in config
...
Signed-off-by: Joffrey F <joffrey@docker.com>
2016-09-28 15:31:58 -07:00
f65f89ad8c
Merge pull request #3653 from shin-/3637-link-local-ips
...
Add support for link-local IPs in service.networks definition
2016-09-22 11:58:29 -07:00
53fa44c01e
Don't break when interpolating environment with unicode characters
...
Signed-off-by: Joffrey F <joffrey@docker.com>
2016-09-20 18:05:59 -07:00
7687412e03
Merge pull request #3922 from shin-/3897-volumespec_parse_win32
...
Improve volumespec parsing on windows platforms
2016-09-20 13:09:37 -07:00
33424189d4
Denormalize function defaults to latest version
...
Minor docs fix
Signed-off-by: Joffrey F <joffrey@docker.com>
2016-09-20 11:47:14 -07:00
7911659266
Improve volumespec parsing on windows platforms
...
Signed-off-by: Joffrey F <joffrey@docker.com>
2016-09-20 11:24:24 -07:00
1648a3e257
Merge pull request #3709 from Knetic/groupadd
...
Supported group_add
2016-09-19 17:18:06 -07:00
64517e31fc
Force default host on windows to the default TCP host (instead of npipe)
...
Signed-off-by: Joffrey F <joffrey@docker.com>
2016-09-16 11:43:25 -07:00
66b395d950
Include docker-py link-local fix and improve integration test
...
Signed-off-by: Joffrey F <joffrey@docker.com>
2016-09-15 14:55:42 -07:00
fd254caa68
Add support for link-local IPs in service.networks definition
...
Signed-off-by: Joffrey F <joffrey@docker.com>
2016-09-15 14:55:14 -07:00
651283eef9
Merge pull request #3941 from shin-/3888-recover-apierror-logs
...
Catch APIError while printing container logs
2016-09-13 12:58:40 -07:00
f065ce0f73
Merge pull request #3942 from shin-/3873-syslog-logs-error
...
Only allow log streaming if logdriver is json-file
2016-09-13 12:28:27 -07:00
3fcd648ba2
Catch APIError while printing container logs
...
Signed-off-by: Joffrey F <joffrey@docker.com>
2016-09-13 12:10:41 -07:00
7dd2e33057
Only allow log streaming if logdriver is json-file or journald
...
Signed-off-by: Joffrey F <joffrey@docker.com>
2016-09-13 11:56:26 -07:00
9759f27fa6
Fix integration test on Docker for Mac
...
Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
2016-09-13 14:50:37 +01:00
dada36f732
Supported group_add
...
Signed-off-by: George Lester <glester491@gmail.com>
2016-09-11 23:10:49 -07:00
3dec600d82
Merge pull request #3830 from shin-/3534-machine-config-args
...
Remove surrounding quotes from TLS paths, if present
2016-09-07 18:35:43 -07:00
267a243f80
Merge pull request #3799 from aanand/handle-connection-error-on-project-init
...
Handle connection errors on project initialization
2016-09-06 10:25:48 -07:00
d824cb9b06
Add support for swappiness constraint
...
Run a service using `docker run --memory-swappiness=0` (see
https://docs.docker.com/engine/reference/run/ )
refs #2383
Signed-off-by: Jean-François Roche <jfroche@affinitic.be>
2016-08-16 11:02:51 +02:00
c0305024f5
Remove surrounding quotes from TLS paths, if present
...
Signed-off-by: Joffrey F <joffrey@docker.com>
2016-08-09 15:13:01 -07:00
d29f8e1022
Merge pull request #3789 from shin-/3788-json-splitter-fix
...
json_splitter: Don't break when buffer contains leading whitespace.
2016-08-03 13:23:52 +01:00
b3a4d76d4f
Handle connection errors on project initialization
...
Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
2016-08-02 11:44:25 +01:00
6f4be1cffc
json_splitter: Don't break when buffer contains leading whitespace.
...
Add error logging with detailed output for decode errors
Signed-off-by: Joffrey F <joffrey@docker.com>
2016-07-29 14:05:59 -07:00
5aeeecb6f2
Fix stacktrace when handling timeout error
...
Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
2016-07-29 17:12:46 +01:00
e9d62e8404
Merge pull request #3676 from aanand/warn-for-swarm-mode
...
Show a warning when engine is in swarm mode
2016-07-27 15:38:09 +01:00
1877a41b92
Add user agent to API calls
...
Signed-off-by: Ben Firshman <ben@firshman.co.uk>
2016-07-27 14:26:15 +01:00
887ed8d1b6
Rename --fetch-digests to --push-images and remove auto-pull
...
Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
2016-07-25 17:36:24 +01:00
2c9e46f60f
Show a warning when engine is in swarm mode
...
Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
2016-07-25 13:46:56 +01:00
958758ff6d
Remove anonymous volumes when using run --rm.
...
Named volumes will not be removed.
This is consistent with the behavior of docker run --rm.
Fixes #2419 , #3611
Signed-off-by: Nikola Kovacs <nikola.kovacs@gmail.com>
2016-07-25 11:43:30 +02:00
619bf4c4df
Merge pull request #3705 from aanand/fix-timeout-message
...
Fix timeout value in error message
2016-07-22 10:57:41 -04:00
10749e187c
Merge pull request #3718 from aanand/fix-run-entrypoint
...
Fix bugs with entrypoint/command in docker-compose run
2016-07-22 10:55:25 -04:00
d6f70dddc7
Call the superclass tearDown in VolumeTest
...
Currently it doesn't actually seem to make any practical difference that this
is missing, but it seems like good practice to do so anyway, to be robust
against future test case changes which might require cleanup done in the super
class.
Signed-off-by: Ian Campbell <ian.campbell@docker.com>
2016-07-21 13:17:53 +01:00
3124fec01a
tearDown tmp_volumes array itself in VolumeTest
...
Each volume in the array holds 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
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
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
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
Joey Payne
Aaron.L.Xu
Joffrey F
Daniel Nephin
Joffrey F
Peter Urda
Yong Wen Chua
Danny Guo
Aanand Prasad
Nicolas Barbey
realityone
dbdd
George Lester
Jean-François Roche
Ben Firshman
Nikola Kovacs
Daniel Nephin
Ian Campbell