186dfbb336
Update compose example to work better with swarm
...
Update the compose example:
* Remove the `links` directive. This allows swarm to distribute containers across available nodes. (with the `links` directive, swarm will be forced to run both containers on the same node.) Note that the `depends_on` directive is sufficient to ensure correct container start up sequence.
* Use a docker volume instead of bind mounting a local directory.
* Give docker-compose commands for shutting down the Wordpress app, showing how to preserve or remove the persisted data in the volume.
Verified proposed change works correctly in both a swarm and a non-swarm environment.
2016-11-11 14:24:39 -08:00
4d83c1bb08
Add missing dollar-sign / consistent shell style ( #426 )
...
* Add missing dollar-sign
* Remove dollar-sign for single commands without output
2016-11-10 14:54:49 -08:00
2ea564166d
fix type of keywords entry in frontmatter (in /compose/ dir) ( #481 )
...
keywords should be a string, not an array containing one string
Signed-off-by: Gaetan de Villele <gdevillele@gmail.com>
2016-11-07 13:18:56 -08:00
949a89e6ea
Merge pull request #152 from mstanleyjones/redirect_from
...
Change 'alias:' to 'redirect_from:' so aliases work again
2016-11-04 17:34:27 -07:00
f4b0ec85ff
Merge pull request #339 from dave-pollock/patch-1
...
Update swarm.md
2016-11-04 17:11:40 -07:00
eb5c8670bc
Change instances of alias: to redirect_from:
...
Signed-off-by: Misty Stanley-Jones <misty@docker.com>
2016-11-04 17:07:02 -07:00
558314bf56
Converges titles to imperative-form, front-matter based, and sentence-case ( #438 )
...
Multiple title fixes, consistency fixes, convergence into metadata-based titles.
2016-11-04 15:38:40 -07:00
ac0cef5d0f
Merging master into vnext-compose
...
includes conflict resolution
Signed-off-by: Misty Stanley-Jones <misty@docker.com>
2016-11-04 15:25:34 -07:00
1a193d749b
Revert "Merge pull request #437 from gdevillele/fix_keywords_format"
...
This reverts commit 13ddc1350e7a11f05943
2016-11-04 13:33:29 -07:00
33d3d067d0
Revert "fix some frontmatter keywords values"
2016-11-04 13:30:04 -07:00
0827ba283c
Revert "fix frontmatter keywords values in compose/reference/ files"
2016-11-04 13:28:43 -07:00
13ddc1350e
Merge pull request #437 from gdevillele/fix_keywords_format
...
fix some frontmatter keywords values
2016-11-04 10:50:53 -07:00
8bb4d6226a
fix more frontmatter keywords values ( #439 )
...
* fix format of frontmatter keyword entry in some .md files
Signed-off-by: Gaetan de Villele <gdevillele@gmail.com>
2016-11-04 10:48:38 -07:00
4c3cf8e7fd
Update docs to mention new additions in Compose 1.9.0
...
Signed-off-by: Joffrey F <joffrey@docker.com>
2016-11-03 15:05:24 -07:00
7a11f05943
fix some frontmatter keywords values
...
Signed-off-by: Gaetan de Villele <gdevillele@gmail.com>
2016-11-03 10:22:12 -07:00
bb4f3be02e
fix frontmatter keywords values in compose/reference/ files
...
Signed-off-by: Gaetan de Villele <gdevillele@gmail.com>
2016-11-03 10:13:21 -07:00
8fa5f3a5de
absolute links to docs.docker.com are now relative links
...
Signed-off-by: Adrien Duermael <adrien@duermael.com>
2016-11-01 17:01:41 -07:00
980956ef9d
incorporated misty's comments
...
Signed-off-by: Victoria Bialas <victoria.bialas@docker.com>
2016-10-31 12:43:52 -07:00
870abe59b4
added a filename above the custom script
...
Added a filename above the custom script to distinguish it from the wait-for-it.sh script.
2016-10-26 21:24:36 -04:00
9c5319211d
Fixing note formatting
...
Changing note format back to the way it was to match the rest of the notes in this section.
2016-10-26 16:58:24 -07:00
568cded2a5
finishing touches on Wordpress example in Compose docs per pr#129
...
Signed-off-by: Victoria Bialas <victoria.bialas@docker.com>
2016-10-26 13:46:53 -07:00
be3e860fa1
Merge pull request #328 from alexandair/patch-1
...
Update index.md
2016-10-25 14:25:52 -07:00
7fd5e20337
Update ps.md
2016-10-25 11:38:33 -07:00
e65a98ef9f
Update install.md
2016-10-25 11:24:45 -07:00
50d7898fe4
Update gettingstarted.md
2016-10-25 11:22:30 -07:00
100a82043a
Update gettingstarted.md
2016-10-25 11:18:39 -07:00
1967bd2603
Update swarm.md
...
Scheduling filters should be configured in the environment section of compose files - NOT labels.
2016-10-25 14:57:00 +01:00
1de1d10073
At paragraph "links", fixed anchor-link to "depends-on"
2016-10-24 12:01:00 +02:00
18499881e5
Update index.md
...
Fix typo.
2016-10-23 20:12:47 +02:00
bce5d70ce6
Updates compose install to 1.8.1
...
Signed-off-by: Joao Fernandes <joao.fernandes@docker.com>
2016-10-19 15:57:43 -07:00
673523ee9a
Update django.md
...
As of Django 1.10 the database backend django.db.backends.postgresql_psycopg2 is called django.db.backends.postgresql .
See https://docs.djangoproject.com/en/1.10/ref/settings/#engine
2016-10-19 17:07:49 +02:00
5d9e15dcad
Merge pull request #174 from IRus/patch-1
...
This guide used legacy backticks.
2016-10-18 16:35:17 -07:00
83ec5da00d
Merge pull request #196 from ezeeetm/patch-1
...
update 'environment' to 'labels'
2016-10-18 16:13:16 -07:00
3c41a34fd6
Typo in cd command
...
Fixes typo in command.
(If you named your directory `my_wordpress`, then you should cd into `my_wordpress`, not `my-wordpress`)
2016-10-18 20:44:36 +02:00
3129564e3d
Merge pull request #251 from liubin/master
...
remove redundant back slash
2016-10-18 11:37:04 -07:00
01910ab6d9
Update branding for macOS
...
Apple has changed their branding guidelines from 'OS X' to 'macOS'
so we should update ours to be within trademark / branding
guidelines. See http://www.apple.com/macos/sierra/
Signed-off-by: Misty Stanley-Jones <misty@docker.com>
2016-10-18 09:21:09 -07:00
c8b449e7e0
remove redundant back slash
...
I think this is a redundant back slash, should be removed.
2016-10-18 22:31:25 +08:00
91b9a38864
update 'environment' to 'labels'
...
according to @aanandPrasad
constraining containers in swarm with compose is now done with 'labels' as of Swarm 0.3 and Compose 1.3
https://groups.google.com/forum/#!topic/docker-dev/Uzcies21qPo
2016-10-13 14:40:17 -07:00
bb7661a926
Document Compose's syntax for variable defaults
...
This feature was not supported previously, but
was added in https://github.com/docker/compose/pull/3108
2016-10-12 09:50:40 -07:00
0778af3d17
This guide used legacy backticks.
...
https://github.com/koalaman/shellcheck/wiki/SC2006
https://github.com/koalaman/shellcheck/wiki/SC2046
2016-10-12 14:19:24 +03:00
c98a6d8902
example pls
2016-10-08 23:35:37 +04:00
8ea375e1d7
Fix for list in compose-file, CSS fixes for blockquotes
2016-10-07 13:48:23 -07:00
1b8729c5be
remove prefix space
...
strange space on ALL code block on https://docs.docker.com/compose/gettingstarted/
but github clear it on preview .md
2016-10-07 23:18:45 +04:00
9a2be62bf8
Update compose-file.md
...
Document that the journald logging driver allows docker-compose logs to work.
2016-10-05 11:40:42 -05:00
0133cb646d
Merge pull request #21 from pborreli/typos
...
Fixed typos
2016-09-30 11:51:42 -07:00
066b78bf86
Content rendering fixes
2016-09-30 01:51:56 -07:00
0ad083ff1f
Delete Makefile
2016-09-29 23:40:58 -07:00
d8b7717467
Delete Dockerfile
2016-09-29 23:40:48 -07:00
99bab305bd
Removing merge detritus
2016-09-29 23:38:12 -07:00
6cd3fe8bd2
Fixed typos
2016-09-30 01:52:12 +01:00
d53c6798c9
Convert TOML to YAML, tweaks to work with Jekyll
2016-09-29 17:16:03 -07:00
9f31bb790d
Put back inadvertently deleted compose directory
2016-09-29 12:13:47 -07:00
701f170a21
Move docker-hub docs to docker-hub subdirectory
2016-09-29 10:38:52 -07:00
7629f462d5
Moved compose docs to compose subdirectory
2016-09-28 14:52:24 -07:00
f3628c7a5e
Bump 1.8.0
...
Signed-off-by: Joffrey F <joffrey@docker.com>
2016-07-27 11:57:23 -07:00
e115eaf6fc
Fix error message for unrecognised TLS version
...
Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
2016-07-27 11:57:23 -07:00
cefa239c2e
Bump 1.8.0-rc3
...
Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
2016-07-27 17:46:13 +01:00
35ed189981
Copy experimental bundle docs into Compose docs so URL is stable
...
Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
2016-07-27 16:27:05 +01:00
c392acc56b
Show a warning when engine is in swarm mode
...
Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
2016-07-27 16:27:05 +01:00
cd267d5121
Add user agent to API calls
...
Signed-off-by: Ben Firshman <ben@firshman.co.uk>
2016-07-27 16:27:05 +01:00
cb076a57b9
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-27 16:27:05 +01:00
0488dd3709
Rename --fetch-digests to --push-images and remove auto-pull
...
Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
2016-07-27 16:27:05 +01:00
b72f911ccf
Fix timeout value in error message
...
Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
2016-07-27 16:27:05 +01:00
f9c5816ab8
Stop checking the deprecated DOCKER_CLIENT_TIMEOUT variable
...
Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
2016-07-27 16:27:05 +01:00
2ecbf25445
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-27 16:27:05 +01:00
e1b7510e4a
service: detailed error messages for create and start
...
Fixes : #3355
Signed-off-by: Tomas Tomecek <ttomecek@redhat.com>
2016-07-27 16:27:05 +01:00
c72c966abc
Bump 1.8.0-rc2
...
Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
2016-07-06 18:05:11 -07:00
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
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
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
a7fc3e2220
Add an acceptance test for bundle.
...
Signed-off-by: Daniel Nephin <dnephin@docker.com>
2016-07-06 16:20:16 -07:00
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
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
9bf6bc6dbd
Bump 1.8.0-rc1
...
Signed-off-by: Joffrey F <joffrey@docker.com>
2016-06-14 12:35:46 -07:00
0fe82614a6
Merge pull request #3595 from dnephin/add-push-and-bundle
...
Add docker-compose push and docker-compose bundle
2016-06-14 10:57:32 -07:00
8f8c17bf66
Merge pull request #3549 from shin-/KalleDK-master
...
Add support for COMPOSE_TLS_VERSION config option
2016-06-14 10:57:12 -07:00
9b7bd69cfc
Support entrypoint, labels, and user in the bundle.
...
Signed-off-by: Daniel Nephin <dnephin@docker.com>
2016-06-14 13:00:12 -04:00
1ea9dda1d3
Implement 'docker-compose push' and 'docker-compose bundle'
...
Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
2016-06-14 12:06:14 -04:00
21f20cbc9b
Merge pull request #3449 from Andrey9kin/ready/3281
...
Fix #3281 : Unexpected result when using build args with default values
2016-06-14 08:05:07 -07:00
2123906586
Merge pull request #3577 from sanmai-NL/3576-byte_str_fix
...
Fix byte/str typing error
2016-06-14 01:58:27 +01:00
60f7e021ad
Fix split_path_mapping behavior when mounting "/"
...
Signed-off-by: Joffrey F <joffrey@docker.com>
2016-06-13 15:32:10 -07:00
61324ef308
Fix byte/str typing error
...
Signed-off-by: Sander Maijers <S.N.Maijers@gmail.com>
2016-06-10 16:30:46 +02:00
e502417df2
Merge pull request #3475 from shin-/3429-networks-config-serialize
...
Output valid config in config command
2016-06-07 18:01:39 +02:00
ea640f3821
Remove external_name from serialized config output
...
Signed-off-by: Joffrey F <joffrey@docker.com>
2016-06-03 12:10:09 -07:00
e7a8b2fed5
Update TLS version configuration code. Tests.
...
Signed-off-by: Joffrey F <joffrey@docker.com>
2016-06-03 11:45:22 -07:00
a67ba5536d
Fix #3281 : Unexpected result when using build args with default values
...
Fix the issue when build arg is set to None instead of empty string. Usecase:
cat docker-compose.yml
.... args:
- http_proxy
- https_proxy
- no_proxy
If http_proxy, https_proxy, no_proxy environment variables are not defined then http_proxy,
https_proxy, no_proxy build args will be set to string None which breaks all downloads
With this change undefined build args will be set to empty string instead of string None
Signed-off-by: Andrey Devyatkin <andrey.a.devyatkin@gmail.com>
2016-05-28 11:39:41 +02:00
c148849f0e
Fix #3281 : Unexpected result when using build args with default values
...
Fix the issue when build arg is set to None instead of empty string. Usecase:
cat docker-compose.yml
.... args:
- http_proxy
- https_proxy
- no_proxy
If http_proxy, https_proxy, no_proxy environment variables are not defined then http_proxy,
https_proxy, no_proxy build args will be set to string None which breaks all downloads
With this change undefined build args will be set to empty string instead of string None
Signed-off-by: Andrey Devyatkin <andrey.a.devyatkin@gmail.com>
2016-05-27 20:16:52 +02:00
e3e8a619cc
Fix #3281 : Unexpected result when using build args with default values
...
Fix the issue when build arg is set to None instead of empty string.
Usecase:
cat docker-compose.yml
....
args:
- http_proxy
- https_proxy
- no_proxy
If http_proxy, https_proxy, no_proxy environment variables are not defined
then http_proxy, https_proxy, no_proxy build args will be set to string None which breaks all downloads
With this change build args will not passed to docker engine if they are equal to string None
Signed-off-by: Andrey Devyatkin <andrey.a.devyatkin@gmail.com>
2016-05-27 07:48:13 +02:00
c4229b469a
Improve merging for several service config attributes
...
All uniqueItems lists in the config now receive the same treatment removing
duplicates.
Signed-off-by: Joffrey F <joffrey@docker.com>
2016-05-20 15:29:04 -07:00
842e372258
Eliminate duplicates when merging port mappings from config files
...
Signed-off-by: Joffrey F <joffrey@docker.com>
2016-05-20 15:28:35 -07:00
7763122ecb
Merge pull request #3459 from shin-/2487-split-volume-path
...
Always use the Windows version of splitdrive when parsing volume mappings
2016-05-20 11:42:43 +01:00
9a39208741
Merge pull request #3482 from aanand/fix-prompt-buffering
...
Fix bug where confirmation prompt doesn't show due to line buffering
2016-05-19 08:52:34 -07:00
0c8aeb9e05
Fix bug where confirmation prompt doesn't show due to line buffering
...
Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
2016-05-19 15:44:17 +01:00
db0a6cf2bb
Always use the Windows version of splitdrive when parsing volume mappings
...
Signed-off-by: Joffrey F <joffrey@docker.com>
2016-05-17 16:33:59 -07:00
844b7d463f
Update rm command to always remove one-off containers.
...
Signed-off-by: Joffrey F <joffrey@docker.com>
2016-05-16 14:59:33 -07:00
e5645595e3
Fail gracefully when -d is not provided for exec command on Win32
...
Signed-off-by: Joffrey F <joffrey@docker.com>
2016-05-12 14:00:54 -07:00
72f6a5c8d3
Merge pull request #3433 from anton44eg/issue_3432
...
add msg attribute to ProjectError class
2016-05-12 16:55:11 +01:00
dc88e54010
Merge pull request #3399 from yorkedork/fix/env-file-validation
...
Adds additional validation to 'env_vars_from_file'.
2016-05-12 08:53:25 -07:00
4b01f6dcd6
add msg attribute to ProjectError class
...
Signed-off-by: Anton Simernia <anton.simernya@gmail.com>
2016-05-09 18:26:20 +07:00
310b3d9441
Properly handle APIError failures in Project.up
...
Signed-off-by: Joffrey F <joffrey@docker.com>
2016-05-02 13:42:05 -07:00
28fb91b344
Adds additional validation to 'env_vars_from_file'.
...
The 'env_file' directive and feature precludes the use of the name
'.env' in the path shared with 'docker-config.yml', regardless of
whether or not it is enabled.
This change adds an additional validation to allow the use of this
path provided it is not a file.
Signed-off-by: Thom Linton <thom.linton@gmail.com>
2016-04-29 17:53:31 -07:00
fe17e0f948
Skip event objects that don't contain a status field
...
Signed-off-by: Joffrey F <joffrey@docker.com>
2016-04-29 16:39:42 -07:00
bd7ec24e25
Merge pull request #3384 from shin-/3264-shorthand-host-support
...
Support combination of shorthand flag and equal sign for host option
2016-04-29 16:39:16 -07:00
8cc7d68a00
Merge pull request #3390 from aronahl/master
...
Add missing log event filter when using docker-compose logs.
2016-04-28 12:53:04 -07:00
0b24883cef
Support combination of shorthand flag and equal sign for host option
...
Signed-off-by: Joffrey F <joffrey@docker.com>
2016-04-28 12:52:00 -07:00
2efcec776c
Add missing log event filter when using docker-compose logs.
...
Signed-off-by: Aaron Nall <aronahl@hotmail.com>
2016-04-28 15:14:44 +00:00
61794ba97c
Merge pull request #3377 from shin-/3372-windowserror
...
Define WindowsError on non-win32 platforms
2016-04-28 10:33:18 -04:00
d3e645488a
Define WindowsError on non-win32 platforms
...
Signed-off-by: Joffrey F <joffrey@docker.com>
2016-04-26 11:40:31 -07:00
756ef14edc
Fix format of 'restart' option in 'config' output
...
Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
2016-04-26 19:21:03 +01:00
6064d200f9
Fix output of 'config' for v1 files
...
Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
2016-04-26 19:21:03 +01:00
b67f110620
Explain the explanation about file versions
...
This explanation looked like it was part of the error. Added an
extra new line and a bit of copy to explain the explanation.
Signed-off-by: Ben Firshman <ben@firshman.co.uk>
2016-04-20 16:40:16 -07:00
27628f8655
Make validation error less robotic
...
"ERROR: Validation failed in file './docker-compose.yml', reason(s):"
is now:
"ERROR: The Compose file './docker-compose.yml' is invalid because:"
Signed-off-by: Ben Firshman <ben@firshman.co.uk>
2016-04-20 16:38:09 -07:00
cafe1315b2
Merge pull request #3334 from werehuman/fix-config-hash-change
...
Fix #3248 : Accidental config_hash change
2016-04-19 12:42:19 +01:00
984f839d33
Merge pull request #3263 from twitherspoon/3191_2_help_cli_feature
...
Added code to support no argument help command
2016-04-19 12:14:24 +01:00
d21e1c5a30
Merge pull request #3335 from johnharris85/master
...
Fix CLI docstring to reflect Docopt behaviour.
2016-04-19 12:13:20 +01:00
52fa010ac7
Merge pull request #3337 from dnephin/check_for_short_id_alias
...
Check for short id alias, and don't disconnect if it already exists
2016-04-19 12:12:43 +01:00
6d2805917c
Account for aliased links
...
Fix failing tests
Signed-off-by: John Harris <john@johnharris.io>
2016-04-17 15:25:06 -04:00
68272b0216
Config now catches undefined service links
...
Fixes issue #2922
Signed-off-by: John Harris <john@johnharris.io>
2016-04-17 14:00:07 -04:00
56c6e29819
Unit test for skipping network disconnect.
...
Signed-off-by: Daniel Nephin <dnephin@docker.com>
2016-04-15 16:28:59 -04:00
4702703615
Fix #3248 : Accidental config_hash change
...
Signed-off-by: Vladimir Lagunov <lagunov.vladimir@gmail.com>
2016-04-15 15:34:30 +03:00
ad306f0479
Fix CLI docstring to reflect Docopt behaviour.
...
Signed-off-by: John Harris <john@johnharris.io>
2016-04-15 13:30:13 +01:00
e1356e1f6f
Set networking_config when creating a container.
...
Signed-off-by: Daniel Nephin <dnephin@docker.com>
2016-04-14 18:09:06 -04:00
abb5ae7fe4
Only disconnect if we don't already have the short id alias.
...
Signed-off-by: Daniel Nephin <dnephin@docker.com>
2016-04-14 16:05:14 -04:00
e2cb7b0237
Merge pull request #3299 from dannyprout/2096-only-show-port-clash-warning-when-starting-multiple-containers
...
Only show port clash warning if multiple containers are about to be started
2016-04-14 10:40:02 +01:00
50287722f2
Update release notes and set version to 1.8.0dev
...
Signed-off-by: Daniel Nephin <dnephin@docker.com>
2016-04-13 13:27:18 -04:00
339ebc0483
Fixes #2096 : Only show multiple port clash warning if multiple containers
...
are about to be started.
Signed-off-by: Danyal Prout <me@dany.al>
2016-04-12 20:58:21 +01:00
3d3f331404
Merge pull request #3303 from aanand/clarify-rm-and-down
...
Clarify behaviour of rm and down
2016-04-12 11:31:22 +01:00
7cfb5e7bc9
Fix race condition
...
If processing of all objects finishes before the queue is drained,
parallel_execute_iter() returns prematurely.
Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
2016-04-11 17:05:52 +01:00
3722bb38c6
Clarify behaviour of rm and down
...
Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
2016-04-11 16:31:27 +01:00
15c5bc2e6c
Rename a couple of functions in parallel.py
...
Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
2016-04-11 13:05:30 +01:00
0671b8b8c3
Document parallel helper functions
...
Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
2016-04-11 12:51:27 +01:00
0e3db185cf
Small refactor to feed_queue()
...
Put the event tuple into the results queue rather than yielding it from
the function.
Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
2016-04-11 12:37:00 +01:00
83df95d511
Remove extra ensure_image_exists() which causes duplicate builds.
...
Signed-off-by: Daniel Nephin <dnephin@docker.com>
2016-04-08 15:21:12 -04:00
be27e266da
Reduce queue timeout
...
Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
2016-04-08 19:07:40 +01:00
5450a67c2d
Hold state in an object
...
Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
2016-04-08 19:06:07 +01:00
54b6fc4219
Refactor so there's only one queue
...
Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
2016-04-08 18:54:02 +01:00
af9526fb82
Move queue logic out of parallel_execute()
...
Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
2016-04-08 18:30:28 +01:00
141b96bb31
Abort operations if their dependencies fail
...
Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
2016-04-08 17:51:09 +01:00
bcdf541c8c
Refactor setup_queue()
...
- Stop sharing set objects across threads
- Use a second queue to signal when producer threads are done
- Use a single consumer thread to check dependencies and kick off new
producers
Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
2016-04-08 16:24:29 +01:00
9f47e43b5c
Merge branch 'master' into 3191_2_help_cli_feature
2016-04-07 12:43:34 -04:00
b33d7b3dd8
Prevent unnecessary inspection of containers when created from an inspect.
...
Signed-off-by: Daniel Nephin <dnephin@docker.com>
2016-04-06 11:14:42 -04:00
129fb5b356
Added code to output the top level command options if docker-compose help with no command options provided
...
Signed-off-by: Tony Witherspoon <tony.witherspoon@gmail.com>
2016-04-04 13:15:28 -04:00
78a8be07ad
Re-enabling assert_hostname when instantiating docker_client from the
...
environment.
Signed-off-by: Joffrey F <joffrey@docker.com>
2016-03-30 11:11:19 -07:00
71c86acaa4
Update docker-py version to include match_hostname fix
...
Removed unnecessary assert_hostname computation in tls_config_from_options
Signed-off-by: Joffrey F <joffrey@docker.com>
2016-03-29 18:01:27 -07:00
7116aefe43
Fix assert_hostname logic in tls_config_from_options
...
Signed-off-by: Joffrey F <joffrey@docker.com>
2016-03-28 17:39:20 -07:00
12ad3ff301
Injecting os.environ in Environment instance happens outside of init method
...
Signed-off-by: Joffrey F <joffrey@docker.com>
2016-03-24 10:57:28 -07:00
1506f997de
Better windows support for Environment class
...
Signed-off-by: Joffrey F <joffrey@docker.com>
2016-03-24 10:57:28 -07:00
b99037b4a6
Add support for DOCKER_* variables in .env file
...
Signed-off-by: Joffrey F <joffrey@docker.com>
2016-03-24 10:57:28 -07:00
c7afe16419
Account for case-insensitive env on windows platform
...
Signed-off-by: Joffrey F <joffrey@docker.com>
2016-03-24 10:57:01 -07:00
36f1b4589c
Limit occurrences of creating an environment object.
...
.env file is always read from the project_dir
Signed-off-by: Joffrey F <joffrey@docker.com>
2016-03-24 10:57:01 -07:00
David Williamson
Jonas Friedmann
Gaetan
John Mulhausen
Misty Stanley-Jones
Misty Stanley-Jones
Joffrey F
Adrien Duermael
Victoria Bialas
michael-wise
Victoria Bialas
dave-pollock
Markus Schulte
Aleksandar Nikolić
Joao Fernandes
DavidRabel-b1
Ivan Perez
LRubin
Bin Liu
ezeeetm
nVitius
Ibragimov Ruslan
BSCheshir
sixcorners
Pascal Borreli
Aanand Prasad
Ben Firshman
Tomas Tomecek
Daniel Nephin
Joffrey F
Sander Maijers
Andrey Devyatkin
Anton Simernia
Thom Linton
Aaron Nall
Daniel Nephin
johnharris85
Vladimir Lagunov
Danyal Prout
twitherspoon
Tony Witherspoon