7b5d5fcd58
Bump 1.4.2
...
Signed-off-by: Daniel Nephin <dnephin@docker.com>
2015-09-22 12:26:51 -04:00
ac75d35927
Fix #1961 - docker-compose up should attach to all containers with no service names are specified, and add tests.
...
Signed-off-by: Daniel Nephin <dnephin@gmail.com>
2015-09-22 11:09:59 -04:00
b24ca75914
Bump 1.4.1
...
Signed-off-by: Daniel Nephin <dnephin@docker.com>
2015-09-14 18:18:01 -04:00
2b75741e5a
Fix cherry-pick errors.
...
Signed-off-by: Daniel Nephin <dnephin@docker.com>
2015-09-11 14:22:35 -04:00
7ff8c2b224
Resolves #1804
...
Fix mutation of service.options when a label or environment variable is specified in the config.
Signed-off-by: Daniel Nephin <dnephin@gmail.com>
2015-09-10 19:32:30 -04:00
db31adc208
Extract link names into a function.
...
Signed-off-by: Daniel Nephin <dnephin@docker.com>
2015-09-10 19:32:30 -04:00
805f6a7683
Refactor network_mode logic out of Service.
...
Signed-off-by: Daniel Nephin <dnephin@docker.com>
2015-09-10 19:32:30 -04:00
d92f323e6d
Fixes #1757 - include all service properties in the config_dict()
...
Signed-off-by: Daniel Nephin <dnephin@gmail.com>
2015-09-10 19:32:30 -04:00
cf2dbf55b8
Cleanup some project logic.
...
Signed-off-by: Daniel Nephin <dnephin@gmail.com>
2015-09-10 19:32:30 -04:00
8d4c724c2d
Sort config keys
...
Signed-off-by: Daniel Nephin <dnephin@gmail.com>
2015-09-10 19:32:30 -04:00
9cb2770da4
Make external_links a regular service.option so that it's part of the config hash
...
Signed-off-by: Daniel Nephin <dnephin@gmail.com>
2015-09-10 19:32:30 -04:00
6a23491fa9
Resolves #1856 , fix regression in #1645 . Includes some refactoring to make testing easier.
...
Signed-off-by: Daniel Nephin <dnephin@gmail.com>
2015-09-10 19:32:30 -04:00
294b9742be
Handle all exceptions
...
If we get back an error that wasn't an APIError, it was causing the
thread to hang. This catch all, while I appreciate feels risky to
have a catch all, is better than not catching and silently failing,
with a never ending thread.
If something worse than an APIError has gone wrong, we want to stop
the incredible journey of what we're doing.
Signed-off-by: Mazz Mosley <mazz@houseofmnowster.com>
2015-09-10 19:32:30 -04:00
a9b1f15f92
Fix volume path warning
...
Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
2015-09-10 19:32:29 -04:00
28139ab90d
Bump 1.4.0
...
Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
2015-08-11 16:00:20 +01:00
d0792b49fa
Merge pull request #1846 from aanand/fix-mem-limit-options
...
Fix mem_limit and memswap_limit regression
(cherry picked from commit 93cc7e3751
2015-08-11 16:00:20 +01:00
5548aa5c79
Merge pull request #1833 from aanand/deprecate-relative-volumes-without-dot
...
Show a warning when a relative path is specified without "./"
(cherry picked from commit 52733f6996
2015-08-11 12:57:42 +01:00
74b4fb89bb
Merge pull request #1835 from aanand/fix-crash-when-container-has-no-name
...
Ignore containers that don't have a name
(cherry picked from commit 4e12ce39b3
2015-08-11 09:44:27 +01:00
3d6946417d
Merge pull request #1800 from aanand/volume-driver-support
...
Support volume_driver
(cherry picked from commit 41b9df7639
2015-07-31 16:29:24 +01:00
ad922cd7a1
Merge pull request #1787 from aanand/fix-duplicate-volume-bind
...
Fix "Duplicate volume mount" error when config has trailing slashes
(cherry picked from commit dc7bdd10d4
2015-07-31 15:29:44 +01:00
49bafdc4cd
Merge pull request #1777 from aanand/update-api-version
...
Update API version to 1.19
(cherry picked from commit 276e369c31
2015-07-31 15:29:44 +01:00
989b2491b9
Merge pull request #1780 from gheart/specify_api_version_via_env
...
Allow API version specification via env var
(cherry picked from commit 2759ab5ab6
2015-07-31 15:29:44 +01:00
65cc84140a
Merge pull request #1736 from aanand/deprecate-allow-insecure-ssl
...
Deprecate --allow-insecure-ssl
2015-07-23 14:09:17 +01:00
70c7d27c4e
Merge pull request #1758 from mnowster/improve-scale-test-coverage
...
Improve scale test coverage
2015-07-23 11:07:48 +01:00
04a773f1c8
Deprecate --allow-insecure-ssl
...
Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
2015-07-23 10:56:21 +01:00
2c8aade13e
Space for errors
...
It was harder to see when there are errors if they came straight after
the other output. Putting a newline in there gives it a bit of visual
room.
Signed-off-by: Mazz Mosley <mazz@houseofmnowster.com>
2015-07-23 10:55:57 +01:00
1739448402
Don't use custom name for one-off containers
...
Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
2015-07-22 15:39:56 +01:00
dc62279d02
Merge pull request #1734 from mnowster/1653-scale-in-parallel
...
Parallelise scale
2015-07-21 16:02:04 +01:00
e1c1a4c0aa
Scale restarts stopped containers
...
This is existing behaviour and should be kept.
Signed-off-by: Mazz Mosley <mazz@houseofmnowster.com>
2015-07-21 15:41:22 +01:00
cc0bfea8a1
Merge pull request #1711 from aanand/custom-names
...
Add container_name option for specifying a custom container name
2015-07-21 14:28:16 +01:00
da650e9cfd
Refactor parallel execute
...
Refactored parallel execute and execute create into a single function
parallel_execute that can now handle both cases. This helps untangle it
from being so tightly coupled to the container.
Updated all the relevant operations to use the refactored function.
Signed-off-by: Mazz Mosley <mazz@houseofmnowster.com>
2015-07-21 11:56:59 +01:00
38a6209acd
Stop printing a stack trace when there's an error when pulling
...
Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
2015-07-21 11:07:20 +01:00
5c29ded6ac
Parallelise scale
...
Signed-off-by: Mazz Mosley <mazz@houseofmnowster.com>
2015-07-20 16:33:04 +01:00
4ba9d9dac2
Make parallel tasks interruptible with Ctrl-C
...
The concurrent.futures backport doesn't play well with
KeyboardInterrupt, so I'm using Thread and Queue instead.
Since thread pooling would likely be a pain to implement, I've just
removed `COMPOSE_MAX_WORKERS` for now. We'll implement it later if we
decide we need it.
Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
2015-07-20 14:13:25 +01:00
05d8daa8e0
Merge pull request #1710 from mnowster/improve-output-for-parallel-executions
...
Improve output for parallel command
2015-07-20 11:49:37 +01:00
9d9b865796
Add in error handling
...
Signed-off-by: Mazz Mosley <mazz@houseofmnowster.com>
2015-07-20 10:21:49 +01:00
61787fecea
Resolve race condition
...
Sometimes, some messages were being executed at the same time, meaning
that the status wasn't being overwritten, it was displaying on a
separate line for both doing and done messages.
Rather than trying to have both sets of statuses being written out
concurrently, we write out all of the doing messages first. Then
the done messages are written out/updated, as they are completed.
Signed-off-by: Mazz Mosley <mazz@houseofmnowster.com>
2015-07-20 10:21:49 +01:00
89f6caf871
Allow any volume mode to be specified
...
Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
2015-07-17 16:14:09 +01:00
a3191ab90f
Add container_name option
...
Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
2015-07-17 15:50:09 +01:00
445fe89fce
Tweak wording of scale warning
...
Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
2015-07-17 15:24:17 +01:00
9ffe69a572
Refactor can_be_scaled for clarity
...
Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
2015-07-17 15:24:17 +01:00
ced94a3504
Make smart recreate the default
...
Add --force-recreate flag to enable the old default behaviour of
recreating everything.
Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
2015-07-17 11:28:02 +01:00
9d0bbdf8dd
Make scale timeout configurable, default to 10
...
Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
2015-07-16 16:39:38 +01:00
29f51f8216
Increase max-workers
...
There's significant speed improvement by having more workers. This
value still shouldn't cause anyone's machines to melt/explode.
Signed-off-by: Mazz Mosley <mazz@houseofmnowster.com>
2015-07-16 16:17:26 +01:00
da6cbd4535
Improve output for parallel command
...
This approach takes the style of replacing the output message, in
place, when the command has finished executing. Bringing it a bit
more inline with what `docker pull` does.
Signed-off-by: Mazz Mosley <mazz@houseofmnowster.com>
2015-07-16 11:51:45 +01:00
c7dccccd1f
Merge pull request #1704 from aanand/fix-timeout-type
...
Make sure up/restart/stop timeout is an int
2015-07-16 10:50:06 +01:00
0c5c8d1f00
Handle case where /containers/json returns "Labels": null
...
Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
2015-07-15 17:13:33 +01:00
ec8bf066ba
Make sure up/restart/stop timeout is an int
...
Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
2015-07-15 16:56:39 +01:00
f03dec766d
Rename max workers env var and fix docs
...
Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
2015-07-15 16:43:43 +01:00
35aef1aee0
Merge pull request #1687 from mnowster/1651-parallelise-stopping-containers
...
1651 parallelise stopping containers
2015-07-15 16:29:54 +01:00
Daniel Nephin