docker
/
docs
mirror of https://github.com/docker/docs.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity
1,430 Commits 21 Branches 28 Tags 816 MiB
Commit Graph

75 Commits

Author SHA1 Message Date
Aanand Prasad 04a773f1c8 Deprecate --allow-insecure-ssl 
Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
 2015-07-23 10:56:21 +01:00
Aanand Prasad 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
Aanand Prasad dc62279d02 Merge pull request #1734 from mnowster/1653-scale-in-parallel 
Parallelise scale
 2015-07-21 16:02:04 +01:00
Mazz Mosley 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
Mazz Mosley 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
Mazz Mosley 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
Mazz Mosley 5c29ded6ac Parallelise scale 
Signed-off-by: Mazz Mosley <mazz@houseofmnowster.com>
 2015-07-20 16:33:04 +01:00
Aanand Prasad 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
Aanand Prasad a3191ab90f Add container_name option 
Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
 2015-07-17 15:50:09 +01:00
Aanand Prasad 445fe89fce Tweak wording of scale warning 
Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
 2015-07-17 15:24:17 +01:00
Aanand Prasad 9ffe69a572 Refactor can_be_scaled for clarity 
Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
 2015-07-17 15:24:17 +01:00
Aanand Prasad 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
Aanand Prasad 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
Mazz Mosley a68ca199a2 Execute container commands in parallel 
Commands able to use this parallelisation are `stop`, `kill` and `rm`.

We're using a backported function from python 3, to allow us to make
the most of a pool of threads without having to write the low level
code for managing this ourselves.

A default value for number of threads is a low enough number so it
shouldn't cause performance problems but if someone knows the
capability of their system and wants to increase it, they can via
an environment variable DEFAULT_MAX_WORKERS

Signed-off-by: Mazz Mosley <mazz@houseofmnowster.com>
 2015-07-15 11:02:50 +01:00
Aanand Prasad 81707ef1ad Merge pull request #1643 from aanand/warn-about-legacy-one-off-containers 
Show an error on 'run' when there are legacy one-off containers
 2015-07-08 14:48:03 +01:00
Aanand Prasad 8b033d3946 Merge pull request #1665 from mnowster/1648-support-log-opt 
1648 support log opt
 2015-07-07 17:08:04 +01:00
Mazz Mosley 6f31e8ebe9 Add support for log_opt 
When specifying a log_driver you want to specify some options for
the logger as per the docker run --log-opt option. The logger
options are key value pairs.

Signed-off-by: Mazz Mosley <mazz@houseofmnowster.com>
 2015-07-07 16:26:43 +01:00
Aanand Prasad 531265bc84 Fix smart recreate when 'image' is changed to something nonexistent 
Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
 2015-07-07 16:01:44 +01:00
Aanand Prasad e98caf5cf9 Show an error on 'run' when there are legacy one-off containers 
Also warn the user about the one-off containers in the standard error
message about legacy containers.

Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
 2015-07-06 14:45:17 +01:00
Aanand Prasad f42fd6a3ad Merge pull request #1642 from aanand/fix-1573 
Fix bug where duplicate container is leftover after 'up' fails
 2015-07-03 16:25:53 +01:00
Aanand Prasad 62b47224f0 Fix bug where duplicate container is leftover after 'up' fails 
Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
 2015-07-03 10:46:07 +01:00
Mazz Mosley f33f673b49 Allow _.- chars in service names 
As VALID_CHARS is shared with project names, these chars are also
now allowed within project names.

Signed-off-by: Mazz Mosley <mazz@houseofmnowster.com>
 2015-07-01 17:57:50 +01:00
Aanand Prasad 4f83a18912 Merge pull request #1570 from aanand/fix-build-pull 
Explicitly set pull=False when building
 2015-06-21 17:25:46 -07:00
Aanand Prasad c22cc02df5 Don't set network mode when none is specified 
Setting a value overrides the new default network option.

Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
 2015-06-19 15:22:13 -07:00
Aanand Prasad bef0926c58 Explicitly set pull=False when building 
Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
 2015-06-18 17:43:16 -07:00
Daniel Nephin 06db577105 Move converge() to a test module, and use a short timeout for tests. 
Signed-off-by: Daniel Nephin <dnephin@gmail.com>
 2015-06-14 17:18:27 -04:00
Travis Thieman c24d5380e6 Extend up -t to pass timeout to stop running containers 
Signed-off-by: Travis Thieman <travis.thieman@gmail.com>
 2015-06-14 16:45:28 -04:00
Aanand Prasad 08bc4b830b Fix volume binds de-duplication 
Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
 2015-06-12 16:57:22 -04:00
Aanand Prasad 7995fc2ed2 Reorder service.py utility methods 
Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
 2015-06-11 11:44:13 -04:00
Daniel Nephin 38a11c4c28 Merge pull request #1526 from aanand/remove-start-or-create-containers 
Remove Service.start_or_create_containers()
 2015-06-08 12:49:32 -04:00
Aanand Prasad db2d02dc0b Remove Service.start_or_create_containers() 
It's only used in a single test method.

Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
 2015-06-08 10:59:03 -04:00
Aanand Prasad f59b43ac27 Fix duplicate logging on up/run 
Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
 2015-06-08 10:52:15 -04:00
André Martins ae63d35660 Modified scale awareness from exception to warning 
Signed-off-by: André Martins <martins@noironetworks.com>
 2015-05-26 23:59:45 +01:00
Aanand Prasad 4795fd874f Fix regression in `docker-compose up` 
When an upstream dependency (e.g. a db) has a container but a downstream
service (e.g. a web app) doesn't, a web container is not created on
`docker-compose up`.

Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
 2015-05-26 16:01:05 +01:00
Daniel Nephin 889d3636f4 Merge pull request #1440 from aanand/legacy-fixes 
Legacy fixes
 2015-05-24 12:42:14 -05:00
Aanand Prasad 30c9e7323a Fix missing logging on container creation 
Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
 2015-05-21 20:06:25 +01:00
Aanand Prasad 0fdb8bf814 Refactor migration logic 
- Rename `migration` module to `legacy` to make its legacy-ness explicit

- Move `check_for_legacy_containers` into `legacy` module

- Fix migration test so it can be run in isolation

Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
 2015-05-21 18:21:09 +01:00
Aanand Prasad 3080244c0b Rename migrate_to_labels -> migrate-to-labels 
Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
 2015-05-21 14:54:41 +01:00
Ben Firshman f79eb7b9ad Merge pull request #1382 from lsowen/security_opt 
Add security_opt as a docker-compose.yml option
 2015-05-20 13:40:42 +01:00
lsowen ea7ee301c0 Add security_opt as a docker-compose.yml option 
Signed-off-by: Logan Owen <lsowen@s1network.com>
 2015-05-19 13:47:41 -04:00
Harald Albers 41315b32cb Fix #1426 - migrate_to_labels not found 
Signed-off-by: Harald Albers <github@albersweb.de>
 2015-05-19 16:37:50 +02:00
Aanand Prasad ef4eb66723 Implement smart recreate behind an experimental CLI flag 
Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
 2015-05-18 18:39:18 +01:00
Aanand Prasad 82bc7cd5ba Remove override_options arg from recreate_container(s) 
Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
 2015-05-18 17:42:09 +01:00
Aanand Prasad 3304c68891 Only set AttachStdin/out/err for one-off containers 
If we're just streaming logs from `docker-compose up`, we don't need
to set AttachStdin/out/err, and doing so results in containers with
different configuration depending on whether `up` or `run` were invoked
with `-d` or not.

Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
 2015-05-18 17:41:04 +01:00
Daniel Nephin 62059d55e6 Add migration warning and option to migrate to labels. 
Signed-off-by: Daniel Nephin <dnephin@gmail.com>
 2015-05-18 10:55:12 -04:00
Daniel Nephin ed50a0a3a0 Resolves #1066, use labels to identify containers 
Signed-off-by: Daniel Nephin <dnephin@gmail.com>
 2015-05-18 10:47:26 -04:00
Daniel Nephin 417d9c2d51 Use individual volumes for recreate instead of volumes_from 
Signed-off-by: Daniel Nephin <dnephin@gmail.com>
 2015-05-11 13:01:43 -04:00
delbert@umn.edu df87bd91c8 Added devices configuration option 
Signed-off-by: Dan Elbert <dan.elbert@gmail.com>
 2015-05-11 10:50:58 -05:00
Daniel Nephin 6829efd4d3 Resolves #874, Rename instead of use an intermediate. 
Signed-off-by: Daniel Nephin <dnephin@gmail.com>
 2015-05-07 21:53:41 -04:00
Daniel Nephin 0f2f9db6d8 Merge pull request #1388 from vdemeester/1303-log-driver-support 
Add support for log-driver as a docker-compose.yml option
 2015-05-07 12:00:42 -04:00