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
b0b6ed31c4
Merge pull request #1430 from albers/fix-1426
...
Fix #1426 - migrate_to_labels not found
2015-05-20 12:31:18 +01:00
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
41315b32cb
Fix #1426 - migrate_to_labels not found
...
Signed-off-by: Harald Albers <github@albersweb.de>
2015-05-19 16:37:50 +02:00
80eaf4cc9f
Merge pull request #1399 from aanand/state
...
Only recreate what's changed
2015-05-18 19:25:42 +01:00
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
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
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
1e6d912fbc
Merge pull request #1356 from dnephin/use_labels_instead_of_names
...
Use labels instead of names to identify containers
2015-05-18 17:38:46 +01:00
4ef3bbcdf2
Merge pull request #1415 from aanand/fix-run-race-condition
...
Fix race condition in `docker-compose run`
2015-05-18 16:16:31 +01:00
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
ed50a0a3a0
Resolves #1066 , use labels to identify containers
...
Signed-off-by: Daniel Nephin <dnephin@gmail.com>
2015-05-18 10:47:26 -04:00
28d2aff8b8
Fix teardown for integration tests.
...
Signed-off-by: Daniel Nephin <dnephin@gmail.com>
2015-05-18 10:44:44 -04:00
862971cffa
Fix race condition in `docker-compose run`
...
We shouldn't start the container before handing it off to dockerpty -
dockerpty will start it after attaching, which is the correct order.
Otherwise the container might exit before we attach to it, which can
lead to weird bugs.
Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
2015-05-15 12:16:24 +01:00
c8022457eb
Merge pull request #1413 from aanand/update-dockerpty
...
Update dockerpty to 0.3.3
2015-05-14 21:23:46 -04:00
9bbf1a33d1
Update dockerpty to 0.3.3
...
Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
2015-05-14 20:03:50 +01:00
0ac8c3cb03
Merge pull request #858 from dnephin/fix_volumes_recreate_on_1.4.1
...
Preserve individual volumes on recreate
2015-05-14 16:12:08 +01:00
d5c9626040
Merge pull request #1411 from aanand/fix-extends-docs
...
Fix typo in extends.md
2015-05-14 09:53:38 -04:00
ad9c5ad938
Fix typo in extends.md
...
Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
2015-05-14 10:48:35 +01:00
70d2e64dfe
Merge pull request #1407 from aanand/update-docker-py
...
Update docker-py to 1.2.2
2015-05-12 20:22:48 -04:00
1dccd58209
Update docker-py to 1.2.2
...
Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
2015-05-12 18:51:45 +01:00
e0103ac0d4
Merge pull request #1405 from bfirsh/link-to-getting-started-guides-from-each-page
...
Link to getting started guides from each page
2015-05-12 14:40:53 +01:00
4d745ab87a
Link to getting started guides from each page
...
These are really hard to find.
Signed-off-by: Ben Firshman <ben@firshman.co.uk>
2015-05-12 12:44:43 +01:00
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
4997facbb4
Merge pull request #1400 from DanElbert/754-device_option
...
Added devices config handling and device HostConfig handling
2015-05-11 12:42:48 -04:00
df87bd91c8
Added devices configuration option
...
Signed-off-by: Dan Elbert <dan.elbert@gmail.com>
2015-05-11 10:50:58 -05:00
1748b0f81a
Merge pull request #1349 from dnephin/rename_instead_of_intermediate
...
Rename container when recreating it
2015-05-08 10:33:28 +01:00
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
99f2a3a583
Merge pull request #1396 from albers/completion-doc
...
Fix markdown formatting issue
2015-05-07 14:04:16 -04:00
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
d6223371d6
Fix markdown formatting issue
...
Signed-off-by: Harald Albers <github@albersweb.de>
2015-05-07 04:41:12 -07:00
4817d5944c
Merge pull request #1391 from albers/completion-extglob
...
Fix #1386 by ensuring that exglob is set in bash completion
2015-05-06 10:46:13 -04:00
f626fc5ce8
Add support for log-driver in docker-compose.yml
...
Closes #1303
Signed-off-by: Vincent Demeester <vincent@sbr.pm>
2015-05-06 13:18:58 +02:00
1579a125a3
Ensure that exglob is set in bash completion
...
Signed-off-by: Harald Albers <github@albersweb.de>
2015-05-06 09:33:22 +02:00
7fb9ec29c4
Merge pull request #1335 from chernjie/pid_readonly
...
docker-compose create --readonly
2015-05-05 20:50:01 -04:00
f78e89f265
Merge pull request #1381 from sherter/help-fix
...
Show proper command in help text of build subcommand
2015-05-05 20:48:25 -04:00
b06294399a
See #1335 : Added --read-only
...
Signed-off-by: CJ <lim@chernjie.com>
2015-05-02 23:39:39 +08:00
b8e0aed21c
Show proper command in help text of build subcommand
...
The help text of the build subcommand suggested to use 'compose build' (instead of 'docker-compose build') to rebuild images.
Signed-off-by: Simon Herter <sim.herter@gmail.com>
2015-05-01 18:58:55 -04:00
4bce388b51
Merge pull request #1376 from aanand/fix-build-non-ascii-filename
...
Make sure the build path we pass to docker-py is a binary string
2015-04-30 20:54:21 -04:00
6c95eed781
Merge pull request #1269 from aanand/labels
...
Implement 'labels' option
2015-04-30 20:49:11 -04:00
4f366d8355
Make sure the build path we pass to docker-py is a binary string
...
Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
2015-04-30 11:57:46 +01:00
878d90febf
Merge pull request #1374 from aanand/close-before-attaching
...
Close connection after building or pulling
2015-04-29 18:56:03 -04:00
1a77feea3f
Close connection before attaching on 'up' and 'run'
...
This ensures that the connection is not recycled, which can cause the
Docker daemon to complain if we've already performed another streaming
call such as doing a build.
Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
2015-04-29 18:42:03 +01:00
7e0ab0714f
Merge pull request #1344 from dnephin/fix_pull_with_sha
...
Support image with ids instead of names
2015-04-29 16:46:34 +01:00
2e6bc078fb
Implement 'labels' option
...
Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
2015-04-29 16:45:18 +01:00
3dd860f0ba
Fix #923 , support image with ids instead of names.
...
Signed-off-by: Daniel Nephin <dnephin@gmail.com>
2015-04-29 10:13:18 -04:00
de800dea0f
Merge pull request #1370 from aanand/update-docker-version
...
Update Docker version to 1.6 stable
2015-04-29 10:03:13 -04:00
fed4377ef6
Merge pull request #1351 from mchasal/1301-alphabetize_usage
...
Fix for #1301 , Alphabetize Commands
2015-04-29 14:21:46 +01:00
021bf46557
Update Docker version to 1.6 stable
...
Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
2015-04-29 13:58:32 +01:00
b7e5116267
Merge pull request #1352 from bfirsh/add-irccloud-invite-link
...
Use cool new IRCCloud links for IRC channel
2015-04-29 13:25:25 +01:00
Ben Firshman
Aanand Prasad
lsowen
Harald Albers
Daniel Nephin
delbert@umn.edu
Vincent Demeester
CJ
Simon Herter